[SCM] Amarok packaging branch, experimental, updated. debian/2.7.0-1

Modestas Vainius modax at alioth.debian.org
Sun Jan 27 12:49:43 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=24a98e9

The following commit has been merged in the experimental branch:
commit 24a98e9c5abcca774bcd647b55ab108b0bbd11ec
Merge: 1786df340b962f8d94324aac065926612819f233 202196c874d11b86607f5554af60994fe4504b3b
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jan 27 11:23:46 2013 +0200

    Merge tag 'upstream/2.7.0'
    
    Upstream version 2.7.0

 .reviewboardrc                                     |    3 +
 AUTHORS                                            |   14 +-
 CMakeLists.txt                                     |   73 +-
 ChangeLog                                          |  124 +
 README                                             |   32 +-
 cmake/modules/FindLibLastFm.cmake                  |   26 +-
 config-amarok.h.cmake                              |   58 -
 doc/en_US/Face-smile.png                           |  Bin 1428 -> 1501 bytes
 doc/en_US/Icon-action-dynamic-amarok.png           |  Bin 921 -> 994 bytes
 doc/en_US/Icon-application-exit.png                |  Bin 1140 -> 1213 bytes
 doc/en_US/Icon-bookmark-new-list.png               |  Bin 1100 -> 1100 bytes
 doc/en_US/Icon-configure.png                       |  Bin 890 -> 890 bytes
 doc/en_US/Icon-dialog-information.png              |  Bin 993 -> 1066 bytes
 doc/en_US/Icon-document-export.png                 |  Bin 731 -> 804 bytes
 doc/en_US/Icon-document-import.png                 |  Bin 724 -> 797 bytes
 doc/en_US/Icon-document-new.png                    |  Bin 755 -> 828 bytes
 doc/en_US/Icon-document-properties.png             |  Bin 936 -> 1009 bytes
 doc/en_US/Icon-document-save.png                   |  Bin 798 -> 871 bytes
 doc/en_US/Icon-edit-clear-list.png                 |  Bin 1327 -> 1400 bytes
 doc/en_US/Icon-edit-clear-locationbar-rtl.png      |  Bin 742 -> 815 bytes
 doc/en_US/Icon-edit-copy.png                       |  Bin 736 -> 736 bytes
 doc/en_US/Icon-edit-delete.png                     |  Bin 739 -> 812 bytes
 doc/en_US/Icon-emblem-favorite.png                 |  Bin 1993 -> 2066 bytes
 doc/en_US/Icon-emblem-mounted.png                  |  Bin 554 -> 627 bytes
 doc/en_US/Icon-flag-green.png                      |  Bin 1857 -> 1930 bytes
 doc/en_US/Icon-folder-new.png                      |  Bin 729 -> 802 bytes
 doc/en_US/Icon-folder-remote.png                   |  Bin 824 -> 897 bytes
 doc/en_US/Icon-go-down.png                         |  Bin 788 -> 861 bytes
 doc/en_US/Icon-go-home.png                         |  Bin 731 -> 804 bytes
 doc/en_US/Icon-go-next.png                         |  Bin 797 -> 870 bytes
 doc/en_US/Icon-go-previous.png                     |  Bin 746 -> 819 bytes
 doc/en_US/Icon-go-up.png                           |  Bin 817 -> 890 bytes
 doc/en_US/Icon-list-add.png                        |  Bin 722 -> 795 bytes
 doc/en_US/Icon-list-remove.png                     |  Bin 492 -> 565 bytes
 doc/en_US/Icon-media-playback-pause.png            |  Bin 607 -> 680 bytes
 doc/en_US/Icon-media-playback-start.png            |  Bin 619 -> 692 bytes
 doc/en_US/Icon-media-playback-stop.png             |  Bin 619 -> 692 bytes
 doc/en_US/Icon-preferences-other.png               |  Bin 1084 -> 1084 bytes
 doc/en_US/Icon-view-list-tree.png                  |  Bin 439 -> 439 bytes
 doc/en_US/Icon-view-refresh.png                    |  Bin 1250 -> 1323 bytes
 doc/en_US/action-collection-amarok48.png           |  Bin 3835 -> 3854 bytes
 doc/en_US/advancedtok.png                          |  Bin 3697 -> 3598 bytes
 doc/en_US/album.png                                |  Bin 11731 -> 0 bytes
 doc/en_US/albumbar.png                             |  Bin 5744 -> 5573 bytes
 ...marok-2-6-duplicates-during-collection-scan.png |  Bin 0 -> 87161 bytes
 doc/en_US/amarok-apg-presets-toolbar.png           |  Bin 3948 -> 4139 bytes
 doc/en_US/amarok-context.png                       |  Bin 85950 -> 87455 bytes
 doc/en_US/amarok-e17.png                           |  Bin 134027 -> 154968 bytes
 doc/en_US/amarok-fluxbox.png                       |  Bin 164449 -> 187629 bytes
 doc/en_US/amarok-gnome.png                         |  Bin 245162 -> 289755 bytes
 doc/en_US/amarok-lxde.png                          |  Bin 221820 -> 260658 bytes
 doc/en_US/amarok-mac-port-install.png              |  Bin 37815 -> 48898 bytes
 doc/en_US/amarok-maintoolbar.png                   |  Bin 14672 -> 14083 bytes
 doc/en_US/amarok-managing-media.png                |  Bin 61437 -> 62558 bytes
 doc/en_US/amarok-newdynamic-detail.png             |  Bin 40986 -> 46108 bytes
 doc/en_US/amarok-newdynamic.png                    |  Bin 223587 -> 271326 bytes
 doc/en_US/amarok-renameplaylist.png                |  Bin 37231 -> 0 bytes
 doc/en_US/amarok-slimtoolbar.png                   |  Bin 5455 -> 5861 bytes
 doc/en_US/amarok-statsyncing.png                   |  Bin 0 -> 49701 bytes
 doc/en_US/amarok-xfce.png                          |  Bin 156984 -> 177635 bytes
 doc/en_US/amarok.txt                               |   53 +-
 doc/en_US/amarok2-4-1albumtageditdialog.png        |  Bin 42843 -> 40490 bytes
 .../amarok2-4-1albumtageditpertrackdialog.png      |  Bin 45188 -> 42734 bytes
 doc/en_US/amarok2-4-1configplayback.png            |  Bin 51718 -> 0 bytes
 doc/en_US/amarok2-4-1configscripts.png             |  Bin 115415 -> 0 bytes
 doc/en_US/amarok2-4-1configspeakersetup.png        |  Bin 99149 -> 0 bytes
 doc/en_US/amarok2-4-1configuredialog.png           |  Bin 59989 -> 0 bytes
 doc/en_US/amarok2-4-1configuredialogcollection.png |  Bin 83312 -> 81295 bytes
 doc/en_US/amarok2-4-1configuredialogplugins.png    |  Bin 123901 -> 0 bytes
 doc/en_US/amarok2-4-1databaseconfig.png            |  Bin 64075 -> 0 bytes
 doc/en_US/amarok2-4-1editfilterdialog.png          |  Bin 37670 -> 35320 bytes
 .../amarok2-4-1filenamelayoutchooseroptions.png    |  Bin 12589 -> 12186 bytes
 doc/en_US/amarok2-4-1mergedviewcollection.png      |  Bin 26699 -> 26662 bytes
 doc/en_US/amarok2-4-1non-mergedviewcollection.png  |  Bin 25374 -> 25076 bytes
 doc/en_US/amarok2-4-1notifications.png             |  Bin 53843 -> 0 bytes
 doc/en_US/amarok2-4-1phononbackends.png            |  Bin 54489 -> 0 bytes
 doc/en_US/amarok2-4-1phonondevices.png             |  Bin 63269 -> 0 bytes
 doc/en_US/amarok2-4-1saveplaylistchoices.png       |  Bin 11120 -> 0 bytes
 doc/en_US/amarok2-4-1tageditdialog.png             |  Bin 44461 -> 42017 bytes
 doc/en_US/amarok2-4-1viewmenu.png                  |  Bin 7454 -> 7075 bytes
 doc/en_US/amarok2-4.png                            |  Bin 170645 -> 0 bytes
 doc/en_US/amarok2-4collectionsortingmenu.png       |  Bin 78259 -> 77701 bytes
 doc/en_US/amarok2-4helpmenu.png                    |  Bin 20450 -> 0 bytes
 doc/en_US/amarok2-4musicbrainztagger.png           |  Bin 44726 -> 42985 bytes
 doc/en_US/amarok2-4organizefilesadvanceddialog.png |  Bin 15711 -> 15332 bytes
 doc/en_US/amarok2-4organizefilesbasicdialog.png    |  Bin 107770 -> 132040 bytes
 doc/en_US/amarok2-4queueeditor.png                 |  Bin 26516 -> 24667 bytes
 doc/en_US/amarok2-4searchplaylist.png              |  Bin 6074 -> 6036 bytes
 doc/en_US/amarok2-4transcodetracksdialog.png       |  Bin 44466 -> 0 bytes
 doc/en_US/amarok2-6.png                            |  Bin 0 -> 240726 bytes
 doc/en_US/amarok2-6appletbrowser.png               |  Bin 0 -> 64134 bytes
 doc/en_US/amarok2-6configgeneralmenu.png           |  Bin 0 -> 54648 bytes
 doc/en_US/amarok2-6flactranscodemenu.png           |  Bin 0 -> 42510 bytes
 doc/en_US/amarok2-6helpmenu.png                    |  Bin 0 -> 16595 bytes
 doc/en_US/amarok2-6playlistalbumcontextmenu.png    |  Bin 0 -> 9276 bytes
 doc/en_US/amarok2-6pluginsconfigmenu.png           |  Bin 0 -> 169968 bytes
 doc/en_US/amarok2-6scriptsconfigmenu.png           |  Bin 0 -> 100180 bytes
 doc/en_US/amarok2-6trackcontextmenu.png            |  Bin 0 -> 12623 bytes
 doc/en_US/amarok2-6transcodemenu.png               |  Bin 0 -> 41726 bytes
 doc/en_US/amarok2-6viewconfigmenu.png              |  Bin 0 -> 9772 bytes
 doc/en_US/amarok2-6viewundocksymbols.png           |  Bin 0 -> 6371 bytes
 doc/en_US/amarok2-7addtoplaylist.png               |  Bin 0 -> 196553 bytes
 doc/en_US/amarok2-7aftersplash.png                 |  Bin 0 -> 77720 bytes
 doc/en_US/amarok2-7menutools.png                   |  Bin 0 -> 13111 bytes
 doc/en_US/amarok2-7networkrequestsviewer.png       |  Bin 0 -> 38296 bytes
 doc/en_US/amarok2-7removefromplaylist.png          |  Bin 0 -> 499011 bytes
 doc/en_US/amarok2-7renamesavedplaylist.png         |  Bin 0 -> 60037 bytes
 doc/en_US/amarok2-7saveplaylistchoices.png         |  Bin 0 -> 93217 bytes
 doc/en_US/amarok2-7settingsplugins.png             |  Bin 0 -> 92072 bytes
 doc/en_US/amarok2-7themediasources.png             |  Bin 0 -> 87987 bytes
 doc/en_US/amarok2-7theplaylist.png                 |  Bin 0 -> 35170 bytes
 doc/en_US/amarok2-7thetoolbar.png                  |  Bin 0 -> 6327 bytes
 doc/en_US/amarok24_configureshortcutdetail.png     |  Bin 10127 -> 10804 bytes
 doc/en_US/amarok24_configureshortcutsdialog.png    |  Bin 68653 -> 67562 bytes
 doc/en_US/amarok24_settingsmenu.png                |  Bin 9141 -> 9314 bytes
 doc/en_US/amarok24_settingsmenu_withreplaygain.png |  Bin 13576 -> 13728 bytes
 doc/en_US/amarok2_moodbar.png                      |  Bin 54702 -> 52182 bytes
 doc/en_US/amarok_2-6_layout.png                    |  Bin 0 -> 387481 bytes
 doc/en_US/amarok_add-on_installer.png              |  Bin 63513 -> 60157 bytes
 doc/en_US/amarok_addtoplaylist.png                 |  Bin 309573 -> 0 bytes
 doc/en_US/amarok_addtoplaylist1.png                |  Bin 48826 -> 47467 bytes
 doc/en_US/amarok_amarokmenu2-4.png                 |  Bin 19505 -> 18940 bytes
 doc/en_US/amarok_ampache_client2.png               |  Bin 24108 -> 24363 bytes
 doc/en_US/amarok_connecting_media_devices.png      |  Bin 18290 -> 17707 bytes
 doc/en_US/amarok_cover_manager.png                 |  Bin 218474 -> 220007 bytes
 doc/en_US/amarok_cover_manager_newcover.png        |  Bin 301112 -> 302713 bytes
 doc/en_US/amarok_dynamic_playlist.png              |  Bin 183876 -> 220140 bytes
 doc/en_US/amarok_layout11.png                      |  Bin 116734 -> 116465 bytes
 doc/en_US/amarok_layout22.png                      |  Bin 148766 -> 147925 bytes
 doc/en_US/amarok_layout23.png                      |  Bin 177692 -> 211248 bytes
 doc/en_US/amarok_layout24.png                      |  Bin 218221 -> 257006 bytes
 doc/en_US/amarok_layout25.png                      |  Bin 174064 -> 205986 bytes
 doc/en_US/amarok_layout26.png                      |  Bin 87228 -> 106699 bytes
 doc/en_US/amarok_layout27.png                      |  Bin 110819 -> 136055 bytes
 doc/en_US/amarok_layout28.png                      |  Bin 62911 -> 61982 bytes
 doc/en_US/amarok_loading_media_devices.png         |  Bin 21523 -> 21903 bytes
 doc/en_US/amarok_locale_selection.png              |  Bin 37983 -> 35952 bytes
 doc/en_US/amarok_main_toolbar.png                  |  Bin 13291 -> 12697 bytes
 doc/en_US/amarok_media_devices.png                 |  Bin 34411 -> 35028 bytes
 doc/en_US/amarok_on_mac.png                        |  Bin 164620 -> 188271 bytes
 doc/en_US/amarok_playlist_layout_d_ss.png          |  Bin 39325 -> 38484 bytes
 doc/en_US/amarok_playlist_layout_editor.png        |  Bin 68225 -> 75306 bytes
 doc/en_US/amarok_playlist_layout_nog1_s.png        |  Bin 45381 -> 45805 bytes
 doc/en_US/amarok_playlist_layout_nog2_s.png        |  Bin 30021 -> 29306 bytes
 doc/en_US/amarok_playlist_layout_v1_s.png          |  Bin 59077 -> 58181 bytes
 doc/en_US/amarok_playlist_manipulation.png         |  Bin 48014 -> 45409 bytes
 doc/en_US/amarok_playlist_search_ex.png            |  Bin 20412 -> 20215 bytes
 doc/en_US/amarok_removeformplaylist.png            |  Bin 247020 -> 0 bytes
 doc/en_US/amarok_saved_playlists.png               |  Bin 47482 -> 48139 bytes
 doc/en_US/amarok_script_info.png                   |  Bin 20125 -> 0 bytes
 doc/en_US/amarok_script_manager.png                |  Bin 93143 -> 0 bytes
 doc/en_US/amarok_show_only_matches.png             |  Bin 7706 -> 7671 bytes
 doc/en_US/amarok_slim_toolbar.png                  |  Bin 8737 -> 8166 bytes
 doc/en_US/amarok_tracks_media_devices1.png         |  Bin 53302 -> 53899 bytes
 doc/en_US/amarok_windowlayout.png                  |  Bin 229025 -> 0 bytes
 doc/en_US/amarokbreadcrumb.png                     |  Bin 11615 -> 12558 bytes
 doc/en_US/amarokconfigurationdialog2-7database.png |  Bin 0 -> 93902 bytes
 .../amarokconfigurationdialog2-7notifications.png  |  Bin 0 -> 80844 bytes
 .../amarokconfigurationdialog2-7phononbackend.png  |  Bin 0 -> 90847 bytes
 .../amarokconfigurationdialog2-7phonondevice.png   |  Bin 0 -> 144788 bytes
 .../amarokconfigurationdialog2-7phononhardware.png |  Bin 0 -> 109772 bytes
 doc/en_US/amarokconfigurationdialog2-7playback.png |  Bin 0 -> 75100 bytes
 .../amarokconfigurationdialog2-7scriptconsole.png  |  Bin 0 -> 69491 bytes
 doc/en_US/amarokconfigurationdialoggeneral2-7.png  |  Bin 0 -> 86536 bytes
 ...amarokconfigurationdialoglocalcollection2-7.png |  Bin 0 -> 98008 bytes
 doc/en_US/amarokmediasources-files.png             |  Bin 17328 -> 16594 bytes
 doc/en_US/amarokmediasources-home.png              |  Bin 27699 -> 27957 bytes
 doc/en_US/amaroknepomukcollectionbrowser2-7.png    |  Bin 0 -> 77841 bytes
 doc/en_US/amaroknepomukpluginconfig2-7.png         |  Bin 0 -> 101197 bytes
 doc/en_US/amaroknew2-4.png                         |  Bin 133093 -> 135236 bytes
 doc/en_US/amarokrightmenu.png                      |  Bin 17892 -> 17559 bytes
 doc/en_US/amarokripcd.png                          |  Bin 92903 -> 93410 bytes
 doc/en_US/amaroksystray.png                        |  Bin 4147 -> 3989 bytes
 doc/en_US/amaroktoplevelmenus2-4.png               |  Bin 8679 -> 8283 bytes
 doc/en_US/amarokwindow_context.png                 |  Bin 86845 -> 88391 bytes
 doc/en_US/amarokwindow_mediasources.png            |  Bin 61354 -> 0 bytes
 doc/en_US/amarokwindow_playlist.png                |  Bin 64239 -> 0 bytes
 doc/en_US/apgpresetsmatchallgroup.png              |  Bin 39180 -> 37637 bytes
 doc/en_US/app.png                                  |  Bin 60721 -> 0 bytes
 doc/en_US/applet_explorer.png                      |  Bin 0 -> 70134 bytes
 doc/en_US/applications-internet.png                |  Bin 5276 -> 5371 bytes
 doc/en_US/bookmarking_menu.png                     |  Bin 4051 -> 3664 bytes
 doc/en_US/cd_collection_sansa.png                  |  Bin 69799 -> 71149 bytes
 doc/en_US/context_menu.png                         |  Bin 6162 -> 0 bytes
 doc/en_US/contextpane.png                          |  Bin 225481 -> 213700 bytes
 doc/en_US/contextpanestopped.png                   |  Bin 119676 -> 123454 bytes
 doc/en_US/controlamarok.png                        |  Bin 16747 -> 18731 bytes
 doc/en_US/desktop_search.png                       |  Bin 0 -> 81414 bytes
 doc/en_US/document-save.png                        |  Bin 2278 -> 2386 bytes
 doc/en_US/dynamic_playlist.png                     |  Bin 26292 -> 0 bytes
 doc/en_US/edit-redo.png                            |  Bin 3587 -> 3679 bytes
 doc/en_US/edit-undo.png                            |  Bin 3621 -> 3722 bytes
 doc/en_US/favor.png                                |  Bin 3526 -> 3105 bytes
 doc/en_US/firstruncollection2.png                  |  Bin 28064 -> 26489 bytes
 doc/en_US/folder-amarok.png                        |  Bin 1370 -> 1461 bytes
 doc/en_US/generatedlist.png                        |  Bin 231006 -> 239351 bytes
 doc/en_US/generatingtree.png                       |  Bin 125711 -> 127727 bytes
 doc/en_US/hi48-action-clear-playlist-amarok.png    |  Bin 3477 -> 3614 bytes
 doc/en_US/hi48-action-edit-playlist-queue.png      |  Bin 1040 -> 889 bytes
 ...ion-media-standard-track-progression-amarok.png |  Bin 3154 -> 3237 bytes
 doc/en_US/hi48-action-music-amarok.png             |  Bin 3048 -> 3147 bytes
 doc/en_US/hi48-action-podcast-amarok.png           |  Bin 4416 -> 4595 bytes
 doc/en_US/index.docbook                            | 1278 +-
 doc/en_US/installation1-1.png                      |  Bin 14898 -> 14803 bytes
 doc/en_US/installation2.png                        |  Bin 13147 -> 12034 bytes
 doc/en_US/installation3.png                        |  Bin 11368 -> 10570 bytes
 doc/en_US/installation4.png                        |  Bin 11315 -> 10585 bytes
 doc/en_US/ipod-connected-dialog.png                |  Bin 0 -> 36744 bytes
 doc/en_US/last-fm-spelling-correction.png          |  Bin 0 -> 72833 bytes
 doc/en_US/matchedtrackspage.png                    |  Bin 0 -> 342154 bytes
 doc/en_US/media_sources1.png                       |  Bin 28168 -> 27793 bytes
 doc/en_US/media_sources3.png                       |  Bin 12756 -> 12470 bytes
 doc/en_US/mediasources.png                         |  Bin 54088 -> 51181 bytes
 doc/en_US/mediasources10.png                       |  Bin 10220 -> 9821 bytes
 doc/en_US/mediasources4.png                        |  Bin 47012 -> 0 bytes
 doc/en_US/mediasources5.png                        |  Bin 24486 -> 23813 bytes
 doc/en_US/mediasources6.png                        |  Bin 34364 -> 33525 bytes
 doc/en_US/mediasources7.png                        |  Bin 21711 -> 22179 bytes
 doc/en_US/mediasources8.png                        |  Bin 10853 -> 10924 bytes
 doc/en_US/mediasourcesex.png                       |  Bin 15069 -> 14645 bytes
 doc/en_US/metadatadialog.png                       |  Bin 0 -> 97754 bytes
 ...w_amarok_configuration_options_general_edit.png |  Bin 73935 -> 0 bytes
 ...ok_configuration_options_notifications_edit.png |  Bin 58591 -> 0 bytes
 doc/en_US/nocover_amarok.png                       |  Bin 3804 -> 3846 bytes
 doc/en_US/oraganize_menu.png                       |  Bin 22968 -> 22421 bytes
 doc/en_US/otherplatforms_nonkde.png                |  Bin 5941 -> 5536 bytes
 doc/en_US/otherplatforms_osx.png                   |  Bin 7950 -> 8033 bytes
 doc/en_US/otherplatforms_windows.png               |  Bin 7104 -> 7202 bytes
 doc/en_US/playlist-layout-editor-amarok.png        |  Bin 77805 -> 75648 bytes
 .../playlist-layout-item-configuration-amarok.png  |  Bin 25276 -> 24157 bytes
 doc/en_US/playlist2.png                            |  Bin 25614 -> 0 bytes
 doc/en_US/playlist_save.png                        |  Bin 11984 -> 11319 bytes
 doc/en_US/playlistlayout1.png                      |  Bin 26306 -> 24944 bytes
 doc/en_US/playlistlayout2.png                      |  Bin 29927 -> 28486 bytes
 doc/en_US/playlistlayout3.png                      |  Bin 27061 -> 25633 bytes
 doc/en_US/playlistlayout4.png                      |  Bin 29565 -> 28073 bytes
 doc/en_US/playlistmenu.png                         |  Bin 8387 -> 7924 bytes
 doc/en_US/playlistpic.png                          |  Bin 14004 -> 12836 bytes
 doc/en_US/playlistqueue.png                        |  Bin 9724 -> 9119 bytes
 doc/en_US/playlistsearch.png                       |  Bin 17122 -> 16031 bytes
 doc/en_US/queue.png                                |  Bin 29829 -> 28080 bytes
 doc/en_US/queueend.png                             |  Bin 7518 -> 6917 bytes
 doc/en_US/remotecollections_ampache_client.png     |  Bin 63676 -> 0 bytes
 doc/en_US/remotecollections_ampache_client1.png    |  Bin 25727 -> 25136 bytes
 doc/en_US/remotecollections_ampache_client2.png    |  Bin 50901 -> 52012 bytes
 doc/en_US/remotecollections_client.png             |  Bin 54776 -> 52035 bytes
 doc/en_US/remotecollections_daap.png               |  Bin 20468 -> 20080 bytes
 doc/en_US/remotecollections_daap_config.png        |  Bin 42471 -> 0 bytes
 doc/en_US/remotecollections_samba_server.png       |  Bin 25597 -> 23860 bytes
 doc/en_US/remotecollections_samba_server1.png      |  Bin 123755 -> 115150 bytes
 doc/en_US/remotecollections_samba_server2.png      |  Bin 24238 -> 22584 bytes
 doc/en_US/remotecollections_samba_server3.png      |  Bin 36703 -> 35258 bytes
 doc/en_US/searchincollection.png                   |  Bin 13931 -> 13434 bytes
 doc/en_US/searchincollection_example_editbox.png   |  Bin 50212 -> 51128 bytes
 doc/en_US/searchincollection_example_editbox2.png  |  Bin 23991 -> 23352 bytes
 doc/en_US/settings-internet-amarok.png             |  Bin 79114 -> 0 bytes
 doc/en_US/slim_toolbar.png                         |  Bin 0 -> 6211 bytes
 doc/en_US/sorting.png                              |  Bin 11259 -> 5047 bytes
 doc/en_US/sorting2.png                             |  Bin 17868 -> 17100 bytes
 doc/en_US/tagedit_fromfile_advanced.png            |  Bin 44635 -> 42648 bytes
 doc/en_US/tagedit_fromfile_advanced_example.png    |  Bin 45899 -> 43848 bytes
 doc/en_US/tagedit_fromfile_basic.png               |  Bin 66170 -> 63071 bytes
 doc/en_US/tagedit_fromfile_basic_example.png       |  Bin 69385 -> 66521 bytes
 doc/en_US/toolbar_main.png                         |  Bin 19535 -> 17823 bytes
 doc/en_US/toolbar_slim.png                         |  Bin 6521 -> 0 bytes
 doc/en_US/toolmenu.png                             |  Bin 5903 -> 0 bytes
 doc/en_US/tools_bookmarkmanager.png                |  Bin 37319 -> 34275 bytes
 doc/en_US/tools_covermanager.png                   |  Bin 332667 -> 379482 bytes
 doc/en_US/tools_equalizer.png                      |  Bin 16949 -> 16006 bytes
 doc/en_US/track_progression.png                    |  Bin 9733 -> 9044 bytes
 doc/en_US/transcode_1.png                          |  Bin 45901 -> 0 bytes
 doc/en_US/view-media-playlist.png                  |  Bin 1834 -> 1645 bytes
 doc/es/index.docbook                               | 2300 +-
 doc/nl/index.docbook                               | 3545 ++--
 doc/pt/index.docbook                               |    6 +-
 doc/pt_BR/index.docbook                            | 2580 ++-
 doc/sv/index.docbook                               | 2150 +-
 doc/uk/album.png                                   |  Bin 12987 -> 0 bytes
 ...marok-2-6-duplicates-during-collection-scan.png |  Bin 0 -> 17366 bytes
 doc/uk/amarok-renameplaylist.png                   |  Bin 48331 -> 0 bytes
 doc/uk/amarok2-4-1configplayback.png               |  Bin 67325 -> 0 bytes
 doc/uk/amarok2-4-1configscripts.png                |  Bin 113240 -> 0 bytes
 doc/uk/amarok2-4-1configspeakersetup.png           |  Bin 75368 -> 0 bytes
 doc/uk/amarok2-4-1configuredialog.png              |  Bin 83924 -> 0 bytes
 doc/uk/amarok2-4-1configuredialogplugins.png       |  Bin 178356 -> 0 bytes
 doc/uk/amarok2-4-1databaseconfig.png               |  Bin 88990 -> 0 bytes
 doc/uk/amarok2-4-1notifications.png                |  Bin 73240 -> 0 bytes
 doc/uk/amarok2-4-1phononbackends.png               |  Bin 65660 -> 0 bytes
 doc/uk/amarok2-4-1phonondevices.png                |  Bin 106872 -> 0 bytes
 doc/uk/amarok2-4-1saveplaylistchoices.png          |  Bin 17650 -> 0 bytes
 doc/uk/amarok2-4-1tageditdialog.png                |  Bin 0 -> 18557 bytes
 doc/uk/amarok2-4.png                               |  Bin 369040 -> 0 bytes
 doc/uk/amarok2-4helpmenu.png                       |  Bin 18026 -> 0 bytes
 doc/uk/amarok2-4transcodetracksdialog.png          |  Bin 60390 -> 0 bytes
 doc/uk/amarok2-6.png                               |  Bin 0 -> 130609 bytes
 doc/uk/amarok2-6appletbrowser.png                  |  Bin 0 -> 24727 bytes
 doc/uk/amarok2-6configgeneralmenu.png              |  Bin 0 -> 33338 bytes
 doc/uk/amarok2-6flactranscodemenu.png              |  Bin 0 -> 26888 bytes
 doc/uk/amarok2-6helpmenu.png                       |  Bin 0 -> 9032 bytes
 doc/uk/amarok2-6playlistalbumcontextmenu.png       |  Bin 0 -> 6887 bytes
 doc/uk/amarok2-6pluginsconfigmenu.png              |  Bin 0 -> 61325 bytes
 doc/uk/amarok2-6scriptsconfigmenu.png              |  Bin 0 -> 41118 bytes
 doc/uk/amarok2-6trackcontextmenu.png               |  Bin 0 -> 8549 bytes
 doc/uk/amarok2-6transcodemenu.png                  |  Bin 0 -> 26502 bytes
 doc/uk/amarok2-6viewconfigmenu.png                 |  Bin 0 -> 7524 bytes
 doc/uk/amarok2-6viewundocksymbols.png              |  Bin 0 -> 2766 bytes
 doc/uk/amarok2-7addtoplaylist.png                  |  Bin 0 -> 117988 bytes
 doc/uk/amarok2-7aftersplash.png                    |  Bin 0 -> 39058 bytes
 doc/uk/amarok2-7menutools.png                      |  Bin 0 -> 8273 bytes
 doc/uk/amarok2-7removefromplaylist.png             |  Bin 0 -> 129853 bytes
 doc/uk/amarok2-7renamesavedplaylist.png            |  Bin 0 -> 25852 bytes
 doc/uk/amarok2-7saveplaylistchoices.png            |  Bin 0 -> 50148 bytes
 doc/uk/amarok2-7settingsplugins.png                |  Bin 0 -> 38230 bytes
 doc/uk/amarok2-7themediasources.png                |  Bin 0 -> 36352 bytes
 doc/uk/amarok2-7theplaylist.png                    |  Bin 0 -> 35884 bytes
 doc/uk/amarok2-7thetoolbar.png                     |  Bin 0 -> 10752 bytes
 doc/uk/amarok_2-6_layout.png                       |  Bin 0 -> 113250 bytes
 doc/uk/amarok_addtoplaylist.png                    |  Bin 341942 -> 0 bytes
 doc/uk/amarok_removeformplaylist.png               |  Bin 336548 -> 0 bytes
 doc/uk/amarok_script_info.png                      |  Bin 42570 -> 0 bytes
 doc/uk/amarok_windowlayout.png                     |  Bin 294856 -> 0 bytes
 doc/uk/amarokconfigurationdialog2-7database.png    |  Bin 0 -> 35359 bytes
 .../amarokconfigurationdialog2-7notifications.png  |  Bin 0 -> 27860 bytes
 .../amarokconfigurationdialog2-7phononbackend.png  |  Bin 0 -> 19649 bytes
 .../amarokconfigurationdialog2-7phonondevice.png   |  Bin 0 -> 33848 bytes
 .../amarokconfigurationdialog2-7phononhardware.png |  Bin 0 -> 27682 bytes
 doc/uk/amarokconfigurationdialog2-7playback.png    |  Bin 0 -> 25225 bytes
 doc/uk/amarokconfigurationdialoggeneral2-7.png     |  Bin 0 -> 32800 bytes
 ...amarokconfigurationdialoglocalcollection2-7.png |  Bin 0 -> 36454 bytes
 doc/uk/amaroknepomukpluginconfig2-7.png            |  Bin 0 -> 38091 bytes
 doc/uk/amarokwindow_mediasources.png               |  Bin 114354 -> 0 bytes
 doc/uk/amarokwindow_playlist.png                   |  Bin 108373 -> 0 bytes
 doc/uk/app.png                                     |  Bin 57227 -> 0 bytes
 doc/uk/context_menu.png                            |  Bin 16608 -> 0 bytes
 doc/uk/desktop_search.png                          |  Bin 0 -> 30691 bytes
 doc/uk/index.docbook                               | 2120 +-
 doc/uk/mediasources4.png                           |  Bin 74687 -> 0 bytes
 doc/uk/metadatadialog.png                          |  Bin 0 -> 39290 bytes
 ...w_amarok_configuration_options_general_edit.png |  Bin 83105 -> 0 bytes
 ...ok_configuration_options_notifications_edit.png |  Bin 71254 -> 0 bytes
 doc/uk/playlist2.png                               |  Bin 115964 -> 0 bytes
 doc/uk/tagedit_fromfile_advanced.png               |  Bin 96257 -> 31477 bytes
 doc/uk/tagedit_fromfile_advanced_example.png       |  Bin 0 -> 32836 bytes
 doc/uk/tagedit_fromfile_basic.png                  |  Bin 116819 -> 41393 bytes
 doc/uk/tagedit_fromfile_basic_example.png          |  Bin 0 -> 40341 bytes
 doc/uk/toolbar_slim.png                            |  Bin 11209 -> 0 bytes
 doc/uk/toolmenu.png                                |  Bin 17887 -> 0 bytes
 doc/uk/transcode_1.png                             |  Bin 65344 -> 0 bytes
 external/CMakeLists.txt                            |    2 -
 external/README.txt                                |    1 -
 po/CMakeLists.txt                                  |    2 +-
 po/bs/amarok.po                                    |25698 +++++++++---------
 po/bs/amarok_scriptengine_qscript.po               |   20 +-
 po/bs/amarokcollectionscanner_qt.po                |   42 +-
 po/bs/amarokpkg.po                                 |   20 +-
 po/ca/amarok.po                                    |24635 +++++++++---------
 po/ca/amarok_scriptengine_qscript.po               |   20 +-
 po/ca/amarokcollectionscanner_qt.po                |   12 +-
 po/ca/amarokpkg.po                                 |   20 +-
 po/ca at valencia/amarok.po                           |25664 +++++++++---------
 po/ca at valencia/amarok_scriptengine_qscript.po      |   20 +-
 po/ca at valencia/amarokcollectionscanner_qt.po       |   12 +-
 po/ca at valencia/amarokpkg.po                        |   20 +-
 po/cs/amarok.po                                    |27780 +++++++++-----------
 po/cs/amarok_scriptengine_qscript.po               |   20 +-
 po/cs/amarokcollectionscanner_qt.po                |   60 +-
 po/cs/amarokpkg.po                                 |   20 +-
 po/da/amarok.po                                    |24298 +++++++++---------
 po/da/amarok_scriptengine_qscript.po               |   20 +-
 po/da/amarokcollectionscanner_qt.po                |   12 +-
 po/da/amarokpkg.po                                 |   20 +-
 po/de/amarok.po                                    |25490 +++++++++---------
 po/de/amarok_scriptengine_qscript.po               |   20 +-
 po/de/amarokcollectionscanner_qt.po                |   12 +-
 po/de/amarokpkg.po                                 |   20 +-
 po/el/amarok.po                                    |25575 +++++++++---------
 po/el/amarok_scriptengine_qscript.po               |   20 +-
 po/el/amarokcollectionscanner_qt.po                |   12 +-
 po/el/amarokpkg.po                                 |   20 +-
 po/en_GB/amarok.po                                 |26130 +++++++++---------
 po/en_GB/amarok_scriptengine_qscript.po            |   20 +-
 po/en_GB/amarokcollectionscanner_qt.po             |   12 +-
 po/en_GB/amarokpkg.po                              |   20 +-
 po/es/amarok.po                                    |25196 +++++++++---------
 po/es/amarok_scriptengine_qscript.po               |   20 +-
 po/es/amarokcollectionscanner_qt.po                |   20 +-
 po/es/amarokpkg.po                                 |   28 +-
 po/et/amarok.po                                    |24343 +++++++++---------
 po/et/amarok_scriptengine_qscript.po               |   20 +-
 po/et/amarokcollectionscanner_qt.po                |   12 +-
 po/et/amarokpkg.po                                 |   20 +-
 po/eu/amarok.po                                    |25808 +++++++++---------
 po/eu/amarok_scriptengine_qscript.po               |   20 +-
 po/eu/amarokcollectionscanner_qt.po                |   12 +-
 po/eu/amarokpkg.po                                 |   20 +-
 po/fi/amarok.po                                    |24990 +++++++++---------
 po/fi/amarok_scriptengine_qscript.po               |   20 +-
 po/fi/amarokcollectionscanner_qt.po                |   12 +-
 po/fi/amarokpkg.po                                 |   20 +-
 po/fr/CMakeLists.txt                               |    2 +
 po/fr/amarok.po                                    |16258 ++++++++++++
 po/fr/amarok_scriptengine_qscript.po               |   90 +
 po/fr/amarokcollectionscanner_qt.po                |  138 +
 po/fr/amarokpkg.po                                 |  126 +
 po/ga/amarok.po                                    |23912 +++++++++---------
 po/ga/amarok_scriptengine_qscript.po               |   20 +-
 po/ga/amarokcollectionscanner_qt.po                |   12 +-
 po/ga/amarokpkg.po                                 |   20 +-
 po/gl/amarok.po                                    |25300 +++++++++---------
 po/gl/amarok_scriptengine_qscript.po               |   20 +-
 po/gl/amarokcollectionscanner_qt.po                |   88 +-
 po/gl/amarokpkg.po                                 |   20 +-
 po/hu/amarok.po                                    |25185 +++++++++---------
 po/hu/amarok_scriptengine_qscript.po               |   20 +-
 po/hu/amarokcollectionscanner_qt.po                |   12 +-
 po/hu/amarokpkg.po                                 |   20 +-
 po/ia/CMakeLists.txt                               |    2 -
 po/ia/amarokcollectionscanner_qt.po                |   97 -
 po/it/amarok.po                                    |25499 +++++++++---------
 po/it/amarok_scriptengine_qscript.po               |   20 +-
 po/it/amarokcollectionscanner_qt.po                |   12 +-
 po/it/amarokpkg.po                                 |   20 +-
 po/ja/amarok.po                                    |25300 +++++++++---------
 po/ja/amarok_scriptengine_qscript.po               |   20 +-
 po/ja/amarokcollectionscanner_qt.po                |   12 +-
 po/ja/amarokpkg.po                                 |   20 +-
 po/lt/amarok.po                                    |26053 +++++++++---------
 po/lt/amarok_scriptengine_qscript.po               |   20 +-
 po/lt/amarokcollectionscanner_qt.po                |   49 +-
 po/lt/amarokpkg.po                                 |   20 +-
 po/lv/amarok.po                                    |25059 +++++++++---------
 po/lv/amarok_scriptengine_qscript.po               |   20 +-
 po/lv/amarokcollectionscanner_qt.po                |   12 +-
 po/lv/amarokpkg.po                                 |   20 +-
 po/nb/amarok.po                                    |25467 +++++++++---------
 po/nb/amarok_scriptengine_qscript.po               |   20 +-
 po/nb/amarokcollectionscanner_qt.po                |   12 +-
 po/nb/amarokpkg.po                                 |   20 +-
 po/nl/amarok.po                                    |25454 +++++++++---------
 po/nl/amarok_scriptengine_qscript.po               |   20 +-
 po/nl/amarokcollectionscanner_qt.po                |   12 +-
 po/nl/amarokpkg.po                                 |   20 +-
 po/pa/amarok.po                                    |23885 +++++++++---------
 po/pa/amarokcollectionscanner_qt.po                |   12 +-
 po/pa/amarokpkg.po                                 |   20 +-
 po/pl/amarok.po                                    |25003 +++++++++---------
 po/pl/amarok_scriptengine_qscript.po               |   20 +-
 po/pl/amarokcollectionscanner_qt.po                |   12 +-
 po/pl/amarokpkg.po                                 |   20 +-
 po/pt/amarok.po                                    |25136 +++++++++---------
 po/pt/amarok_scriptengine_qscript.po               |   20 +-
 po/pt/amarokcollectionscanner_qt.po                |   12 +-
 po/pt/amarokpkg.po                                 |   20 +-
 po/pt_BR/amarok.po                                 |24529 +++++++++---------
 po/pt_BR/amarok_scriptengine_qscript.po            |   20 +-
 po/pt_BR/amarokcollectionscanner_qt.po             |   12 +-
 po/pt_BR/amarokpkg.po                              |   20 +-
 po/ru/amarok.po                                    |26363 ++++++++++---------
 po/ru/amarok_scriptengine_qscript.po               |   20 +-
 po/ru/amarokcollectionscanner_qt.po                |   12 +-
 po/ru/amarokpkg.po                                 |   20 +-
 po/sl/amarok.po                                    |25677 +++++++++---------
 po/sl/amarok_scriptengine_qscript.po               |   20 +-
 po/sl/amarokcollectionscanner_qt.po                |   12 +-
 po/sl/amarokpkg.po                                 |   20 +-
 po/sr/amarok.po                                    |26538 ++++++++++----------
 po/sr/amarok_scriptengine_qscript.po               |   20 +-
 po/sr/amarokcollectionscanner_qt.po                |   12 +-
 po/sr at ijekavian/amarok.po                          |26556 ++++++++++----------
 po/sr at ijekavian/amarok_scriptengine_qscript.po     |   20 +-
 po/sr at ijekavian/amarokcollectionscanner_qt.po      |   12 +-
 po/sr at ijekavianlatin/amarok.po                     |26586 ++++++++++----------
 .../amarok_scriptengine_qscript.po                 |   20 +-
 po/sr at ijekavianlatin/amarokcollectionscanner_qt.po |   12 +-
 po/sr at latin/amarok.po                              |26544 ++++++++++----------
 po/sr at latin/amarok_scriptengine_qscript.po         |   20 +-
 po/sr at latin/amarokcollectionscanner_qt.po          |   12 +-
 po/sv/amarok.po                                    |24356 +++++++++---------
 po/sv/amarok_scriptengine_qscript.po               |   20 +-
 po/sv/amarokcollectionscanner_qt.po                |   12 +-
 po/sv/amarokpkg.po                                 |   20 +-
 po/uk/amarok.po                                    |26427 ++++++++++----------
 po/uk/amarok_scriptengine_qscript.po               |   20 +-
 po/uk/amarokcollectionscanner_qt.po                |   12 +-
 po/uk/amarokpkg.po                                 |   20 +-
 po/zh_CN/amarok.po                                 |23691 +++++++++---------
 po/zh_CN/amarok_scriptengine_qscript.po            |   20 +-
 po/zh_CN/amarokcollectionscanner_qt.po             |   52 +-
 po/zh_CN/amarokpkg.po                              |   20 +-
 po/zh_TW/amarok.po                                 |23650 +++++++++---------
 po/zh_TW/amarok_scriptengine_qscript.po            |   20 +-
 po/zh_TW/amarokcollectionscanner_qt.po             |   12 +-
 po/zh_TW/amarokpkg.po                              |   20 +-
 shared/FileType.cpp                                |   13 +-
 shared/FileType.h                                  |   78 +-
 shared/FileTypeResolver.cpp                        |   24 +
 shared/MetaTagLib.cpp                              |    3 +-
 shared/Version.h                                   |    8 +-
 {utilities => shared}/collectionscanner/Album.cpp  |    0
 shared/collectionscanner/Album.h                   |   81 +
 shared/collectionscanner/BatchFile.cpp             |  155 +
 shared/collectionscanner/BatchFile.h               |   73 +
 shared/collectionscanner/Directory.cpp             |  248 +
 shared/collectionscanner/Directory.h               |  110 +
 shared/collectionscanner/Playlist.cpp              |   72 +
 shared/collectionscanner/Playlist.h                |   70 +
 shared/collectionscanner/ScanningState.cpp         |  194 +
 shared/collectionscanner/ScanningState.h           |   75 +
 shared/collectionscanner/Track.cpp                 |  530 +
 shared/collectionscanner/Track.h                   |  165 +
 shared/collectionscanner/utils.h                   |   52 +
 shared/config.h.cmake                              |   28 +
 shared/tag_helpers/APETagHelper.h                  |    2 +-
 shared/tag_helpers/ASFTagHelper.cpp                |    2 +-
 shared/tag_helpers/ASFTagHelper.h                  |    2 +-
 shared/tag_helpers/ID3v2TagHelper.cpp              |    8 +-
 shared/tag_helpers/ID3v2TagHelper.h                |    2 +-
 shared/tag_helpers/MP4TagHelper.h                  |    2 +-
 shared/tag_helpers/StringHelper.h                  |    2 +-
 shared/tag_helpers/TagHelper.cpp                   |   35 +-
 shared/tag_helpers/VorbisCommentTagHelper.cpp      |   94 +-
 shared/tag_helpers/VorbisCommentTagHelper.h        |    7 +-
 src/ActionClasses.cpp                              |   55 +-
 src/App.cpp                                        |   25 +-
 src/App.h                                          |   11 +-
 src/CMakeLists.txt                                 |  149 +-
 src/DirectoryLoader.cpp                            |  107 +-
 src/DirectoryLoader.h                              |   36 +-
 src/EngineController.cpp                           |  270 +-
 src/EngineController.h                             |   47 +-
 src/KNotificationBackend.cpp                       |  142 +-
 src/KNotificationBackend.h                         |   33 +-
 src/LastfmReadLabelCapability.cpp                  |    8 +-
 src/MainWindow.cpp                                 |   68 +-
 src/MainWindow.h                                   |    8 +-
 src/MediaDeviceMonitor.cpp                         |  110 -
 src/MediaDeviceMonitor.h                           |   41 +-
 src/MountPointManager.cpp                          |  639 -
 src/MountPointManager.h                            |  260 -
 src/PluginManager.cpp                              |   21 +-
 src/PluginManager.h                                |    4 +-
 src/PopupDropperFactory.cpp                        |    8 +-
 src/ScriptManager.cpp                              |    2 +-
 src/ScriptManager.h                                |    2 +-
 src/ScriptUpdater.h                                |    2 +-
 src/TrayIcon.cpp                                   |   17 +-
 src/aboutdialog/ExtendedAboutDialog.cpp            |   10 +-
 src/aboutdialog/OcsPersonItem.ui                   |    2 +-
 src/amarok.desktop                                 |   10 +-
 src/amarok_addaspodcast.desktop                    |    2 +-
 src/amarok_containers.desktop                      |   10 +-
 src/amarokurls/AmarokUrlGenerator.h                |    2 +-
 src/amarokurls/BookmarkManagerWidget.cpp           |   12 +-
 src/amarokurls/BookmarkManagerWidget.h             |    4 +-
 src/amarokurls/BookmarkMetaActions.cpp             |    7 +-
 src/amarokurls/BookmarkModel.cpp                   |    4 +-
 src/amarokurls/NavigationUrlGenerator.cpp          |   17 +-
 src/amarokurls/NavigationUrlRunner.cpp             |   10 +-
 src/amarokurls/PlayUrlGenerator.h                  |    2 +-
 src/browsers/BrowserBreadcrumbItem.cpp             |   61 +-
 src/browsers/BrowserBreadcrumbItem.h               |   18 +-
 src/browsers/BrowserBreadcrumbWidget.cpp           |   68 +-
 src/browsers/BrowserBreadcrumbWidget.h             |   33 +-
 src/browsers/BrowserCategory.cpp                   |   11 +-
 src/browsers/BrowserCategory.h                     |    8 +-
 src/browsers/BrowserCategoryList.cpp               |    5 +-
 src/browsers/BrowserMessageArea.cpp                |    7 +-
 src/browsers/CollectionTreeItem.cpp                |    8 +-
 src/browsers/CollectionTreeItem.h                  |    3 +-
 src/browsers/CollectionTreeItemModelBase.cpp       |   18 +-
 src/browsers/CollectionTreeItemModelBase.h         |    1 +
 src/browsers/CollectionTreeView.cpp                |   34 +-
 .../collectionbrowser/CollectionBrowserTreeView.h  |    2 +-
 .../CollectionTreeItemDelegate.cpp                 |    6 +-
 .../collectionbrowser/CollectionWidget.cpp         |   20 +-
 src/browsers/collectionbrowser/CollectionWidget.h  |    2 +-
 .../DirPlaylistTrackFilterProxyModel.cpp           |    3 +-
 src/browsers/filebrowser/FileBrowser.cpp           |  542 +-
 src/browsers/filebrowser/FileBrowser.h             |   33 +-
 src/browsers/filebrowser/FileBrowser_p.h           |   36 +-
 src/browsers/filebrowser/FileView.cpp              |  353 +-
 src/browsers/filebrowser/FileView.h                |   40 +-
 src/browsers/playlistbrowser/APGCategory.cpp       |    3 +-
 .../playlistbrowser/DynamicBiasWidgets.cpp         |   12 +-
 src/browsers/playlistbrowser/DynamicBiasWidgets.h  |    4 +-
 src/browsers/playlistbrowser/PlaylistBrowser.cpp   |   27 +-
 src/browsers/playlistbrowser/PlaylistBrowser.h     |    6 +-
 .../playlistbrowser/PlaylistBrowserCategory.cpp    |   19 +-
 .../playlistbrowser/PlaylistBrowserModel.cpp       |   13 +
 .../playlistbrowser/PlaylistBrowserModel.h         |    1 +
 .../playlistbrowser/PlaylistBrowserView.cpp        |   18 +-
 .../playlistbrowser/PlaylistsByProviderProxy.cpp   |    2 +-
 .../playlistbrowser/PlaylistsInFoldersProxy.cpp    |   12 +
 .../playlistbrowser/PlaylistsInFoldersProxy.h      |    2 +
 src/browsers/playlistbrowser/PodcastModel.cpp      |   39 +-
 src/browsers/playlistbrowser/PodcastModel.h        |    3 +
 src/browsers/playlistbrowser/QtGroupingProxy.cpp   |   23 +
 src/browsers/playlistbrowser/QtGroupingProxy.h     |    1 +
 src/configdialog/ConfigDialog.cpp                  |   47 +-
 src/configdialog/dialogs/CollectionConfig.cpp      |   21 +-
 src/configdialog/dialogs/CollectionConfig.h        |    5 +-
 src/configdialog/dialogs/CollectionConfig.ui       |   84 +-
 src/configdialog/dialogs/DatabaseConfig.h          |    3 +-
 src/configdialog/dialogs/ExcludedLabelsDialog.cpp  |  118 +
 src/configdialog/dialogs/ExcludedLabelsDialog.h    |   52 +
 src/configdialog/dialogs/ExcludedLabelsDialog.ui   |   65 +
 src/configdialog/dialogs/GeneralConfig.h           |    2 +-
 src/configdialog/dialogs/MediadeviceConfig.cpp     |  101 -
 src/configdialog/dialogs/MediadeviceConfig.h       |   47 -
 src/configdialog/dialogs/MetadataConfig.cpp        |  221 +
 src/configdialog/dialogs/MetadataConfig.h          |   55 +
 src/configdialog/dialogs/MetadataConfig.ui         |  171 +
 src/configdialog/dialogs/NotificationsConfig.cpp   |    5 +-
 src/configdialog/dialogs/NotificationsConfig.h     |    2 +-
 src/configdialog/dialogs/NotificationsConfig.ui    |    2 +-
 src/configdialog/dialogs/PlaybackConfig.h          |    3 +-
 src/configdialog/dialogs/PluginsConfig.cpp         |    4 -
 src/configdialog/dialogs/PluginsConfig.h           |    2 +-
 src/configdialog/dialogs/ScriptsConfig.h           |    2 +-
 src/configdialog/dialogs/ScriptsConfig.ui          |    2 +-
 src/context/Applet.cpp                             |    6 +-
 src/context/CMakeLists.txt                         |    7 +-
 src/context/ContextScene.cpp                       |   12 -
 src/context/ContextView.cpp                        |    2 -
 src/context/ToolbarView.cpp                        |    1 -
 src/context/applets/CMakeLists.txt                 |    4 -
 src/context/applets/albums/Albums.cpp              |    9 +-
 src/context/applets/currenttrack/CurrentTrack.cpp  |    5 +-
 .../amarok-context-applet-currenttrack.desktop     |    1 +
 .../info/amarok-context-applet-info.desktop        |    2 +
 src/context/applets/labels/LabelsApplet.cpp        |    1 -
 .../labels/amarok-context-applet-labels.desktop    |    3 +
 src/context/applets/lyrics/LyricsApplet.cpp        |    4 -
 .../lyrics/amarok-context-applet-lyrics.desktop    |    1 +
 src/context/applets/photos/PhotosApplet.cpp        |    1 -
 .../photos/amarok-context-applet-photos.desktop    |    2 +
 .../applets/similarartists/ArtistWidget.cpp        |    2 +-
 src/context/applets/similarartists/ArtistWidget.h  |    4 +-
 .../similarartists/SimilarArtistsApplet.cpp        |    2 +-
 .../amarok-context-applet-similarArtists.desktop   |    2 +
 .../amarok-context-applet-songkick.desktop         |    1 +
 .../applets/spectrumanalyzer/AnalyzerGlWidget.cpp  |  447 -
 .../applets/spectrumanalyzer/AnalyzerGlWidget.h    |  210 -
 .../applets/spectrumanalyzer/CMakeLists.txt        |   23 -
 .../spectrumanalyzer/FastFourierTransformation.cpp |  171 -
 .../spectrumanalyzer/FastFourierTransformation.h   |   74 -
 .../spectrumanalyzer/SpectrumAnalyzerApplet.cpp    |  707 -
 .../spectrumanalyzer/SpectrumAnalyzerApplet.h      |  196 -
 .../SpectrumAnalyzerAppletCustomStyle.css          |    6 -
 .../spectrumanalyzer/SplineInterpolation.cpp       |  202 -
 .../applets/spectrumanalyzer/SplineInterpolation.h |   84 -
 ...amarok-context-applet-spectrum-analyzer.desktop |   48 -
 .../amarok-spectrum-analyzer-applet.svg            |   74 -
 .../spectrumanalyzer/spectrumAnalyzerSettings.ui   |  167 -
 .../tabs/amarok-context-applet-tabs.desktop        |    3 +
 .../upcomingevents/UpcomingEventsWidget.cpp        |    7 +-
 .../amarok-context-applet-upcomingEvents.desktop   |    3 +
 src/context/applets/wikipedia/WikipediaApplet.cpp  |   13 +
 src/context/applets/wikipedia/WikipediaApplet.h    |    1 +
 src/context/applets/wikipedia/WikipediaApplet_p.h  |    3 +
 .../amarok-context-applet-wikipedia.desktop        |    1 +
 .../amarok-containment-vertical.desktop            |    4 +-
 src/context/engines/CMakeLists.txt                 |    4 -
 src/context/engines/current/CurrentEngine.cpp      |    4 -
 .../current/amarok-data-engine-current.desktop     |    2 +-
 .../engines/info/amarok-data-engine-info.desktop   |    1 +
 src/context/engines/labels/LabelsEngine.cpp        |    2 -
 .../labels/amarok-data-engine-labels.desktop       |    2 +
 src/context/engines/lyrics/LyricsEngine.cpp        |    4 -
 .../lyrics/amarok-data-engine-lyrics.desktop       |    2 +-
 src/context/engines/photos/PhotosEngine.cpp        |    1 -
 .../photos/amarok-data-engine-photos.desktop       |    1 +
 .../similarartists/SimilarArtistsEngine.cpp        |    2 +-
 .../amarok-data-engine-similarArtists.desktop      |    3 +
 .../songkick/amarok-data-engine-songkick.desktop   |    2 +-
 .../engines/spectrumanalyzer/CMakeLists.txt        |   12 -
 .../spectrumanalyzer/SpectrumAnalyzerEngine.cpp    |  183 -
 .../spectrumanalyzer/SpectrumAnalyzerEngine.h      |   95 -
 .../amarok-data-engine-spectrum-analyzer.desktop   |   41 -
 src/context/engines/tabs/TabsEngine.cpp            |    2 +-
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    3 +
 .../upcomingevents/UpcomingEventsEngine.cpp        |    4 -
 .../amarok-data-engine-upcomingEvents.desktop      |    3 +
 src/context/engines/wikipedia/WikipediaEngine.cpp  |   76 +-
 .../wikipedia/amarok-data-engine-wikipedia.desktop |    2 +-
 src/context/popupdropper/libpud/PopupDropper.h     |    2 +-
 ...k-scriptengine-applet-simple-javascript.desktop |    7 +-
 .../amarok-scriptengine-runner-javascript.desktop  |    1 +
 .../servicetypes/amarok_containment.desktop        |    2 +-
 .../servicetypes/amarok_context_applet.desktop     |    2 +-
 src/context/toolbar/AppletItemOverlay.cpp          |   13 +-
 src/context/toolbar/AppletToolbar.cpp              |   15 +-
 src/context/toolbar/AppletToolbarAddItem.cpp       |   11 +-
 src/context/widgets/RatingWidget.cpp               |    4 +-
 src/context/widgets/RecentlyPlayedListWidget.cpp   |   14 +-
 .../multisource/MultiSourceCapabilityImpl.cpp      |   32 +-
 .../multisource/MultiSourceCapabilityImpl.h        |   40 +-
 .../timecode/TimecodeWriteCapability.cpp           |   10 +-
 src/core-impl/collections/CMakeLists.txt           |    8 +-
 .../collections/audiocd/AudioCdCollection.cpp      |  414 +-
 .../collections/audiocd/AudioCdCollection.h        |    8 +-
 src/core-impl/collections/audiocd/AudioCdMeta.cpp  |   80 +-
 src/core-impl/collections/audiocd/AudioCdMeta.h    |   21 -
 .../amarok_collection-audiocdcollection.desktop    |    6 +-
 .../audiocd/support/AudioCdConnectionAssistant.cpp |    4 -
 src/core-impl/collections/daap/DaapMeta.cpp        |   42 -
 src/core-impl/collections/daap/DaapMeta.h          |   14 -
 .../daap/amarok_collection-daapcollection.desktop  |    6 +-
 .../collections/daap/daapreader/Reader.cpp         |   15 +-
 .../daap/daapreader/authentication/portability.h   |    3 -
 src/core-impl/collections/db/CMakeLists.txt        |    2 -
 .../collections/db/DatabaseCollection.cpp          |   23 +-
 src/core-impl/collections/db/DatabaseCollection.h  |   40 +-
 src/core-impl/collections/db/MountPointManager.cpp |  403 +
 src/core-impl/collections/db/MountPointManager.h   |  224 +
 src/core-impl/collections/db/ScanManager.cpp       |   68 +-
 src/core-impl/collections/db/ScanManager.h         |    5 +-
 .../collections/db/ScanResultProcessor.cpp         |   13 +-
 src/core-impl/collections/db/ScanResultProcessor.h |    4 +-
 .../db/amarok_databasecollection_export.h          |   53 -
 src/core-impl/collections/db/sql/CMakeLists.txt    |   30 +-
 .../collections/db/sql/CapabilityDelegateImpl.cpp  |   53 +-
 .../collections/db/sql/DatabaseUpdater.cpp         |  210 +-
 src/core-impl/collections/db/sql/DatabaseUpdater.h |    1 +
 src/core-impl/collections/db/sql/SqlCollection.cpp |   73 +-
 src/core-impl/collections/db/sql/SqlCollection.h   |   14 +-
 .../collections/db/sql/SqlCollectionFactory.cpp    |   13 +-
 .../collections/db/sql/SqlCollectionLocation.cpp   |   54 +-
 .../collections/db/sql/SqlCollectionLocation.h     |    1 +
 src/core-impl/collections/db/sql/SqlMeta.cpp       |  237 +-
 src/core-impl/collections/db/sql/SqlMeta.h         |   66 +-
 src/core-impl/collections/db/sql/SqlQueryMaker.cpp |   29 +-
 src/core-impl/collections/db/sql/SqlQueryMaker.h   |    3 +-
 src/core-impl/collections/db/sql/SqlRegistry.cpp   |   34 +-
 src/core-impl/collections/db/sql/SqlRegistry.h     |   15 +-
 .../collections/db/sql/SqlScanResultProcessor.cpp  |   27 +-
 .../collections/db/sql/SqlScanResultProcessor.h    |    2 +-
 .../collections/db/sql/XesamCollectionBuilder.cpp  |  417 -
 .../collections/db/sql/XesamCollectionBuilder.h    |   75 -
 src/core-impl/collections/db/sql/XesamDbus.cpp     |   56 -
 src/core-impl/collections/db/sql/XesamDbus.h       |  172 -
 .../collections/db/sql/XesamInterface.xml          |   78 -
 .../db/sql/amarok_sqlcollection_export.h           |    1 -
 .../collections/db/sql/device/CMakeLists.txt       |    7 -
 .../db/sql/device/massstorage/CMakeLists.txt       |   24 -
 .../massstorage/MassStorageDeviceHandler.cpp       |   24 +-
 .../device/massstorage/MassStorageDeviceHandler.h  |    9 +-
 .../massstorage/amarok_device_massstorage.desktop  |   80 -
 .../collections/db/sql/device/nfs/CMakeLists.txt   |   26 -
 .../db/sql/device/nfs/NfsDeviceHandler.cpp         |   90 +-
 .../db/sql/device/nfs/NfsDeviceHandler.h           |    6 +-
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |   80 -
 .../collections/db/sql/device/smb/CMakeLists.txt   |   26 -
 .../db/sql/device/smb/SmbDeviceHandler.cpp         |   90 +-
 .../db/sql/device/smb/SmbDeviceHandler.h           |    6 +-
 .../db/sql/device/smb/amarok_device_smb.desktop    |   79 -
 .../db/sql/mysqlecollection/CMakeLists.txt         |   23 +-
 .../mysqlecollection/MySqlEmbeddedCollection.cpp   |    4 +-
 .../sql/mysqlecollection/MySqlEmbeddedCollection.h |    4 -
 .../amarok_collection-mysqlecollection.desktop     |    5 +-
 .../db/sql/mysqlservercollection/CMakeLists.txt    |   23 +-
 .../MySqlServerCollection.cpp                      |    6 +-
 .../mysqlservercollection/MySqlServerCollection.h  |    3 +-
 ...amarok_collection-mysqlservercollection.desktop |    5 +-
 .../collections/ipodcollection/CMakeLists.txt      |    1 +
 .../collections/ipodcollection/IpodCollection.h    |    3 +-
 .../ipodcollection/IpodCollectionFactory.cpp       |   60 +-
 .../ipodcollection/IpodCollectionLocation.cpp      |    4 +-
 .../collections/ipodcollection/IpodMeta.cpp        |  213 +-
 .../collections/ipodcollection/IpodMeta.h          |   64 +-
 .../ipodcollection/IpodMetaEditCapability.cpp      |   25 +-
 .../ipodcollection/IpodMetaEditCapability.h        |    7 -
 .../ipodcollection/IpodPlaylistProvider.cpp        |   10 +-
 .../ipodcollection/IpodPlaylistProvider.h          |    1 +
 .../amarok_collection-ipodcollection.desktop       |   16 +-
 .../ipodcollection/jobs/IpodCopyTracksJob.cpp      |    9 +-
 .../ipodcollection/jobs/IpodDeleteTracksJob.cpp    |    5 +-
 .../ipodcollection/jobs/IpodParseTracksJob.cpp     |    4 +-
 .../ipodcollection/support/IpodDeviceHelper.cpp    |    4 +-
 .../MediaDeviceCollection.cpp                      |   17 +-
 .../mediadevicecollection/MediaDeviceCollection.h  |   11 +-
 .../MediaDeviceCollectionLocation.cpp              |   10 +-
 .../MediaDeviceCollectionLocation.h                |    7 +-
 .../mediadevicecollection/MediaDeviceMeta.cpp      |   19 +-
 .../mediadevicecollection/MediaDeviceMeta.h        |   36 +-
 ...amarok_collection-mediadevicecollection.desktop |    4 +-
 .../handler/MediaDeviceHandler.cpp                 |   10 +-
 .../handler/MediaDeviceHandler.h                   |   22 +-
 .../handler/MediaDeviceHandlerCapability.h         |    2 +-
 .../handler/capabilities/ArtworkCapability.h       |    5 +-
 .../handler/capabilities/PlaylistCapability.h      |   10 +-
 .../handler/capabilities/PodcastCapability.h       |    7 +-
 .../playlist/MediaDeviceUserPlaylistProvider.cpp   |   13 +-
 .../podcast/MediaDevicePodcastProvider.h           |    2 +-
 .../amarok_collection-mtpcollection.desktop        |    6 +-
 .../collections/nepomukcollection/CMakeLists.txt   |  100 +-
 .../collections/nepomukcollection/NepomukAlbum.cpp |  437 -
 .../collections/nepomukcollection/NepomukAlbum.h   |   79 -
 .../nepomukcollection/NepomukArtist.cpp            |   48 -
 .../collections/nepomukcollection/NepomukArtist.h  |   45 -
 .../nepomukcollection/NepomukCollection.cpp        |  298 +-
 .../nepomukcollection/NepomukCollection.h          |  120 +-
 .../nepomukcollection/NepomukCollectionFactory.cpp |   66 +
 .../nepomukcollection/NepomukCollectionFactory.h   |   31 +
 .../nepomukcollection/NepomukComposer.cpp          |   43 -
 .../nepomukcollection/NepomukComposer.h            |   41 -
 .../nepomukcollection/NepomukConstructMetaJob.cpp  |  290 +
 .../nepomukcollection/NepomukConstructMetaJob.h    |   63 +
 .../collections/nepomukcollection/NepomukGenre.cpp |   43 -
 .../collections/nepomukcollection/NepomukGenre.h   |   41 -
 .../nepomukcollection/NepomukQueryMaker.cpp        |  672 -
 .../nepomukcollection/NepomukQueryMaker.h          |  123 -
 .../nepomukcollection/NepomukRegistry.cpp          |  281 -
 .../nepomukcollection/NepomukRegistry.h            |   75 -
 .../collections/nepomukcollection/NepomukTrack.cpp |  396 -
 .../collections/nepomukcollection/NepomukTrack.h   |  135 -
 .../collections/nepomukcollection/NepomukYear.cpp  |   42 -
 .../collections/nepomukcollection/NepomukYear.h    |   41 -
 .../amarok_collection-nepomukcollection.desktop    |   14 +-
 .../nepomukcollection/meta/NepomukAlbum.cpp        |   60 +
 .../nepomukcollection/meta/NepomukAlbum.h          |   44 +
 .../nepomukcollection/meta/NepomukArtist.cpp       |   39 +
 .../nepomukcollection/meta/NepomukArtist.h         |   39 +
 .../nepomukcollection/meta/NepomukComposer.cpp     |   39 +
 .../nepomukcollection/meta/NepomukComposer.h       |   39 +
 .../nepomukcollection/meta/NepomukGenre.cpp        |   39 +
 .../nepomukcollection/meta/NepomukGenre.h          |   39 +
 .../nepomukcollection/meta/NepomukLabel.cpp        |   33 +
 .../nepomukcollection/meta/NepomukLabel.h          |   38 +
 .../nepomukcollection/meta/NepomukTrack.cpp        |  416 +
 .../nepomukcollection/meta/NepomukTrack.h          |  161 +
 .../nepomukcollection/meta/NepomukYear.cpp         |   39 +
 .../nepomukcollection/meta/NepomukYear.h           |   39 +
 .../collections/playdarcollection/CMakeLists.txt   |    5 +-
 .../collections/playdarcollection/PlaydarMeta.cpp  |   52 +-
 .../collections/playdarcollection/PlaydarMeta.h    |   13 +-
 .../playdarcollection/PlaydarQueryMaker.cpp        |   16 +-
 .../playdarcollection/PlaydarQueryMaker.h          |    2 +-
 .../amarok_collection-playdarcollection.desktop    |    8 +-
 .../playdarcollection/support/Query.cpp            |   13 +-
 .../proxycollection/ProxyCollectionMeta.cpp        |   73 +-
 .../proxycollection/ProxyCollectionMeta.h          |   24 +-
 .../proxycollection/ProxyCollectionQueryMaker.cpp  |   12 +-
 .../proxycollection/ProxyCollectionQueryMaker.h    |    3 +-
 .../collections/support/CollectionManager.cpp      |   41 +-
 .../collections/support/CollectionManager.h        |   16 +-
 .../collections/support/MemoryCollection.h         |    7 +-
 .../collections/support/MemoryCustomValue.cpp      |    8 +-
 .../collections/support/MemoryMatcher.cpp          |    2 +-
 src/core-impl/collections/support/MemoryMatcher.h  |    4 +-
 src/core-impl/collections/support/MemoryMeta.cpp   |   15 +-
 src/core-impl/collections/support/MemoryMeta.h     |   25 +-
 .../collections/support/MemoryQueryMaker.cpp       |   15 +-
 .../collections/support/MemoryQueryMaker.h         |    3 +-
 .../support/MemoryQueryMakerInternal.cpp           |    1 -
 .../collections/support/MemoryQueryMakerInternal.h |    2 -
 .../collections/support/PlaylistCollection.cpp     |    6 +-
 .../collections/support/TextualQueryFilter.cpp     |    2 +-
 .../collections/support/TextualQueryFilter.h       |    2 +-
 .../collections/support/XmlQueryReader.cpp         |   13 -
 .../collections/support/XmlQueryWriter.cpp         |  408 -
 src/core-impl/collections/support/XmlQueryWriter.h |  102 -
 .../collections/support/jobs/WriteTagsJob.h        |    3 +-
 .../collections/umscollection/UmsCollection.cpp    |   15 +-
 .../collections/umscollection/UmsCollection.h      |   17 +-
 .../umscollection/UmsCollectionLocation.cpp        |    2 +
 .../amarok_collection-umscollection.desktop        |    4 +-
 .../upnpcollection/UpnpBrowseCollection.h          |    1 +
 .../upnpcollection/UpnpCollectionFactory.h         |   11 +-
 .../collections/upnpcollection/UpnpMeta.cpp        |   48 -
 .../collections/upnpcollection/UpnpMeta.h          |   16 -
 .../collections/upnpcollection/UpnpQueryMaker.cpp  |    3 +-
 .../collections/upnpcollection/UpnpQueryMaker.h    |    2 +-
 .../upnpcollection/UpnpQueryMakerInternal.h        |    3 +-
 .../amarok_collection-upnpcollection.desktop       |    6 +-
 src/core-impl/logger/ProxyLogger.h                 |    7 +-
 src/core-impl/meta/default/DefaultMetaTypes.h      |    2 +-
 src/core-impl/meta/file/File.cpp                   |  324 +-
 src/core-impl/meta/file/File.h                     |   46 +-
 src/core-impl/meta/file/FileTrackProvider.cpp      |   44 +
 src/core-impl/meta/file/FileTrackProvider.h        |   40 +
 src/core-impl/meta/file/File_p.h                   |  106 +-
 src/core-impl/meta/multi/MultiTrack.cpp            |   90 +-
 src/core-impl/meta/multi/MultiTrack.h              |  140 +-
 src/core-impl/meta/proxy/MetaProxy.cpp             |  235 +-
 src/core-impl/meta/proxy/MetaProxy.h               |   60 +-
 src/core-impl/meta/proxy/MetaProxyWorker.cpp       |   68 +-
 src/core-impl/meta/proxy/MetaProxyWorker.h         |   52 +-
 src/core-impl/meta/proxy/MetaProxy_p.h             |   35 +-
 src/core-impl/meta/stream/Stream.cpp               |   79 +-
 src/core-impl/meta/stream/Stream.h                 |   28 +-
 src/core-impl/meta/stream/Stream_p.h               |   13 +-
 src/core-impl/meta/timecode/TimecodeMeta.cpp       |   30 -
 src/core-impl/meta/timecode/TimecodeMeta.h         |    8 -
 src/core-impl/meta/timecode/TimecodeObserver.cpp   |    6 -
 .../providers/user/UserPlaylistProvider.cpp        |   51 +
 .../providers/user/UserPlaylistProvider.h          |   18 +-
 .../playlists/types/dynamic/DynamicPlaylist.cpp    |   39 -
 .../playlists/types/dynamic/DynamicPlaylist.h      |   50 -
 .../playlists/types/file/PlaylistFileSupport.h     |    2 +-
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |   11 +-
 .../playlists/types/file/pls/PLSPlaylist.cpp       |   12 +-
 .../playlists/types/file/xspf/XSPFPlaylist.cpp     |   17 +-
 .../playlists/types/file/xspf/XSPFPlaylist.h       |    7 +-
 src/core-impl/podcasts/sql/SqlPodcastMeta.cpp      |  154 +-
 src/core-impl/podcasts/sql/SqlPodcastMeta.h        |   12 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.cpp  |  113 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.h    |   44 +-
 .../providers/tag/TagStatisticsProvider.cpp        |   81 -
 .../providers/tag/TagStatisticsProvider.h          |   40 -
 .../url/PermanentUrlStatisticsProvider.cpp         |   83 -
 .../providers/url/PermanentUrlStatisticsProvider.h |   38 -
 .../support/PersistentStatisticsStore.cpp          |  148 +
 src/core-impl/support/PersistentStatisticsStore.h  |   99 +
 src/core-impl/support/TagStatisticsStore.cpp       |   80 +
 src/core-impl/support/TagStatisticsStore.h         |   38 +
 src/core-impl/support/UrlStatisticsStore.cpp       |   83 +
 src/core-impl/support/UrlStatisticsStore.h         |   40 +
 src/core/CMakeLists.txt                            |    9 +-
 src/core/capabilities/ActionsCapability.h          |    2 +-
 src/core/capabilities/BookmarkThisCapability.h     |    2 +-
 src/core/capabilities/Capability.h                 |    6 +-
 src/core/capabilities/CollectionImportCapability.h |    2 +-
 src/core/capabilities/CollectionScanCapability.h   |    2 +-
 src/core/capabilities/EditCapability.h             |    2 +-
 src/core/capabilities/FindInSourceCapability.h     |    2 +-
 src/core/capabilities/LastFmCapability.cpp         |   24 -
 src/core/capabilities/LastFmCapability.h           |   39 -
 src/core/capabilities/MultiPlayableCapability.h    |   15 +-
 src/core/capabilities/MultiSourceCapability.cpp    |   11 +-
 src/core/capabilities/MultiSourceCapability.h      |   62 +-
 src/core/capabilities/OrganiseCapability.h         |    2 +-
 src/core/capabilities/ReadLabelCapability.h        |    2 +-
 src/core/capabilities/SourceInfoCapability.h       |    2 +-
 src/core/capabilities/StatisticsCapability.cpp     |   24 -
 src/core/capabilities/StatisticsCapability.h       |   49 -
 src/core/capabilities/StreamInfoCapability.h       |    2 +-
 src/core/capabilities/TranscodeCapability.h        |    2 +-
 src/core/capabilities/WriteLabelCapability.h       |    2 +-
 src/core/collections/Collection.cpp                |   25 +-
 src/core/collections/Collection.h                  |  290 +-
 src/core/collections/CollectionLocation.cpp        |    3 +-
 src/core/collections/CollectionLocation.h          |    4 +-
 src/core/collections/CollectionLocationDelegate.h  |    2 +-
 src/core/collections/MetaQueryMaker.cpp            |   13 +-
 src/core/collections/MetaQueryMaker.h              |    3 +-
 src/core/collections/QueryMaker.cpp                |    7 -
 src/core/collections/QueryMaker.h                  |   29 +-
 src/core/collections/support/SqlStorage.h          |    2 +-
 src/core/collections/support/TrackForUrlWorker.cpp |    2 +-
 src/core/collections/support/TrackForUrlWorker.h   |    2 +-
 src/core/interfaces/Logger.h                       |    2 +-
 src/core/interfaces/MetaCapability.cpp             |   31 +
 src/core/interfaces/MetaCapability.h               |   70 +
 src/core/meta/Meta.cpp                             |  291 +-
 src/core/meta/Meta.h                               |  191 +-
 src/core/meta/Statistics.cpp                       |  101 +
 src/core/meta/Statistics.h                         |  131 +
 src/core/meta/support/MetaConstants.cpp            |   19 +-
 src/core/meta/support/MetaConstants.h              |   11 +-
 src/core/meta/support/MetaKeys.h                   |    2 +-
 src/core/meta/support/MetaUtility.cpp              |   29 +-
 src/core/meta/support/MetaUtility.h                |    2 +-
 src/core/playlists/Playlist.cpp                    |   91 +-
 src/core/playlists/Playlist.h                      |  166 +-
 src/core/playlists/PlaylistFormat.h                |    2 +-
 src/core/playlists/PlaylistProvider.h              |    2 +-
 src/core/podcasts/PodcastMeta.h                    |   52 +-
 src/core/statistics/StatisticsProvider.cpp         |  131 -
 src/core/statistics/StatisticsProvider.h           |   63 -
 src/core/support/Amarok.h                          |   16 +-
 src/core/support/Components.cpp                    |    3 +
 src/core/support/Components.h                      |   10 +-
 src/core/support/Debug.cpp                         |    3 +-
 src/core/support/Debug.h                           |    2 +-
 src/core/support/PluginFactory.h                   |    4 +-
 src/core/support/SmartPointerList.h                |    4 +-
 src/core/transcoding/TranscodingConfiguration.h    |    2 +-
 src/core/transcoding/TranscodingController.cpp     |   12 +-
 src/core/transcoding/TranscodingController.h       |    6 +-
 src/core/transcoding/TranscodingFormat.h           |   17 +-
 src/core/transcoding/TranscodingProperty.h         |    2 +-
 .../transcoding/formats/TranscodingAacFormat.cpp   |    7 +-
 .../transcoding/formats/TranscodingAlacFormat.cpp  |    7 +-
 .../transcoding/formats/TranscodingFlacFormat.cpp  |    7 +-
 .../transcoding/formats/TranscodingMp3Format.cpp   |    7 +-
 .../formats/TranscodingVorbisFormat.cpp            |    7 +-
 .../transcoding/formats/TranscodingWmaFormat.cpp   |    7 +-
 src/covermanager/CoverCache.h                      |    3 +-
 src/covermanager/CoverFoundDialog.cpp              |   14 +-
 src/covermanager/CoverFoundDialog.h                |    4 +-
 src/covermanager/CoverManager.cpp                  |   20 +-
 src/data/amarok.notifyrc                           |   47 +
 .../amarok14/FastForwardWorker.cpp                 |   28 +-
 .../itunes/ITunesImporterWorker.cpp                |   45 +-
 src/databaseimporter/sqlbatch/SqlBatchImporter.cpp |    2 +
 src/dbus/mpris1/PlayerHandler.cpp                  |   14 +-
 src/dbus/mpris1/RootHandler.cpp                    |    4 +-
 src/dbus/mpris2/DBusAbstractAdaptor.cpp            |    4 -
 src/dbus/mpris2/DBusAmarokApp.cpp                  |    4 +-
 src/dbus/mpris2/MediaPlayer2AmarokExtensions.cpp   |    2 +-
 src/dialogs/CollectionSetup.cpp                    |  155 +-
 src/dialogs/CollectionSetup.h                      |   39 +-
 src/dialogs/DiagnosticDialog.cpp                   |    1 -
 src/dialogs/EditFilterDialog.cpp                   |   10 +-
 src/dialogs/FilenameLayoutDialog.cpp               |    7 +-
 src/dialogs/MusicBrainzTagger.h                    |    2 +-
 src/dialogs/MusicBrainzTagger.ui                   |    2 +-
 src/dialogs/TagDialog.cpp                          |   57 +-
 src/dialogs/TagDialog.h                            |    2 +-
 src/dialogs/TagDialogBase.ui                       |   15 +-
 src/dialogs/TagGuesser.cpp                         |    2 +-
 src/dialogs/TrackOrganizer.cpp                     |    5 +-
 src/dynamic/Bias.cpp                               |   12 +-
 src/dynamic/Bias.h                                 |    4 +-
 src/dynamic/BiasFactory.cpp                        |   17 +-
 src/dynamic/BiasFactory.h                          |    4 +-
 src/dynamic/BiasSolver.cpp                         |   71 +-
 src/dynamic/BiasSolver.h                           |   23 +-
 src/dynamic/BiasedPlaylist.cpp                     |   11 -
 src/dynamic/BiasedPlaylist.h                       |    6 -
 src/dynamic/DynamicModel.cpp                       |   10 +-
 src/dynamic/TrackSet.h                             |   15 +-
 src/dynamic/biases/AlbumPlayBias.cpp               |    8 +-
 src/dynamic/biases/AlbumPlayBias.h                 |    6 +-
 src/dynamic/biases/EchoNestBias.cpp                |  176 +-
 src/dynamic/biases/EchoNestBias.h                  |   13 +-
 src/dynamic/biases/IfElseBias.h                    |    4 +-
 src/dynamic/biases/PartBias.cpp                    |   17 +-
 src/dynamic/biases/PartBias.h                      |    4 +-
 src/dynamic/biases/QuizPlayBias.cpp                |    9 +-
 src/dynamic/biases/QuizPlayBias.h                  |    6 +-
 src/dynamic/biases/SearchQueryBias.cpp             |    5 +-
 src/dynamic/biases/SearchQueryBias.h               |    8 +-
 src/dynamic/biases/TagMatchBias.cpp                |   37 +-
 src/dynamic/biases/TagMatchBias.h                  |   24 +-
 src/images/default-theme-clean.svg                 |   72 -
 src/images/default-theme.svg                       |   68 -
 src/likeback/LikeBack.h                            |    4 +-
 src/likeback/LikeBackDialog.cpp                    |    7 +-
 src/main.cpp                                       |  119 +-
 src/musicbrainz/MusicBrainzFinder.h                |    6 +-
 src/musicbrainz/MusicDNSAudioDecoder.cpp           |    2 +-
 src/musicbrainz/MusicDNSFinder.h                   |    8 +-
 src/network/NetworkAccessManagerProxy.h            |    2 +-
 src/network/NetworkAccessViewer.cpp                |   22 +-
 src/playback/DelayedDoers.cpp                      |   87 +
 src/playback/DelayedDoers.h                        |   97 +
 src/playlist/PlaylistActions.cpp                   |  101 +-
 src/playlist/PlaylistActions.h                     |   39 +-
 src/playlist/PlaylistBreadcrumbItemSortButton.cpp  |    4 +-
 src/playlist/PlaylistController.cpp                |   28 +-
 src/playlist/PlaylistController.h                  |    5 +-
 src/playlist/PlaylistDock.cpp                      |   27 +-
 src/playlist/PlaylistModel.cpp                     |   25 +-
 src/playlist/PlaylistViewUrlGenerator.h            |    4 +-
 src/playlist/PlaylistViewUrlRunner.cpp             |    7 +-
 src/playlist/ProgressiveSearchWidget.h             |    5 +-
 src/playlist/layouts/LayoutEditDialog.cpp          |    5 +-
 src/playlist/layouts/LayoutEditWidget.cpp          |   15 +-
 src/playlist/navigators/DynamicTrackNavigator.cpp  |    6 +-
 .../navigators/FavoredRandomTrackNavigator.cpp     |    8 +-
 src/playlist/navigators/RandomTrackNavigator.cpp   |    2 +
 src/playlist/navigators/StandardTrackNavigator.cpp |    2 +-
 src/playlist/proxymodels/GroupingProxy.cpp         |    5 +-
 src/playlist/proxymodels/ProxyBase.cpp             |    3 +-
 src/playlist/proxymodels/SortAlgorithms.cpp        |    7 +-
 src/playlist/view/PlaylistViewCommon.cpp           |   13 +-
 src/playlist/view/listview/InlineEditorWidget.cpp  |  133 +-
 src/playlist/view/listview/InlineEditorWidget.h    |    5 +-
 src/playlist/view/listview/PrettyItemDelegate.cpp  |  215 +-
 src/playlist/view/listview/PrettyListView.cpp      |   31 +-
 src/playlist/view/listview/PrettyListView.h        |    4 +
 .../view/listview/SourceSelectionPopup.cpp         |    2 +-
 src/playlistgenerator/ConstraintFactory.cpp        |    8 +-
 src/playlistgenerator/ConstraintGroup.cpp          |   16 +-
 src/playlistgenerator/ConstraintGroup.h            |    8 +-
 src/playlistgenerator/ConstraintNode.cpp           |    4 +-
 src/playlistgenerator/ConstraintNode.h             |    8 +-
 src/playlistgenerator/ConstraintSolver.cpp         |   20 +-
 src/playlistgenerator/ConstraintSolver.h           |    4 +-
 src/playlistgenerator/PresetModel.cpp              |   15 +-
 src/playlistgenerator/PresetModel.h                |    3 +-
 src/playlistgenerator/TODO                         |    7 +-
 src/playlistgenerator/constraints/Checkpoint.cpp   |   28 +-
 src/playlistgenerator/constraints/Checkpoint.h     |    6 +-
 src/playlistgenerator/constraints/Matching.h       |    2 +-
 .../constraints/PlaylistDuration.cpp               |   47 +-
 .../constraints/PlaylistDuration.h                 |    8 +-
 .../constraints/PlaylistFileSize.cpp               |  259 +
 .../constraints/PlaylistFileSize.h                 |   94 +
 .../constraints/PlaylistFileSizeEditWidget.ui      |  193 +
 .../constraints/PlaylistLength.cpp                 |   54 +-
 src/playlistgenerator/constraints/PlaylistLength.h |    7 +-
 .../constraints/PreventDuplicates.cpp              |   56 +-
 .../constraints/PreventDuplicates.h                |    6 +-
 src/playlistgenerator/constraints/TagMatch.cpp     |   33 +-
 src/playlistgenerator/constraints/TagMatch.h       |    6 +-
 .../constraints/TagMatchComparer.cpp               |   13 +-
 .../constraints/TagMatchEditWidget.ui              |   29 +-
 .../constraints/TagMatchSupport.cpp                |    3 +-
 .../constraints/TrackSpreader.cpp                  |   26 +-
 src/playlistgenerator/constraints/TrackSpreader.h  |    6 +-
 src/playlistmanager/SyncedPlaylist.cpp             |   10 +
 src/playlistmanager/SyncedPlaylist.h               |    1 +
 src/playlistmanager/SyncedPodcast.h                |   10 +-
 src/playlistmanager/sql/SqlPlaylist.cpp            |    6 +-
 .../sql/SqlUserPlaylistProvider.cpp                |   16 +-
 src/scanner/GenericScanManager.cpp                 |    7 +-
 src/scanner/GenericScanManager.h                   |    3 +-
 src/scriptengine/AmarokLyricsScript.cpp            |    2 +-
 src/scriptengine/AmarokNetworkScript.h             |    2 +-
 src/scriptengine/AmarokOSDScript.cpp               |    5 +-
 src/scriptengine/AmarokPlaylistScript.cpp          |    7 +-
 src/scriptengine/AmarokScriptableServiceScript.cpp |    3 -
 src/scriptengine/MetaTypeExporter.cpp              |   12 +-
 src/scriptengine/ScriptImporter.cpp                |    7 +-
 src/scripts/free_music_charts_service/script.spec  |    1 +
 src/scripts/librivox_service/script.spec           |    1 +
 src/scripts/lyrics_lyricwiki/script.spec           |    1 +
 src/scripts/qtscript_debug/script.spec             |    1 +
 src/scripts/radio_station_service/script.spec      |    1 +
 src/scripts/script_console/script.spec             |    1 +
 src/scripts/templates/script.spec                  |    3 +-
 src/scripts/webcontrol/script.spec                 |    1 +
 src/services/DynamicServiceQueryMaker.cpp          |    3 +-
 src/services/DynamicServiceQueryMaker.h            |    2 +-
 src/services/ServiceAlbumCoverDownloader.cpp       |    3 +-
 src/services/ServiceBase.cpp                       |   84 +-
 src/services/ServiceBase.h                         |   31 +-
 src/services/ServiceCollection.cpp                 |    8 +-
 src/services/ServiceCollection.h                   |    2 +-
 src/services/ServiceMetaBase.cpp                   |   89 +-
 src/services/ServiceMetaBase.h                     |   22 +-
 src/services/ServicePluginManager.cpp              |    6 +-
 src/services/ServiceSqlQueryMaker.cpp              |   23 +-
 src/services/ServiceSqlQueryMaker.h                |    3 +-
 src/services/amazon/Amazon.h                       |   16 +-
 src/services/amazon/AmazonConfig.h                 |   24 +-
 src/services/amazon/AmazonConfigWidget.ui          |   10 +
 src/services/amazon/AmazonInfoParser.cpp           |  185 +
 src/services/amazon/AmazonInfoParser.h             |   47 +
 src/services/amazon/AmazonSettingsModule.cpp       |   38 +-
 src/services/amazon/AmazonSettingsModule.h         |    2 +
 src/services/amazon/AmazonShoppingCart.cpp         |    4 +-
 src/services/amazon/AmazonShoppingCartDialog.cpp   |    1 +
 src/services/amazon/AmazonShoppingCartDialog.ui    |   15 +-
 src/services/amazon/AmazonStore.cpp                |  102 +-
 src/services/amazon/AmazonStore.h                  |   33 +-
 src/services/amazon/AmazonUrlRunner.cpp            |   15 +-
 src/services/amazon/AmazonUrlRunner.h              |   10 +-
 src/services/amazon/AmazonWantCountryWidget.cpp    |  104 +
 src/services/amazon/AmazonWantCountryWidget.h      |   43 +
 src/services/amazon/AmazonWantCountryWidget.ui     |  163 +
 src/services/amazon/CMakeLists.txt                 |    3 +
 .../amazon/amarok_service_amazonstore.desktop      |   13 +-
 .../amarok_service_amazonstore_config.desktop      |    5 +
 src/services/ampache/AmpacheMeta.cpp               |   15 +-
 src/services/ampache/AmpacheService.cpp            |   10 +-
 src/services/ampache/AmpacheServiceCollection.cpp  |    7 +-
 src/services/ampache/AmpacheServiceQueryMaker.cpp  |    4 +-
 src/services/ampache/AmpacheServiceQueryMaker.h    |    4 +-
 src/services/ampache/CMakeLists.txt                |    2 +-
 src/services/ampache/LastfmInfoParser.cpp          |   14 +-
 .../ampache/amarok_service_ampache.desktop         |    7 +-
 .../ampache/amarok_service_ampache_config.desktop  |    2 +-
 .../gpodder/GpodderPodcastRequestHandler.cpp       |    6 +-
 .../gpodder/GpodderPodcastRequestHandler.h         |    2 +-
 src/services/gpodder/GpodderProvider.cpp           |  512 +-
 src/services/gpodder/GpodderProvider.h             |   32 +-
 src/services/gpodder/GpodderService.cpp            |   71 +-
 src/services/gpodder/GpodderServiceConfig.cpp      |  126 +-
 src/services/gpodder/GpodderServiceConfig.h        |   13 +-
 src/services/gpodder/GpodderServiceModel.cpp       |   94 +-
 src/services/gpodder/GpodderServiceModel.h         |    5 +-
 src/services/gpodder/GpodderServiceSettings.cpp    |   86 +-
 src/services/gpodder/GpodderServiceSettings.h      |    4 +-
 .../gpodder/GpodderSortFilterProxyModel.cpp        |    9 +-
 src/services/gpodder/GpodderSortFilterProxyModel.h |    6 +-
 .../gpodder/amarok_service_gpodder.desktop         |    9 +-
 .../gpodder/amarok_service_gpodder_config.desktop  |    8 +
 src/services/jamendo/JamendoDatabaseHandler.cpp    |    8 +-
 src/services/jamendo/JamendoService.cpp            |    7 +-
 .../jamendo/amarok_service_jamendo.desktop         |    5 +-
 src/services/lastfm/AvatarDownloader.h             |    3 +-
 src/services/lastfm/CMakeLists.txt                 |  158 +-
 src/services/lastfm/LastFmConfigWidget.ui          |  155 +-
 src/services/lastfm/LastFmService.cpp              |  487 +-
 src/services/lastfm/LastFmService.h                |   77 +-
 src/services/lastfm/LastFmServiceCollection.cpp    |   73 +-
 src/services/lastfm/LastFmServiceCollection.h      |    5 +-
 src/services/lastfm/LastFmServiceConfig.cpp        |  271 +-
 src/services/lastfm/LastFmServiceConfig.h          |   92 +-
 src/services/lastfm/LastFmServiceQueryMaker.cpp    |   39 -
 src/services/lastfm/LastFmServiceQueryMaker.h      |   40 -
 src/services/lastfm/LastFmServiceSettings.cpp      |  101 +-
 src/services/lastfm/LastFmServiceSettings.h        |    4 +-
 src/services/lastfm/LastFmTreeModel.cpp            |  575 +-
 src/services/lastfm/LastFmTreeModel.h              |   60 +-
 src/services/lastfm/LastFmTreeView.cpp             |   15 -
 src/services/lastfm/LastFmTreeView.h               |    6 +-
 src/services/lastfm/LoveTrackAction.cpp            |    3 +-
 src/services/lastfm/LoveTrackAction.h              |    4 +-
 src/services/lastfm/ScrobblerAdapter.cpp           |  388 +-
 src/services/lastfm/ScrobblerAdapter.h             |   74 +-
 src/services/lastfm/SimilarArtistsAction.cpp       |    2 -
 src/services/lastfm/SimilarArtistsAction.h         |    3 -
 src/services/lastfm/SynchronizationAdapter.cpp     |  300 +
 src/services/lastfm/SynchronizationAdapter.h       |   87 +
 src/services/lastfm/SynchronizationTrack.cpp       |  289 +
 src/services/lastfm/SynchronizationTrack.h         |  105 +
 src/services/lastfm/WeightedString.h               |   45 -
 src/services/lastfm/WeightedStringList.h           |   67 -
 src/services/lastfm/amarok_lastfm_shared_export.h  |   36 +
 src/services/lastfm/amarok_service_lastfm.desktop  |    4 +-
 src/services/lastfm/biases/LastFmBias.cpp          |  116 +-
 src/services/lastfm/biases/LastFmBias.h            |    7 +-
 src/services/lastfm/biases/WeeklyTopBias.cpp       |   37 +-
 src/services/lastfm/biases/WeeklyTopBias.h         |    4 -
 src/services/lastfm/meta/LastFmCapabilityImpl_p.h  |   40 -
 src/services/lastfm/meta/LastFmMeta.cpp            |  197 +-
 src/services/lastfm/meta/LastFmMeta.h              |   36 +-
 src/services/lastfm/meta/LastFmMeta_p.h            |   32 +-
 .../lastfm/meta/LastFmMultiPlayableCapability.cpp  |  106 +
 .../lastfm/meta/LastFmMultiPlayableCapability.h    |   61 +
 .../lastfm/meta/MultiPlayableCapabilityImpl_p.h    |  131 -
 src/services/magnatune/CMakeLists.txt              |    3 +-
 .../magnatune/MagnatuneAlbumDownloader.cpp         |    2 -
 src/services/magnatune/MagnatuneConfig.cpp         |   15 +
 src/services/magnatune/MagnatuneConfig.h           |    4 +
 src/services/magnatune/MagnatuneConfigWidget.ui    |   28 +-
 .../magnatune/MagnatuneDatabaseHandler.cpp         |   12 +-
 src/services/magnatune/MagnatuneMeta.cpp           |   18 +-
 .../magnatune/MagnatuneNeedUpdateWidget.cpp        |   63 +
 src/services/magnatune/MagnatuneNeedUpdateWidget.h |   45 +
 .../magnatune/MagnatuneNeedUpdateWidget.ui         |   80 +
 src/services/magnatune/MagnatuneSettingsModule.cpp |    5 +
 src/services/magnatune/MagnatuneStore.cpp          |   36 +-
 src/services/magnatune/MagnatuneStore.h            |    2 +
 src/services/magnatune/MagnatuneXmlParser.cpp      |   34 +-
 src/services/magnatune/MagnatuneXmlParser.h        |    7 +-
 .../amarok_service_magnatunestore.desktop          |    4 +-
 .../amarok_service_magnatunestore_config.desktop   |    2 +-
 src/services/mp3tunes/Mp3tunesService.cpp          |   13 +-
 .../mp3tunes/Mp3tunesServiceCollection.cpp         |    3 -
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    4 +-
 .../amarok_service_mp3tunes_config.desktop         |    3 +-
 .../opmldirectory/OpmlDirectoryDatabaseHandler.cpp |   16 +-
 .../opmldirectory/OpmlDirectoryService.cpp         |    6 +-
 src/services/opmldirectory/OpmlDirectoryView.h     |    2 +-
 .../amarok_service_opmldirectory.desktop           |    3 +-
 src/services/opmldirectory/podcast_directory.opml  |    4 +-
 src/services/scriptable/ScriptableService.cpp      |    8 +-
 .../scriptable/ScriptableServiceManager.cpp        |    1 -
 .../scriptable/ScriptableServiceQueryMaker.cpp     |    7 +-
 .../scriptable/ScriptableServiceQueryMaker.h       |    2 +-
 src/statsyncing/Config.cpp                         |  337 +
 src/statsyncing/Config.h                           |  136 +
 src/statsyncing/Controller.cpp                     |  355 +
 src/statsyncing/Controller.h                       |  186 +
 src/statsyncing/Options.cpp                        |   48 +
 src/statsyncing/Options.h                          |   53 +
 src/statsyncing/Process.cpp                        |  284 +
 src/statsyncing/Process.h                          |  104 +
 src/statsyncing/Provider.cpp                       |   37 +
 src/statsyncing/Provider.h                         |  139 +
 src/statsyncing/ScrobblingService.cpp              |   23 +
 src/statsyncing/ScrobblingService.h                |   94 +
 src/statsyncing/Track.cpp                          |  107 +
 src/statsyncing/Track.h                            |  184 +
 src/statsyncing/TrackTuple.cpp                     |  455 +
 src/statsyncing/TrackTuple.h                       |  157 +
 src/statsyncing/collection/CollectionProvider.cpp  |  182 +
 src/statsyncing/collection/CollectionProvider.h    |   84 +
 src/statsyncing/collection/CollectionTrack.cpp     |  200 +
 src/statsyncing/collection/CollectionTrack.h       |   70 +
 src/statsyncing/jobs/MatchTracksJob.cpp            |  289 +
 src/statsyncing/jobs/MatchTracksJob.h              |  158 +
 src/statsyncing/jobs/SynchronizeTracksJob.cpp      |  143 +
 src/statsyncing/jobs/SynchronizeTracksJob.h        |  105 +
 src/statsyncing/models/CommonModel.cpp             |  215 +
 src/statsyncing/models/CommonModel.h               |   60 +
 src/statsyncing/models/MatchedTracksModel.cpp      |  409 +
 src/statsyncing/models/MatchedTracksModel.h        |  134 +
 src/statsyncing/models/ProvidersModel.cpp          |  142 +
 src/statsyncing/models/ProvidersModel.h            |   77 +
 src/statsyncing/models/SingleTracksModel.cpp       |   99 +
 src/statsyncing/models/SingleTracksModel.h         |   64 +
 src/statsyncing/ui/ChooseProvidersPage.cpp         |  184 +
 src/statsyncing/ui/ChooseProvidersPage.h           |   72 +
 src/statsyncing/ui/ChooseProvidersPage.ui          |   79 +
 src/statsyncing/ui/MatchedTracksPage.cpp           |  528 +
 src/statsyncing/ui/MatchedTracksPage.h             |  121 +
 src/statsyncing/ui/MatchedTracksPage.ui            |  308 +
 src/statsyncing/ui/TrackDelegate.cpp               |   97 +
 src/statsyncing/ui/TrackDelegate.h                 |   35 +
 src/statusbar/CompoundProgressBar.cpp              |   28 +
 src/statusbar/CompoundProgressBar.h                |    2 +
 src/statusbar/LongMessageWidget.cpp                |    2 +
 src/strigi/CMakeLists.txt                          |    2 -
 src/strigi/audible/CMakeLists.txt                  |   13 -
 src/strigi/audible/audiblethroughanalyzer.cpp      |  246 -
 src/strigi/mp4/CMakeLists.txt                      |   13 -
 src/strigi/mp4/mp4throughanalyzer.cpp              |  729 -
 src/support/QSharedDataPointerMisc.h               |   97 +
 src/toolbar/VolumePopupButton.cpp                  |    4 +-
 src/transcoding/TranscodingAssistantDialog.ui      |    2 +-
 src/transcoding/TranscodingJob.cpp                 |    4 +-
 src/widgets/BookmarkPopup.cpp                      |    7 +-
 src/widgets/BookmarkTriangle.cpp                   |   11 +-
 src/widgets/CollectionSetupTreeView.cpp            |   86 +
 src/widgets/CollectionSetupTreeView.h              |   25 +
 src/widgets/ElidingButton.cpp                      |    6 +-
 src/widgets/MetaQueryWidget.cpp                    |    7 +-
 src/widgets/Osd.cpp                                |   11 +-
 src/widgets/PrettyTreeView.cpp                     |   14 +-
 src/widgets/PrettyTreeView.h                       |   52 +-
 src/widgets/SearchWidget.cpp                       |    2 +-
 src/widgets/SliderWidget.cpp                       |    3 +-
 src/widgets/StarManager.cpp                        |    5 +-
 src/widgets/StarManager.h                          |    3 +
 src/widgets/Token.cpp                              |   27 +-
 src/widgets/Token.h                                |    5 +-
 src/widgets/TokenDropTarget.cpp                    |  135 +-
 src/widgets/TokenDropTarget.h                      |   35 +-
 src/widgets/TokenPool.cpp                          |    4 +-
 src/widgets/TokenPool.h                            |    7 +-
 src/widgets/TokenWithLayout.h                      |    3 +-
 src/widgets/TrackSelectWidget.cpp                  |    4 +-
 src/widgets/kratingpainter.cpp                     |  358 -
 src/widgets/kratingpainter.h                       |  215 -
 src/widgets/kratingwidget.cpp                      |  262 -
 src/widgets/kratingwidget.h                        |  207 -
 tests/CMakeLists.txt                               |   10 +-
 tests/CollectionTestImpl.h                         |    2 +
 .../browsers/TestSingleCollectionTreeItemModel.cpp |   16 +-
 tests/browsers/TestSingleCollectionTreeItemModel.h |    2 +-
 tests/context/engines/ContextView.cpp              |    3 -
 tests/context/engines/ContextView.h                |    5 +-
 .../similarartists/TestSimilarArtistsEngine.cpp    |    4 +-
 .../collections/db/sql/SqlMountPointManagerMock.h  |    4 +-
 .../collections/db/sql/TestSqlQueryMaker.cpp       |    3 +-
 .../collections/db/sql/TestSqlScanManager.cpp      |   29 +-
 .../core-impl/collections/db/sql/TestSqlTrack.cpp  |   12 +-
 .../collections/support/TestMemoryQueryMaker.cpp   |    2 +-
 tests/core-impl/meta/file/TestMetaFileTrack.cpp    |  160 +-
 tests/core-impl/meta/file/TestMetaFileTrack.h      |   16 +-
 tests/core-impl/meta/multi/TestMetaMultiTrack.cpp  |   80 +-
 tests/core-impl/meta/multi/TestMetaMultiTrack.h    |   31 +-
 tests/core/CMakeLists.txt                          |    5 +-
 tests/core/capabilities/TestActionsCapability.h    |    2 +-
 tests/core/collections/TestCollection.cpp          |    2 +-
 tests/core/collections/TestQueryMaker.cpp          |    2 +-
 .../collections/support/TestTrackForUrlWorker.cpp  |    2 +-
 tests/core/interfaces/CMakeLists.txt               |   10 +
 tests/core/interfaces/TestMetaCapability.cpp       |  111 +
 .../core/{meta => interfaces}/TestMetaCapability.h |    0
 tests/core/meta/CMakeLists.txt                     |   11 -
 tests/core/meta/TestMetaCapability.cpp             |  111 -
 tests/core/meta/TestMetaTrack.cpp                  |   56 +-
 tests/core/meta/TestMetaTrack.h                    |    4 +-
 tests/core/meta/support/CMakeLists.txt             |    5 +
 tests/core/meta/support/TestMetaConstants.cpp      |  606 +
 tests/core/meta/support/TestMetaConstants.h        |   53 +
 tests/mocks/MetaMock.h                             |   41 +-
 tests/mocks/MockQueryMaker.h                       |    2 +-
 .../file/TestPlaylistFileProvider.cpp              |    7 +-
 tests/services/amazon/CMakeLists.txt               |    6 +-
 tests/services/amazon/TestAmazonShoppingCart.cpp   |   15 +
 tests/services/amazon/TestAmazonShoppingCart.h     |    3 +
 tests/timecode/TestTimecodeTrackProvider.cpp       |    6 +-
 utilities/CMakeLists.txt                           |    1 +
 utilities/amzdownloader/AmzDownloader.cpp          |  201 +
 utilities/amzdownloader/AmzDownloader.h            |   54 +
 utilities/amzdownloader/AmzDownloader.ui           |  139 +
 utilities/amzdownloader/CMakeLists.txt             |   38 +
 utilities/amzdownloader/amzdownloader.desktop      |   60 +
 utilities/amzdownloader/amzdownloader.xml          |    7 +
 utilities/amzdownloader/main.cpp                   |   31 +
 utilities/collectionscanner/Album.h                |   82 -
 utilities/collectionscanner/BatchFile.cpp          |  157 -
 utilities/collectionscanner/BatchFile.h            |   75 -
 utilities/collectionscanner/CMakeLists.txt         |   17 +-
 utilities/collectionscanner/CollectionScanner.cpp  |  201 +-
 utilities/collectionscanner/CollectionScanner.h    |   41 +-
 utilities/collectionscanner/Directory.cpp          |  250 -
 utilities/collectionscanner/Directory.h            |  109 -
 utilities/collectionscanner/Playlist.cpp           |   72 -
 utilities/collectionscanner/Playlist.h             |   71 -
 utilities/collectionscanner/Track.cpp              |  550 -
 utilities/collectionscanner/Track.h                |  167 -
 1391 files changed, 495744 insertions(+), 472926 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list