[SCM] Amarok packaging branch, master, updated. debian/2.4.2-1

Modestas Vainius modax at alioth.debian.org
Sun Jul 24 11:09:25 UTC 2011


The following commit has been merged in the master branch:
commit 9cb0cd87310a53e96e01e45f5dece675148eb4fd
Merge: 47a009801c17c332ce0935cd065dcc6170f57d3c 89dd2f4caf5ab443dedc5c81104bc05a0f3d23b3
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Jul 6 15:18:27 2011 +0300

    Merge commit 'upstream/2.4.2_beta1'

 AUTHORS                                            |    1 +
 CMakeLists.txt                                     |   72 +-
 ChangeLog                                          |   51 +
 Mainpage.dox                                       |   12 +
 OXYGEN                                             |   38 -
 README                                             |    4 +-
 cmake/modules/FindMySQLAmarok.cmake                |    2 +-
 config-amarok.h.cmake                              |   23 +-
 doc/{en_US => }/Amarok-context.png                 |  Bin 27755 -> 27755 bytes
 doc/{en_US => }/Amarok-contextadd.png              |  Bin 37050 -> 37050 bytes
 doc/{en_US => }/Amarok-removefromplaylist.png      |  Bin 82196 -> 82196 bytes
 doc/{en_US => }/Amarok-renameplaylist.png          |  Bin 13483 -> 13483 bytes
 doc/{en_US => }/Amarok2.1covermanager.png          |  Bin 125493 -> 125493 bytes
 doc/{en_US => }/Amarok2.1dynamicplaylist.png       |  Bin 10462 -> 10462 bytes
 doc/{en_US => }/Amarok2.1ipod.png                  |  Bin 7966 -> 7966 bytes
 doc/{en_US => }/Amarok2.1pleditor.png              |  Bin 23731 -> 23731 bytes
 doc/{en_US => }/Amarok2.1rating.png                |  Bin 16902 -> 16902 bytes
 doc/{en_US => }/Amarok2.1right.png                 |  Bin 18106 -> 18106 bytes
 doc/{en_US => }/Amarok2.1scriptmanager.png         |  Bin 28002 -> 28002 bytes
 doc/Amarok2.4.1ConfigureDialogCollection.png       |  Bin 0 -> 27463 bytes
 doc/Amarok2.4.1SavePlaylistChoices.png             |  Bin 0 -> 5295 bytes
 doc/AmarokNew2.4.png                               |  Bin 0 -> 37228 bytes
 doc/{en_US => }/Amarok_-_internet_services.png     |  Bin 13464 -> 13464 bytes
 doc/Amarok_addtoplaylist.png                       |  Bin 0 -> 292057 bytes
 doc/Amarok_addtoplaylist1.png                      |  Bin 0 -> 52097 bytes
 doc/{en_US => }/Amarokbreadcrumb.png               |  Bin 4896 -> 4896 bytes
 doc/{en_US => }/Amarokcollection.png               |  Bin 22583 -> 22583 bytes
 doc/{en_US => }/Amarokfull.png                     |  Bin 73473 -> 73473 bytes
 doc/{en_US => }/Amarokmediasources-files.png       |  Bin 7188 -> 7188 bytes
 doc/{en_US => }/Amarokmediasources-home.png        |  Bin 10441 -> 10441 bytes
 doc/{en_US => }/Amarokrightmenu.png                |  Bin 6707 -> 6707 bytes
 doc/{en_US => }/Amarokripcd.png                    |  Bin 15936 -> 15936 bytes
 doc/{en_US => }/Amaroksystray.png                  |  Bin 4848 -> 4848 bytes
 doc/{en_US => }/Applications-internet.png          |  Bin 1680 -> 1680 bytes
 doc/CMakeLists.txt                                 |   11 +-
 doc/{en_US => }/Cd_collection_sansa.png            |  Bin 20292 -> 20292 bytes
 doc/{en_US => }/Configurecollection.png            |  Bin 24862 -> 24862 bytes
 doc/{en_US => }/Context-applets-amarok.png         |  Bin 100577 -> 100577 bytes
 doc/{en_US => }/Controlamarok.png                  |  Bin 6577 -> 6577 bytes
 doc/{en_US => }/Document-save.png                  |  Bin 1802 -> 1802 bytes
 doc/{en_US => }/Edit-redo.png                      |  Bin 2125 -> 2125 bytes
 doc/{en_US => }/Edit-undo.png                      |  Bin 2128 -> 2128 bytes
 doc/{en_US => }/Firstruncollection2.png            |  Bin 9454 -> 9454 bytes
 doc/{en_US => }/Folder-amarok.png                  |  Bin 1474 -> 1474 bytes
 doc/{en_US => }/Hi32-action-collection-amarok.png  |  Bin 2386 -> 2386 bytes
 .../Hi48-action-clear-playlist-amarok.png          |  Bin 2118 -> 2118 bytes
 .../Hi48-action-edit-playlist-queue.png            |  Bin 857 -> 857 bytes
 ...ion-media-standard-track-progression-amarok.png |  Bin 2072 -> 2072 bytes
 doc/{en_US => }/Hi48-action-music-amarok.png       |  Bin 2027 -> 2027 bytes
 doc/{en_US => }/Hi48-action-podcast-amarok.png     |  Bin 2462 -> 2462 bytes
 doc/{en_US => }/Mediasources.png                   |  Bin 11499 -> 11499 bytes
 doc/{en_US => }/Preferences-other.png              |  Bin 2478 -> 2478 bytes
 doc/{en_US => }/Pud-amarok.png                     |  Bin 110692 -> 110692 bytes
 doc/{en_US => }/View-list-tree.png                 |  Bin 1304 -> 1304 bytes
 doc/{en_US => }/View-media-playlist.png            |  Bin 1671 -> 1671 bytes
 doc/de/CMakeLists.txt                              |    1 -
 doc/de/index.docbook                               |  516 -
 doc/en_US/Addingmusic.png                          |  Bin 78058 -> 0 bytes
 doc/en_US/Amarok-addingmusic2.png                  |  Bin 16103 -> 0 bytes
 doc/en_US/CMakeLists.txt                           |    1 -
 doc/en_US/index.docbook                            | 1124 -
 doc/es/CMakeLists.txt                              |    1 -
 doc/es/add_dynamic.png                             |  Bin 102406 -> 0 bytes
 doc/es/advanced.docbook                            | 1636 --
 doc/es/amarok_playlist.png                         |  Bin 138008 -> 0 bytes
 doc/es/analyzer.png                                |  Bin 6374 -> 0 bytes
 doc/es/buttons.png                                 |  Bin 8001 -> 0 bytes
 doc/es/collection.png                              |  Bin 89824 -> 0 bytes
 doc/es/config.docbook                              |  555 -
 doc/es/config_appearance.png                       |  Bin 75907 -> 0 bytes
 doc/es/config_collection.png                       |  Bin 65003 -> 0 bytes
 doc/es/config_engine.png                           |  Bin 84913 -> 0 bytes
 doc/es/config_general.png                          |  Bin 82503 -> 0 bytes
 doc/es/config_osd.png                              |  Bin 67327 -> 0 bytes
 doc/es/config_playback.png                         |  Bin 58180 -> 0 bytes
 doc/es/config_scrobbler.png                        |  Bin 78952 -> 0 bytes
 doc/es/coverman.png                                |  Bin 146519 -> 0 bytes
 doc/es/dynamic_bar.png                             |  Bin 7697 -> 0 bytes
 doc/es/dynamic_settings.png                        |  Bin 14560 -> 0 bytes
 doc/es/equalizer.png                               |  Bin 15851 -> 0 bytes
 doc/es/faq.docbook                                 | 1332 --
 doc/es/file_browser.png                            |  Bin 97396 -> 0 bytes
 doc/es/index.docbook                               | 2013 --
 doc/es/logo.png                                    |  Bin 3442 -> 0 bytes
 doc/es/media_device.png                            |  Bin 27031 -> 0 bytes
 doc/es/menubar.png                                 |  Bin 1923 -> 0 bytes
 doc/es/musicbrainz.png                             |  Bin 1602 -> 0 bytes
 doc/es/pl_tip1.png                                 |  Bin 7894 -> 0 bytes
 doc/es/play_list.png                               |  Bin 16122 -> 0 bytes
 doc/es/player_window.png                           |  Bin 14203 -> 0 bytes
 doc/es/playlist_browser.png                        |  Bin 103404 -> 0 bytes
 doc/es/playlist_window.png                         |  Bin 67274 -> 0 bytes
 doc/es/queue_manager.png                           |  Bin 19799 -> 0 bytes
 doc/es/quick.docbook                               |  148 -
 doc/es/requirements.docbook                        |  136 -
 doc/es/rmb_menu.png                                |  Bin 23980 -> 0 bytes
 doc/es/script_manager.png                          |  Bin 25257 -> 0 bytes
 doc/es/status_bar.png                              |  Bin 6521 -> 0 bytes
 doc/es/tab_lyrics.png                              |  Bin 76109 -> 0 bytes
 doc/es/tab_music.png                               |  Bin 138808 -> 0 bytes
 doc/es/tab_wiki.png                                |  Bin 93580 -> 0 bytes
 doc/es/using.docbook                               | 2126 --
 doc/es/vis_window.png                              |  Bin 10859 -> 0 bytes
 doc/et/CMakeLists.txt                              |    1 -
 doc/et/index.docbook                               | 1983 --
 doc/fr/CMakeLists.txt                              |    1 -
 doc/fr/advanced.docbook                            | 1640 --
 doc/fr/config.docbook                              |  555 -
 doc/fr/faq.docbook                                 | 1402 --
 doc/fr/index.docbook                               |  651 -
 doc/fr/quick.docbook                               |  148 -
 doc/fr/requirements.docbook                        |  136 -
 doc/fr/using.docbook                               | 2157 --
 doc/index.docbook                                  | 1135 +
 doc/it/CMakeLists.txt                              |    1 -
 doc/it/advanced.docbook                            | 1639 --
 doc/it/config.docbook                              |  555 -
 doc/it/faq.docbook                                 | 1332 --
 doc/it/index.docbook                               |  707 -
 doc/it/quick.docbook                               |  148 -
 doc/it/requirements.docbook                        |  136 -
 doc/it/using.docbook                               | 2146 --
 doc/pt/CMakeLists.txt                              |    1 -
 doc/pt/index.docbook                               | 1973 --
 doc/pt_BR/CMakeLists.txt                           |    1 -
 doc/pt_BR/advanced.docbook                         | 1639 --
 doc/pt_BR/config.docbook                           |  555 -
 doc/pt_BR/faq.docbook                              | 1340 --
 doc/pt_BR/index.docbook                            | 1985 --
 doc/pt_BR/quick.docbook                            |  146 -
 doc/pt_BR/requirements.docbook                     |  136 -
 doc/pt_BR/using.docbook                            | 2152 --
 doc/sv/CMakeLists.txt                              |    1 -
 doc/sv/advanced.docbook                            | 1637 --
 doc/sv/config.docbook                              |  555 -
 doc/sv/faq.docbook                                 | 1350 --
 doc/sv/index.docbook                               | 1967 --
 doc/sv/quick.docbook                               |  148 -
 doc/sv/requirements.docbook                        |  136 -
 doc/sv/using.docbook                               | 2154 --
 doc/uk/.directory                                  |    5 -
 doc/uk/Addingmusic.png                             |  Bin 86470 -> 0 bytes
 doc/uk/Amarok-context.png                          |  Bin 30544 -> 0 bytes
 doc/uk/Amarok-contextadd.png                       |  Bin 35717 -> 0 bytes
 doc/uk/Amarok2.1covermanager.png                   |  Bin 173790 -> 0 bytes
 doc/uk/Amarok2.1dynamicplaylist.png                |  Bin 14936 -> 0 bytes
 doc/uk/Amarok2.1ipod.png                           |  Bin 13298 -> 0 bytes
 doc/uk/Amarok2.1pleditor.png                       |  Bin 22420 -> 0 bytes
 doc/uk/Amarok2.1rating.png                         |  Bin 12131 -> 0 bytes
 doc/uk/Amarok2.1right.png                          |  Bin 30180 -> 0 bytes
 doc/uk/Amarok2.1scriptmanager.png                  |  Bin 20198 -> 0 bytes
 doc/uk/Amarok2.1svn965006.png                      |  Bin 70688 -> 0 bytes
 doc/uk/Amarok_-_context_view_configuration.png     |  Bin 34213 -> 0 bytes
 doc/uk/Amarok_-_internet_services.png              |  Bin 8975 -> 0 bytes
 doc/uk/Amarokbreadcrumb.png                        |  Bin 4988 -> 0 bytes
 doc/uk/Amarokcollection.png                        |  Bin 24025 -> 0 bytes
 doc/uk/Amarokfull.png                              |  Bin 84414 -> 0 bytes
 doc/uk/Amarokmediasources-home.png                 |  Bin 10423 -> 0 bytes
 doc/uk/Amarokrightmenu.png                         |  Bin 5117 -> 0 bytes
 doc/uk/Amarokripcd.png                             |  Bin 15554 -> 0 bytes
 doc/uk/CMakeLists.txt                              |    1 -
 doc/uk/Configurecollection.png                     |  Bin 25274 -> 0 bytes
 doc/uk/Context-applets-amarok.png                  |  Bin 26418 -> 0 bytes
 doc/uk/Firstruncollection2.png                     |  Bin 8704 -> 0 bytes
 doc/uk/Mediasources.png                            |  Bin 13549 -> 0 bytes
 doc/uk/index.docbook                               | 1951 --
 po/CMakeLists.txt                                  |    6 +-
 po/bs/CMakeLists.txt                               |    2 +
 po/bs/amarok.po                                    |15138 +++++++++++++
 po/bs/amarok_scriptengine_qscript.po               |   92 +
 po/bs/amarokcollectionscanner_qt.po                |   97 +
 po/bs/amarokpkg.po                                 |  128 +
 po/ca/amarok.po                                    |14971 +++++++------
 po/ca/amarokcollectionscanner_qt.po                |   12 +-
 po/ca at valencia/amarok.po                           |15376 +++++++-------
 po/ca at valencia/amarokcollectionscanner_qt.po       |   12 +-
 po/cs/amarok.po                                    |15625 +++++++-------
 po/cs/amarokcollectionscanner_qt.po                |   12 +-
 po/da/amarok.po                                    |17977 +++++++++--------
 po/da/amarokcollectionscanner_qt.po                |   12 +-
 po/de/amarok.po                                    |18089 +++++++++--------
 po/de/amarokcollectionscanner_qt.po                |   14 +-
 po/el/CMakeLists.txt                               |    2 +
 po/el/amarok.po                                    |18564 ++++++++++++++++
 po/el/amarok_scriptengine_qscript.po               |   89 +
 po/el/amarokcollectionscanner_qt.po                |   94 +
 po/el/amarokpkg.po                                 |  120 +
 po/en_GB/amarok.po                                 |14900 +++++++------
 po/en_GB/amarokcollectionscanner_qt.po             |   12 +-
 po/es/amarok.po                                    |17900 ++++++++--------
 po/es/amarokcollectionscanner_qt.po                |   12 +-
 po/et/amarok.po                                    |14706 +++++++------
 po/et/amarokcollectionscanner_qt.po                |   12 +-
 po/fi/CMakeLists.txt                               |    2 +
 po/fi/amarok.po                                    |16546 +++++++++++++++
 po/fi/amarok_scriptengine_qscript.po               |   90 +
 po/fi/amarokcollectionscanner_qt.po                |   94 +
 po/fi/amarokpkg.po                                 |  121 +
 po/fr/amarok.po                                    |15720 ++++++++-------
 po/fr/amarok_scriptengine_qscript.po               |    1 -
 po/fr/amarokcollectionscanner_qt.po                |   12 +-
 po/ga/amarok.po                                    |17951 +++++++++--------
 po/ga/amarokcollectionscanner_qt.po                |   12 +-
 po/gl/amarok.po                                    |15128 +++++++-------
 po/gl/amarokcollectionscanner_qt.po                |   12 +-
 po/hu/CMakeLists.txt                               |    2 -
 po/hu/amarok.po                                    |16254 --------------
 po/hu/amarok_scriptengine_qscript.po               |   90 -
 po/hu/amarokcollectionscanner_qt.po                |  142 -
 po/hu/amarokpkg.po                                 |  123 -
 po/it/amarok.po                                    |14650 +++++++------
 po/it/amarokcollectionscanner_qt.po                |   12 +-
 po/ja/amarok.po                                    |14445 +++++++------
 po/ja/amarok_scriptengine_qscript.po               |    2 +-
 po/ja/amarokcollectionscanner_qt.po                |   14 +-
 po/ja/amarokpkg.po                                 |    2 +-
 po/lt/amarok.po                                    |11360 +++++-----
 po/lt/amarokcollectionscanner_qt.po                |   14 +-
 po/lt/amarokpkg.po                                 |    2 +-
 po/nb/amarok.po                                    |22303 ++++++++++----------
 po/nb/amarokcollectionscanner_qt.po                |   12 +-
 po/nds/CMakeLists.txt                              |    2 -
 po/nds/amarok.po                                   |20958 ------------------
 po/nds/amarok_scriptengine_qscript.po              |   90 -
 po/nds/amarokcollectionscanner_qt.po               |   68 -
 po/nds/amarokpkg.po                                |  121 -
 po/nl/amarok.po                                    |14650 +++++++------
 po/nl/amarokcollectionscanner_qt.po                |   12 +-
 po/pa/amarok.po                                    |16019 ++++++++-------
 po/pa/amarokcollectionscanner_qt.po                |   12 +-
 po/pl/amarok.po                                    |16752 ++++++++-------
 po/pl/amarokcollectionscanner_qt.po                |   59 +-
 po/pl/amarokpkg.po                                 |   14 +-
 po/pt/amarok.po                                    |14290 +++++++------
 po/pt/amarokcollectionscanner_qt.po                |   12 +-
 po/pt_BR/amarok.po                                 |14928 +++++++------
 po/pt_BR/amarokcollectionscanner_qt.po             |   12 +-
 po/ru/amarok.po                                    |18085 +++++++++--------
 po/ru/amarokcollectionscanner_qt.po                |   12 +-
 po/sl/amarok.po                                    |17942 +++++++++--------
 po/sl/amarokcollectionscanner_qt.po                |   12 +-
 po/sr/amarok.po                                    |18381 +++++++++--------
 po/sr/amarokcollectionscanner_qt.po                |   59 +-
 po/sr at ijekavian/amarok.po                          |18471 +++++++++--------
 po/sr at ijekavian/amarokcollectionscanner_qt.po      |   59 +-
 po/sr at ijekavianlatin/amarok.po                     |18349 +++++++++--------
 po/sr at ijekavianlatin/amarokcollectionscanner_qt.po |   59 +-
 po/sr at latin/amarok.po                              |18473 +++++++++--------
 po/sr at latin/amarokcollectionscanner_qt.po          |   59 +-
 po/sv/amarok.po                                    |14466 +++++++------
 po/sv/amarokcollectionscanner_qt.po                |   12 +-
 po/uk/amarok.po                                    |17737 ++++++++--------
 po/uk/amarok_scriptengine_qscript.po               |    1 +
 po/uk/amarokcollectionscanner_qt.po                |   13 +-
 po/uk/amarokpkg.po                                 |    1 +
 po/wa/CMakeLists.txt                               |    2 -
 po/wa/amarok.po                                    |16706 ---------------
 po/wa/amarokcollectionscanner_qt.po                |   95 -
 po/zh_CN/amarok.po                                 |14815 +++++++-------
 po/zh_CN/amarokcollectionscanner_qt.po             |   12 +-
 po/zh_TW/amarok.po                                 |13978 +++++++------
 po/zh_TW/amarokcollectionscanner_qt.po             |   12 +-
 shared/FileTypeResolver.cpp                        |  152 +
 shared/FileTypeResolver.h                          |   43 +
 shared/MetaReplayGain.cpp                          |    3 +-
 shared/MetaReplayGain.h                            |    9 +-
 shared/MetaTagLib.cpp                              |  100 +-
 shared/MetaValues.h                                |    4 +-
 shared/Version.h                                   |    2 +-
 shared/tag_helpers/APETagHelper.cpp                |   11 +-
 shared/tag_helpers/ASFTagHelper.cpp                |   15 +-
 shared/tag_helpers/ID3v2TagHelper.cpp              |   24 +-
 shared/tag_helpers/MP4TagHelper.cpp                |   37 +-
 shared/tag_helpers/VorbisCommentTagHelper.cpp      |    4 +
 .../asffiletyperesolver.cpp                        |   44 -
 .../asffiletyperesolver.h                          |   41 -
 .../mimefiletyperesolver.cpp                       |  120 -
 .../mimefiletyperesolver.h                         |   40 -
 .../mp4filetyperesolver.cpp                        |   44 -
 .../mp4filetyperesolver.h                          |   40 -
 .../wavfiletyperesolver.cpp                        |   42 -
 .../wavfiletyperesolver.h                          |   36 -
 src/ActionClasses.cpp                              |   45 +-
 src/ActionClasses.h                                |    4 -
 src/AmarokMimeData.cpp                             |    5 +-
 src/AmarokMimeData.h                               |    2 +-
 src/App.cpp                                        |   76 +-
 src/App.h                                          |    2 -
 src/CMakeLists.txt                                 |  111 +-
 src/DirectoryLoader.cpp                            |    2 +-
 src/EngineController.cpp                           |   69 +-
 src/EngineController.h                             |    3 +-
 src/ImageCache.h                                   |  120 +
 src/KNotificationBackend.cpp                       |   31 +-
 src/KNotificationBackend.h                         |   10 +-
 src/MainWindow.cpp                                 |   63 +-
 src/MainWindow.h                                   |    1 -
 src/MountPointManager.cpp                          |    1 -
 src/PaletteHandler.cpp                             |    2 +
 src/PluginManager.cpp                              |   17 +-
 src/ScriptManager.cpp                              |   51 +-
 src/ScriptManager.h                                |   17 +-
 src/ScriptUpdater.cpp                              |    9 +
 src/SvgHandler.cpp                                 |    3 +-
 src/SvgHandler.h                                   |    4 +-
 src/ToolBar.h                                      |  108 -
 src/TrayIcon.cpp                                   |   12 +-
 src/amarok-play-audiocd.desktop                    |    3 +-
 src/amarok.desktop                                 |   13 +-
 src/amarok_addaspodcast.desktop                    |    3 +-
 src/amarok_append.desktop                          |   10 +-
 src/amarok_containers.desktop                      |   13 +-
 src/amarok_plugin.desktop                          |    2 +
 src/amarokconfig.kcfg                              |   51 +-
 src/amarokurls/BookmarkManagerWidget.cpp           |    2 +-
 src/amarokurls/BookmarkTreeView.cpp                |    2 +-
 src/amarokurls/PlayUrlRunner.cpp                   |    2 +-
 src/app_mac.cpp                                    |    2 +-
 src/browsers/BrowserBreadcrumbItem.cpp             |   14 +-
 src/browsers/BrowserBreadcrumbItem.h               |   12 +-
 src/browsers/BrowserBreadcrumbWidget.cpp           |    5 +-
 src/browsers/BrowserCategory.cpp                   |   33 +-
 src/browsers/BrowserCategory.h                     |   31 +-
 src/browsers/BrowserCategoryList.cpp               |  237 +-
 src/browsers/BrowserCategoryList.h                 |   53 +-
 src/browsers/BrowserCategoryListModel.cpp          |    5 +-
 src/browsers/BrowserCategoryListModel.h            |   10 +-
 src/browsers/BrowserDock.cpp                       |   64 +-
 src/browsers/BrowserDock.h                         |    9 +-
 src/browsers/BrowserMessageArea.cpp                |  167 +
 src/browsers/BrowserMessageArea.h                  |   67 +
 src/browsers/CollectionTreeItem.cpp                |    9 +-
 src/browsers/CollectionTreeItem.h                  |    2 +-
 src/browsers/CollectionTreeItemModel.cpp           |   84 +-
 src/browsers/CollectionTreeItemModel.h             |    5 +-
 src/browsers/CollectionTreeItemModelBase.cpp       |  424 +-
 src/browsers/CollectionTreeItemModelBase.h         |   20 +-
 src/browsers/CollectionTreeView.cpp                |   58 +-
 src/browsers/CollectionTreeView.h                  |   19 +-
 .../CollectionTreeItemDelegate.cpp                 |    1 -
 .../collectionbrowser/CollectionWidget.cpp         |    5 +
 src/browsers/filebrowser/FileBrowser.cpp           |   85 +-
 src/browsers/filebrowser/FileBrowser.h             |   13 +-
 src/browsers/filebrowser/FileView.cpp              |   89 +-
 src/browsers/filebrowser/FileView.h                |   22 +-
 src/browsers/playlistbrowser/APGCategory.cpp       |    6 +
 src/browsers/playlistbrowser/APGCategory.h         |    3 +-
 .../playlistbrowser/DynamicBiasDelegate.cpp        |   90 +-
 src/browsers/playlistbrowser/DynamicBiasDelegate.h |   39 +-
 src/browsers/playlistbrowser/DynamicBiasModel.cpp  |  316 -
 src/browsers/playlistbrowser/DynamicBiasModel.h    |   85 -
 .../playlistbrowser/DynamicBiasWidgets.cpp         |  364 +-
 src/browsers/playlistbrowser/DynamicBiasWidgets.h  |  136 +-
 src/browsers/playlistbrowser/DynamicCategory.cpp   |  343 +-
 src/browsers/playlistbrowser/DynamicCategory.h     |   54 +-
 src/browsers/playlistbrowser/DynamicModel.cpp      |  614 -
 src/browsers/playlistbrowser/DynamicModel.h        |  121 -
 src/browsers/playlistbrowser/DynamicView.cpp       |  297 +
 src/browsers/playlistbrowser/DynamicView.h         |   67 +
 src/browsers/playlistbrowser/PlaylistBrowser.cpp   |    8 +-
 src/browsers/playlistbrowser/PlaylistBrowser.h     |    2 +-
 .../playlistbrowser/PlaylistBrowserCategory.cpp    |   29 +-
 .../playlistbrowser/PlaylistBrowserCategory.h      |    8 +-
 .../playlistbrowser/PlaylistBrowserModel.cpp       |    4 +-
 .../playlistbrowser/PlaylistBrowserView.cpp        |    2 +-
 .../playlistbrowser/PlaylistsByProviderProxy.cpp   |    2 +-
 .../playlistbrowser/PlaylistsInFoldersProxy.cpp    |    2 +-
 src/browsers/playlistbrowser/PodcastCategory.cpp   |    6 +
 src/browsers/playlistbrowser/QtGroupingProxy.cpp   |  141 +-
 src/browsers/playlistbrowser/QtGroupingProxy.h     |    6 +-
 .../playlistbrowser/UserPlaylistCategory.cpp       |    2 +-
 src/browsers/servicebrowser/ServiceBrowser.cpp     |    6 +-
 src/browsers/servicebrowser/ServiceBrowser.h       |    2 +-
 src/configdialog/ConfigDialog.h                    |    4 +-
 src/configdialog/dialogs/NotificationsConfig.cpp   |   24 +-
 src/configdialog/dialogs/NotificationsConfig.ui    |   12 +-
 src/configdialog/dialogs/ScriptSelector.cpp        |    6 +-
 src/configdialog/dialogs/ScriptSelector.h          |    2 +-
 src/configdialog/dialogs/ScriptsConfig.cpp         |    3 -
 src/configdialog/dialogs/ScriptsConfig.h           |    1 -
 src/context/Applet.cpp                             |    7 +-
 src/context/ContextDock.cpp                        |   11 +-
 src/context/CoverBling.cpp                         |    4 +-
 src/context/CoverBling.h                           |    4 +-
 src/context/ToolbarView.cpp                        |   20 -
 src/context/ToolbarView.h                          |    1 -
 src/context/applets/albums/Albums.cpp              |   23 +-
 src/context/applets/albums/Albums.h                |    1 +
 src/context/applets/albums/AlbumsView.cpp          |   10 +-
 .../albums/amarok-context-applet-albums.desktop    |    4 +
 src/context/applets/currenttrack/CurrentTrack.cpp  |   39 +-
 src/context/applets/currenttrack/CurrentTrack.h    |    6 +-
 .../amarok-context-applet-currenttrack.desktop     |    1 +
 .../applets/currenttrack/currentTrackSettings.ui   |    2 +-
 .../info/amarok-context-applet-info.desktop        |    5 +
 src/context/applets/labels/LabelsApplet.cpp        |   15 +-
 .../labels/amarok-context-applet-labels.desktop    |    4 +
 src/context/applets/lyrics/LyricsApplet.cpp        |   64 +-
 src/context/applets/lyrics/LyricsApplet.h          |    2 +
 .../lyrics/amarok-context-applet-lyrics.desktop    |    4 +
 src/context/applets/photos/PhotosApplet.cpp        |    2 +-
 .../photos/amarok-context-applet-photos.desktop    |    5 +
 .../amarok-context-applet-playlistinfo.desktop     |    2 +
 .../applets/similarartists/ArtistWidget.cpp        |    9 +-
 src/context/applets/similarartists/ArtistWidget.h  |    2 +-
 .../amarok-context-applet-similarArtists.desktop   |    4 +
 .../similarartists/similarArtistsSettings.ui       |    4 +-
 .../amarok-context-applet-songkick.desktop         |    3 +
 src/context/applets/tabs/TabsApplet.cpp            |    4 +-
 .../tabs/amarok-context-applet-tabs.desktop        |   10 +-
 .../amarok-context-applet-upcomingEvents.desktop   |    3 +
 .../upcomingEventsGeneralSettings.ui               |    9 +-
 src/context/applets/videoclip/VideoclipApplet.cpp  |   34 +-
 .../amarok-context-applet-videoclip.desktop        |    3 +
 .../amarok-context-applet-wikipedia.desktop        |    4 +
 .../applets/wikipedia/wikipediaGeneralSettings.ui  |    9 +-
 .../verticallayout/VerticalAppletLayout.cpp        |   43 +-
 .../amarok-containment-vertical.desktop            |    2 +
 src/context/engines/current/CurrentEngine.cpp      |   14 +-
 src/context/engines/current/CurrentEngine.h        |    2 +-
 .../current/amarok-data-engine-current.desktop     |    1 +
 .../engines/info/amarok-data-engine-info.desktop   |    2 +
 src/context/engines/labels/LabelsEngine.cpp        |   24 +-
 src/context/engines/labels/LabelsEngine.h          |    2 +-
 .../labels/amarok-data-engine-labels.desktop       |    2 +
 .../lyrics/amarok-data-engine-lyrics.desktop       |    1 +
 .../photos/amarok-data-engine-photos.desktop       |    2 +
 .../amarok-data-engine-similarArtists.desktop      |    2 +
 .../songkick/amarok-data-engine-songkick.desktop   |    1 +
 src/context/engines/tabs/TabsEngine.cpp            |    3 +-
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    8 +-
 .../amarok-data-engine-upcomingEvents.desktop      |    2 +
 src/context/engines/videoclip/VideoclipEngine.cpp  |  105 +-
 .../videoclip/amarok-data-engine-videoclip.desktop |    2 +
 src/context/engines/wikipedia/WikipediaEngine.cpp  |   46 +-
 .../wikipedia/amarok-data-engine-wikipedia.desktop |    1 +
 src/context/popupdropper/libpud/PopupDropper.cpp   |    5 +-
 .../popupdropper/libpud/PopupDropperItem.cpp       |   22 +-
 ...k-scriptengine-applet-simple-javascript.desktop |    4 +
 .../amarok-scriptengine-runner-javascript.desktop  |    2 +
 .../scriptengine/javascript/bind_dataengine.h      |    4 +-
 src/context/servicetypes/amarok_animator.desktop   |    2 +
 .../servicetypes/amarok_containment.desktop        |    2 +
 .../servicetypes/amarok_context_applet.desktop     |    2 +
 .../servicetypes/amarok_data_engine.desktop        |    4 +
 src/context/toolbar/AppletToolbar.cpp              |  108 +-
 src/context/toolbar/AppletToolbar.h                |   25 +-
 src/context/toolbar/AppletToolbarAddItem.h         |    1 -
 src/context/toolbar/AppletToolbarAppletItem.cpp    |    2 -
 src/context/toolbar/AppletToolbarAppletItem.h      |    8 +-
 src/context/toolbar/AppletToolbarBase.cpp          |    2 +-
 src/context/widgets/RecentlyPlayedListWidget.cpp   |    7 +-
 src/context/widgets/RecentlyPlayedListWidget.h     |    2 +-
 src/context/widgets/ToolBoxMenu.cpp                |  684 -
 src/context/widgets/ToolBoxMenu.h                  |  126 -
 .../collections/audiocd/AudioCdCollection.cpp      |   18 +-
 .../collections/audiocd/AudioCdCollection.h        |    1 +
 .../amarok_collection-audiocdcollection.desktop    |   14 +-
 src/core-impl/collections/daap/DaapCollection.cpp  |    9 +-
 .../daap/amarok_collection-daapcollection.desktop  |    4 +-
 .../collections/daap/daapreader/Reader.cpp         |  514 +-
 src/core-impl/collections/daap/daapreader/Reader.h |   10 +-
 src/core-impl/collections/db/ScanManager.cpp       |   46 +-
 src/core-impl/collections/db/ScanManager.h         |    6 +-
 src/core-impl/collections/db/sql/CMakeLists.txt    |    4 -
 .../collections/db/sql/SqlCollectionLocation.cpp   |   19 +-
 src/core-impl/collections/db/sql/SqlMeta.cpp       |   22 +-
 src/core-impl/collections/db/sql/SqlQueryMaker.cpp |  117 +-
 src/core-impl/collections/db/sql/SqlQueryMaker.h   |   35 +-
 .../collections/db/sql/SqlQueryMakerInternal.cpp   |  101 +-
 .../collections/db/sql/SqlQueryMakerInternal.h     |   18 +-
 src/core-impl/collections/db/sql/SqlRegistry.cpp   |    3 -
 src/core-impl/collections/db/sql/SqlRegistry_p.h   |   10 +
 .../collections/db/sql/SqlScanResultProcessor.cpp  |    4 +-
 .../massstorage/amarok_device_massstorage.desktop  |    4 +-
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |    4 +-
 .../db/sql/device/smb/amarok_device_smb.desktop    |    4 +-
 .../db/sql/mysqlecollection/CMakeLists.txt         |    4 +-
 .../sql/mysqlecollection/MySqlEmbeddedStorage.cpp  |    2 +-
 .../amarok_collection-mysqlecollection.desktop     |    5 +-
 .../db/sql/mysqlservercollection/CMakeLists.txt    |    4 +-
 ...amarok_collection-mysqlservercollection.desktop |    5 +-
 .../collections/ipodcollection/IpodCollection.cpp  |    2 -
 .../amarok_collection-ipodcollection.desktop       |    4 +-
 .../ipodcollection/handler/IpodHandler.cpp         |   18 +-
 .../ipodcollection/handler/IpodHandler.h           |    4 -
 .../MediaDeviceCollectionLocation.cpp              |    1 -
 ...amarok_collection-mediadevicecollection.desktop |    4 +-
 .../handler/MediaDeviceHandler.cpp                 |   67 +-
 .../handler/MediaDeviceHandler.h                   |    3 -
 .../amarok_collection-mtpcollection.desktop        |    4 +-
 .../mtpcollection/handler/MtpHandler.cpp           |   38 +-
 .../nepomukcollection/NepomukQueryMaker.cpp        |   32 +-
 .../nepomukcollection/NepomukQueryMaker.h          |    4 -
 .../amarok_collection-nepomukcollection.desktop    |    3 +-
 .../playdarcollection/PlaydarQueryMaker.cpp        |  110 +-
 .../playdarcollection/PlaydarQueryMaker.h          |   29 +-
 .../amarok_collection-playdarcollection.desktop    |   16 +-
 .../proxycollection/ProxyCollectionQueryMaker.cpp  |   87 +-
 .../proxycollection/ProxyCollectionQueryMaker.h    |   21 +-
 .../support/CollectionLocationDelegateImpl.cpp     |    8 +-
 .../collections/support/CollectionManager.cpp      |    2 +-
 .../collections/support}/Expression.cpp            |    0
 .../collections/support}/Expression.h              |    0
 .../collections/support/FileCollectionLocation.cpp |    7 +-
 .../collections/support/MemoryQueryMaker.cpp       |   36 +-
 .../collections/support/MemoryQueryMaker.h         |    3 -
 .../support/MemoryQueryMakerInternal.cpp           |   45 +-
 .../collections/support/MemoryQueryMakerInternal.h |   19 +-
 .../collections/support/TextualQueryFilter.cpp     |  365 +
 .../collections/support/TextualQueryFilter.h       |   49 +
 .../support/TrashCollectionLocation.cpp            |    5 +-
 .../collections/support/XmlQueryReader.cpp         |   17 +-
 .../collections/support/XmlQueryWriter.cpp         |   45 +-
 src/core-impl/collections/support/XmlQueryWriter.h |    3 -
 .../amarok_collection-umscollection.desktop        |    4 +-
 .../collections/umscollection/handler/UmsHandler.h |    1 +
 .../support/UmsConnectionAssistant.cpp             |    6 +
 .../upnpcollection/UpnpBrowseCollection.cpp        |   24 +-
 .../upnpcollection/UpnpBrowseCollection.h          |    2 +
 .../collections/upnpcollection/UpnpQueryMaker.cpp  |  167 +-
 .../collections/upnpcollection/UpnpQueryMaker.h    |   20 +-
 .../upnpcollection/UpnpQueryMakerInternal.cpp      |    4 +-
 .../upnpcollection/UpnpSearchCollection.cpp        |    2 +-
 .../amarok_collection-upnpcollection.desktop       |    4 +-
 src/core-impl/logger/ProxyLogger.cpp               |   63 +-
 src/core-impl/logger/ProxyLogger.h                 |   18 +-
 src/core-impl/meta/cdda/AudioCdTrackProvider_p.cpp |    4 +-
 src/core-impl/meta/file/File.h                     |    4 -
 .../playlists/types/file/PlaylistFileSupport.cpp   |   38 +-
 .../playlists/types/file/PlaylistFileSupport.h     |    5 +-
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |   42 +-
 .../sql/PodcastFilenameLayoutConfigDialog.cpp      |   67 +
 .../sql/PodcastFilenameLayoutConfigDialog.h        |   31 +
 .../sql/PodcastFilenameLayoutConfigWidget.ui       |  132 +
 src/core-impl/podcasts/sql/PodcastSettingsBase.ui  |   29 +-
 .../podcasts/sql/PodcastSettingsDialog.cpp         |    9 +
 src/core-impl/podcasts/sql/PodcastSettingsDialog.h |    1 +
 src/core-impl/podcasts/sql/SqlPodcastMeta.cpp      |    9 +-
 src/core-impl/podcasts/sql/SqlPodcastMeta.h        |    4 +
 src/core-impl/podcasts/sql/SqlPodcastProvider.cpp  |  222 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.h    |    2 +
 .../sql/SqlPodcastProviderSettingsWidget.ui        |    2 +-
 src/core/CMakeLists.txt                            |    2 +-
 src/core/collections/CollectionLocation.cpp        |   12 +-
 src/core/collections/CollectionLocation.h          |    2 +-
 src/core/collections/MetaQueryMaker.cpp            |   61 +-
 src/core/collections/MetaQueryMaker.h              |    4 -
 src/core/collections/QueryMaker.cpp                |    6 -
 src/core/collections/QueryMaker.h                  |   54 +-
 src/core/interfaces/Logger.h                       |   27 +-
 src/core/meta/Meta.h                               |    5 +-
 src/core/meta/support/MetaUtility.cpp              |   13 +-
 src/core/podcasts/PodcastMeta.h                    |    1 -
 src/core/support/Amarok.cpp                        |    6 -
 src/core/support/Amarok.h                          |   17 +-
 src/core/support/Debug.cpp                         |    6 +-
 src/core/support/Debug.h                           |   53 +-
 src/core/support/SmartPointerList.h                |    2 +-
 src/covermanager/CoverCache.cpp                    |   10 +-
 src/covermanager/CoverFetchUnit.cpp                |    7 +-
 src/covermanager/CoverFoundDialog.cpp              |    8 +-
 src/covermanager/CoverManager.cpp                  |   26 +-
 src/covermanager/CoverManager.h                    |    4 +-
 src/data/amarok.notifyrc                           |    7 +
 src/data/ball.png                                  |  Bin 1619 -> 0 bytes
 src/data/dot.png                                   |  Bin 598 -> 0 bytes
 src/data/grid.png                                  |  Bin 233 -> 0 bytes
 src/data/wirl1.png                                 |  Bin 46301 -> 0 bytes
 src/data/wirl2.png                                 |  Bin 44081 -> 0 bytes
 .../amarok14/FastForwardWorker.cpp                 |    8 +-
 src/databaseimporter/amarok14/FastForwardWorker.h  |    2 +-
 src/databaseimporter/sqlbatch/SqlBatchImporter.cpp |    2 +-
 src/dbus/DBusQueryHelper.cpp                       |    5 +-
 src/dbus/DBusQueryHelper.h                         |    4 +-
 src/dbus/mpris2/Mpris2DBusHandler.cpp              |   10 +-
 src/dialogs/DatabaseImporterDialog.cpp             |   29 +-
 src/dialogs/EqualizerDialog.cpp                    |  186 +-
 src/dialogs/EqualizerDialog.h                      |   16 +-
 src/dialogs/FilenameLayoutDialog.ui                |   14 +-
 src/dialogs/MusicBrainzTagger.cpp                  |    1 +
 src/dialogs/OrganizeCollectionDialog.cpp           |   78 +-
 src/dialogs/OrganizeCollectionDialog.h             |   17 +-
 src/dialogs/OrganizeCollectionDialogBase.ui        |   67 +-
 src/dialogs/ScriptSelector.cpp                     |   28 +-
 src/dialogs/ScriptSelector.h                       |    6 +-
 src/dialogs/TagDialog.cpp                          |   65 +-
 src/dialogs/TagDialog.h                            |   13 +-
 src/dialogs/TagDialogBase.ui                       |   14 +-
 src/dialogs/deviceconfiguredialog.cpp              |    4 +-
 src/dialogs/deviceconfiguredialog.h                |   11 +-
 src/dynamic/Bias.cpp                               |  877 +-
 src/dynamic/Bias.h                                 |  429 +-
 src/dynamic/BiasFactory.cpp                        |  298 +
 src/dynamic/BiasFactory.h                          |  140 +
 src/dynamic/BiasSolver.cpp                         |  818 +-
 src/dynamic/BiasSolver.h                           |  187 +-
 src/dynamic/BiasedPlaylist.cpp                     |  240 +-
 src/dynamic/BiasedPlaylist.h                       |   54 +-
 src/dynamic/CustomBias.cpp                         |  284 -
 src/dynamic/CustomBias.h                           |  116 -
 src/dynamic/CustomBiasEntry.cpp                    |   25 -
 src/dynamic/CustomBiasEntry.h                      |   97 -
 src/dynamic/CustomBiasEntryFactory.h               |   68 -
 src/dynamic/CustomBiasEntryWidget.cpp              |  197 -
 src/dynamic/CustomBiasEntryWidget.h                |   61 -
 src/dynamic/DynamicModel.cpp                       | 1136 +
 src/dynamic/DynamicModel.h                         |  189 +
 src/dynamic/DynamicPlaylist.cpp                    |   46 +-
 src/dynamic/DynamicPlaylist.h                      |   51 +-
 src/dynamic/TrackSet.cpp                           |  217 +-
 src/dynamic/TrackSet.h                             |   80 +-
 src/dynamic/biases/AlbumPlayBias.cpp               |  291 +
 src/dynamic/biases/AlbumPlayBias.h                 |   88 +
 src/dynamic/biases/EchoNest.cpp                    |  534 -
 src/dynamic/biases/EchoNest.h                      |  127 -
 src/dynamic/biases/EchoNestBias.cpp                |  531 +
 src/dynamic/biases/EchoNestBias.h                  |  125 +
 src/dynamic/biases/IfElseBias.cpp                  |  183 +
 src/dynamic/biases/IfElseBias.h                    |   84 +
 src/dynamic/biases/PartBias.cpp                    |  623 +
 src/dynamic/biases/PartBias.h                      |  150 +
 src/dynamic/biases/QuizPlayBias.cpp                |  359 +
 src/dynamic/biases/QuizPlayBias.h                  |  100 +
 src/dynamic/biases/SearchQueryBias.cpp             |  174 +
 src/dynamic/biases/SearchQueryBias.h               |   78 +
 src/dynamic/biases/TagMatchBias.cpp                |  452 +
 src/dynamic/biases/TagMatchBias.h                  |  163 +
 src/dynamic/gsl/gauss.c                            |  353 -
 src/equalizer/EqualizerPresets.cpp                 |  242 +
 src/equalizer/EqualizerPresets.h                   |   46 +
 src/likeback/LikeBack.cpp                          |   24 +-
 src/likeback/LikeBackDialog.cpp                    |   24 +-
 src/main.cpp                                       |    9 +-
 src/moodbar/MoodbarManager.cpp                     |    4 +-
 src/moodbar/MoodbarManager.h                       |    5 +-
 src/musicbrainz/MusicBrainzFinder.cpp              |    3 +-
 src/musicbrainz/MusicBrainzTags.cpp                |   16 +-
 src/musicbrainz/MusicDNSAudioDecoder.cpp           |    4 +-
 src/playlist/PlaylistActions.cpp                   |   42 +-
 src/playlist/PlaylistActions.h                     |    6 +-
 src/playlist/PlaylistBreadcrumbItemSortButton.cpp  |    1 -
 src/playlist/PlaylistController.cpp                |   98 +-
 src/playlist/PlaylistController.h                  |   42 +-
 src/playlist/PlaylistDock.cpp                      |   94 +-
 src/playlist/PlaylistDock.h                        |   23 +-
 src/playlist/PlaylistInfoWidget.cpp                |  116 +
 src/playlist/PlaylistInfoWidget.h                  |   34 +
 src/playlist/PlaylistModel.cpp                     |   38 +-
 src/playlist/PlaylistModel.h                       |    2 +-
 src/playlist/PlaylistModelStack.cpp                |   24 +-
 src/playlist/PlaylistModelStack.h                  |   14 +-
 src/playlist/PlaylistToolBar.cpp                   |  108 +
 src/playlist/PlaylistToolBar.h                     |   90 +
 src/playlist/layouts/LayoutEditDialog.cpp          |    4 +-
 src/playlist/layouts/LayoutManager.cpp             |    5 +-
 src/playlist/navigators/AlbumNavigator.cpp         |    5 +-
 src/playlist/navigators/AlbumNavigator.h           |    2 +-
 src/playlist/navigators/DynamicTrackNavigator.cpp  |   83 +-
 src/playlist/navigators/DynamicTrackNavigator.h    |   26 +-
 src/playlist/navigators/NavigatorConfigAction.cpp  |   19 +
 src/playlist/navigators/NavigatorConfigAction.h    |    1 +
 src/playlist/navigators/StandardTrackNavigator.cpp |    4 +
 src/playlist/navigators/StandardTrackNavigator.h   |    2 +
 src/playlist/navigators/TrackNavigator.cpp         |    2 +-
 src/playlist/proxymodels/AbstractModel.h           |    3 +-
 src/playlist/proxymodels/ProxyBase.cpp             |    4 +-
 src/playlist/proxymodels/ProxyBase.h               |    2 +-
 src/playlist/view/listview/PrettyListView.cpp      |    1 +
 src/playlistgenerator/ConstraintNode.cpp           |    2 +-
 src/playlistgenerator/ConstraintSolver.cpp         |   17 +-
 src/playlistgenerator/ConstraintSolver.h           |    2 +-
 src/playlistgenerator/ConstraintTester.cpp         |    6 +-
 src/playlistgenerator/ConstraintTester.h           |    2 +-
 src/playlistgenerator/Preset.cpp                   |   25 +-
 src/playlistgenerator/Preset.h                     |    1 +
 src/playlistgenerator/PresetModel.cpp              |   25 +-
 src/playlistgenerator/constraints/Checkpoint.cpp   |    8 +-
 .../constraints/PlaylistDuration.cpp               |    5 +-
 .../constraints/PreventDuplicates.cpp              |    7 +-
 src/playlistmanager/PlaylistManager.h              |   11 +-
 src/playlistmanager/SyncedPlaylist.cpp             |    2 +-
 src/scriptengine/AmarokKNotifyScript.cpp           |   68 +
 src/scriptengine/AmarokKNotifyScript.h             |   49 +
 src/scriptengine/AmarokStatusbarScript.cpp         |   35 +-
 src/scriptengine/AmarokStatusbarScript.h           |   10 -
 src/scriptengine/ScriptImporter.cpp                |    4 +
 src/services/CMakeLists.txt                        |    2 +-
 src/services/DynamicServiceQueryMaker.cpp          |    5 -
 src/services/DynamicServiceQueryMaker.h            |    4 -
 src/services/ServiceBase.h                         |    1 -
 src/services/ServiceCollectionTreeView.cpp         |    2 +-
 src/services/ServicePluginManager.cpp              |    4 +-
 src/services/ServiceSqlQueryMaker.cpp              |   64 +-
 src/services/ServiceSqlQueryMaker.h                |    3 -
 src/services/ampache/AmpacheService.cpp            |    2 +-
 src/services/ampache/AmpacheServiceCollection.cpp  |    1 +
 src/services/ampache/AmpacheServiceQueryMaker.cpp  |   63 +-
 src/services/ampache/AmpacheServiceQueryMaker.h    |    8 -
 src/services/ampache/CMakeLists.txt                |    9 +-
 .../ampache/amarok_service_ampache.desktop         |    6 +-
 .../ampache/amarok_service_ampache_config.desktop  |    5 +-
 .../gpodder/amarok_service_gpodder.desktop         |   22 +-
 src/services/jamendo/JamendoDatabaseHandler.cpp    |    9 +-
 src/services/jamendo/JamendoService.cpp            |    3 +-
 src/services/jamendo/JamendoXmlParser.cpp          |    2 +-
 .../jamendo/amarok_service_jamendo.desktop         |    8 +-
 src/services/lastfm/LastFmConfigWidget.ui          |   14 +-
 src/services/lastfm/LastFmService.cpp              |   25 +-
 src/services/lastfm/LastFmService.h                |   11 +-
 src/services/lastfm/LastFmServiceCollection.cpp    |    2 +-
 src/services/lastfm/LastFmServiceConfig.cpp        |    3 +
 src/services/lastfm/LastFmServiceConfig.h          |    4 +
 src/services/lastfm/LastFmServiceQueryMaker.cpp    |   14 +-
 src/services/lastfm/LastFmServiceQueryMaker.h      |    5 -
 src/services/lastfm/LastFmServiceSettings.cpp      |    4 +
 src/services/lastfm/LastFmTreeView.h               |    2 +-
 src/services/lastfm/ScrobblerAdapter.cpp           |   24 +-
 src/services/lastfm/SimilarArtistsAction.cpp       |    2 +-
 src/services/lastfm/amarok_service_lastfm.desktop  |    8 +-
 .../lastfm/amarok_service_lastfm_config.desktop    |    6 +-
 src/services/lastfm/biases/LastFmBias.cpp          |  837 +-
 src/services/lastfm/biases/LastFmBias.h            |  188 +-
 src/services/lastfm/biases/WeeklyTopBias.cpp       |  683 +-
 src/services/lastfm/biases/WeeklyTopBias.h         |  181 +-
 .../lastfm/meta/MultiPlayableCapabilityImpl_p.h    |   14 +-
 .../magnatune/MagnatuneAlbumDownloader.cpp         |    2 +-
 .../magnatune/MagnatuneDatabaseHandler.cpp         |    2 +
 .../magnatune/MagnatuneDownloadHandler.cpp         |   10 +-
 src/services/magnatune/MagnatuneInfoParser.cpp     |    2 +-
 .../magnatune/MagnatuneSignupDialogBase.ui         |    2 +-
 src/services/magnatune/MagnatuneStore.cpp          |    7 +-
 .../amarok_service_magnatunestore.desktop          |    9 +-
 .../amarok_service_magnatunestore_config.desktop   |    6 +-
 src/services/mp3tunes/CMakeLists.txt               |    1 -
 src/services/mp3tunes/Mp3tunesService.cpp          |   21 +-
 .../mp3tunes/Mp3tunesServiceCollectionLocation.cpp |    5 +-
 .../mp3tunes/Mp3tunesServiceQueryMaker.cpp         |   36 +-
 src/services/mp3tunes/Mp3tunesServiceQueryMaker.h  |    2 -
 src/services/mp3tunes/Mp3tunesWorkers.cpp          |   14 +-
 src/services/mp3tunes/Mp3tunesWorkers.h            |    1 +
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    8 +-
 .../amarok_service_mp3tunes_config.desktop         |    5 +-
 .../opmldirectory/OpmlDirectoryInfoParser.cpp      |    3 +-
 src/services/opmldirectory/OpmlDirectoryModel.cpp  |    2 +-
 .../amarok_service_opmldirectory.desktop           |    7 +-
 .../scriptable/ScriptableServiceManager.cpp        |    4 +-
 .../scriptable/ScriptableServiceQueryMaker.cpp     |   37 +-
 .../scriptable/ScriptableServiceQueryMaker.h       |    2 -
 src/statusbar/CompoundProgressBar.cpp              |  122 +-
 src/statusbar/CompoundProgressBar.h                |   22 +-
 src/statusbar/LongMessageWidget.cpp                |   45 +-
 src/statusbar/LongMessageWidget.h                  |   31 +-
 src/statusbar/PopupWidget.cpp                      |    8 +-
 src/statusbar/PopupWidget.h                        |    3 +-
 src/statusbar/ProgressBar.cpp                      |   71 +-
 src/statusbar/ProgressBar.h                        |   18 +-
 src/statusbar/StatusBar.cpp                        |  437 -
 src/statusbar/StatusBar.h                          |  187 -
 src/synchronization/SynchronizationBaseJob.cpp     |   77 +-
 src/synchronization/SynchronizationBaseJob.h       |   11 +-
 src/themes/context/Amarok-Mockup/metadata.desktop  |    6 +-
 src/toolbar/MainToolbar.cpp                        |  198 +-
 src/widgets/BookmarkPopup.cpp                      |    1 -
 src/widgets/BreadcrumbItemButton.cpp               |    2 +-
 src/widgets/ExpandingControlsWidget.cpp            |   98 -
 src/widgets/ExpandingControlsWidget.h              |   54 -
 src/widgets/HintLineEdit.cpp                       |   77 +
 src/widgets/HintLineEdit.h                         |   46 +
 src/widgets/MetaQueryWidget.cpp                    |   27 +-
 src/widgets/MetaQueryWidget.h                      |    4 +-
 src/widgets/Osd.cpp                                |   33 +-
 src/widgets/Osd.h                                  |   12 +-
 src/widgets/PrettyTreeView.h                       |   29 +-
 src/widgets/ProgressWidget.cpp                     |    8 +-
 src/widgets/SliderWidget.cpp                       |    2 +
 src/widgets/Splitter.cpp                           |   67 -
 src/widgets/Splitter.h                             |   64 -
 src/{ => widgets}/StarManager.cpp                  |    0
 src/{ => widgets}/StarManager.h                    |    0
 src/widgets/VolumeWidget.cpp                       |  102 -
 src/widgets/VolumeWidget.h                         |   55 -
 src/widgets/hintlineedit.cpp                       |   77 -
 src/widgets/hintlineedit.h                         |   43 -
 tests/CMakeLists.txt                               |    3 +-
 tests/TestExpression.cpp                           |    2 +-
 .../browsers/TestSingleCollectionTreeItemModel.cpp |   34 +-
 tests/browsers/TestSingleCollectionTreeItemModel.h |    6 -
 tests/core-impl/collections/db/sql/CMakeLists.txt  |    2 -
 .../collections/db/sql/TestSqlQueryMaker.cpp       |  243 +-
 .../collections/db/sql/TestSqlQueryMaker.h         |    6 +-
 .../collections/db/sql/TestSqlScanManager.cpp      |   11 +-
 .../collections/support/TestMemoryQueryMaker.cpp   |    6 +-
 tests/core-impl/meta/multi/TestMetaMultiTrack.cpp  |    8 +-
 .../playlists/types/file/xspf/TestXSPFPlaylist.cpp |    4 +-
 tests/dynamic/CMakeLists.txt                       |   63 +
 tests/dynamic/TestDynamicModel.cpp                 |  435 +
 tests/dynamic/TestDynamicModel.h                   |   45 +
 tests/dynamic/TestTrackSet.cpp                     |  197 +
 tests/dynamic/TestTrackSet.h                       |   48 +
 tests/mocks/MockLogger.h                           |    9 +-
 tests/playlist/TestPlaylistModels.cpp              |    6 +-
 .../TestOneWaySynchronizationJob.cpp               |    4 +
 utilities/CMakeLists.txt                           |    5 +-
 utilities/afttagger/AFTTagger.cpp                  |   11 +-
 utilities/afttagger/CMakeLists.txt                 |   13 +-
 utilities/collectionscanner/CMakeLists.txt         |   50 +-
 utilities/collectionscanner/CollectionScanner.cpp  |   19 +-
 utilities/collectionscanner/CollectionScanner.h    |    6 -
 utilities/collectionscanner/Track.h                |    4 +-
 utilities/updatesigner/CMakeLists.txt              |   37 +-
 811 files changed, 323853 insertions(+), 345994 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list