malteveerman created this revision. malteveerman added a reviewer: Amarok. malteveerman added a project: Amarok. malteveerman requested review of this revision.
REVISION SUMMARY This patch ports the core app away from kdelibs4 to pure qt5/kf5. Kdelibs4 classes that don't have an equivalent in qt5 or kf5 like KSharedPtr or KHBox were replaced by new ones (AmarokSharedPtr and BoxWidget). There are also a lot of small fixes and changes in this patch, which I unfortunately cannot break off into their own revisions, because I lost my git history to a faulty hard drive and my only backup was months old. Sorry for that. I also temporarily deactivated the tests. They get ported and reactivated in a later patch to keep the scope of this at least somewhat manageable. Also in later patches are a new qml context area with the most important applets, some services and importers. It's all finished and ready for merge as soon as this patch lands. REPOSITORY R181 Amarok BRANCH kf5 REVISION DETAIL https://phabricator.kde.org/D10526 AFFECTED FILES CMakeLists.txt shared/CMakeLists.txt shared/MetaTagLib.cpp shared/amarokshared_export.h shared/tag_helpers/ID3v2TagHelper.cpp src/ActionClasses.cpp src/ActionClasses.h src/AmarokMimeData.cpp src/AmarokMimeData.h src/AmarokProcess.h src/AmarokSharedPointer.h src/App.cpp src/App.h src/CMakeLists.txt src/EngineController.cpp src/EngineController.h src/GlobalCollectionActions.cpp src/GlobalCollectionActions.h src/GlobalCurrentTrackActions.cpp src/GlobalCurrentTrackActions.h src/KNotificationBackend.cpp src/KNotificationBackend.h src/LastfmReadLabelCapability.cpp src/MainWindow.cpp src/MainWindow.h src/MediaDeviceCache.cpp src/MediaDeviceCache.h src/MediaDeviceMonitor.cpp src/MediaDeviceMonitor.h src/OpmlParser.cpp src/OpmlParser.h src/OpmlWriter.h src/PaletteHandler.cpp src/PaletteHandler.h src/PluginManager.h src/PopupDropperFactory.cpp src/PopupDropperFactory.h src/QStringx.cpp src/QStringx.h src/SvgHandler.cpp src/SvgHandler.h src/SvgTinter.cpp src/SvgTinter.h src/TrayIcon.cpp src/TrayIcon.h src/aboutdialog/ExtendedAboutDialog.cpp src/aboutdialog/ExtendedAboutDialog.h src/aboutdialog/OcsPersonItem.cpp src/aboutdialog/OcsPersonItem.h src/aboutdialog/libattica-ocsclient/CMakeLists.txt src/aboutdialog/libattica-ocsclient/activitylistjob.cpp src/aboutdialog/libattica-ocsclient/atticaclient_export.h src/aboutdialog/libattica-ocsclient/categorylistjob.cpp src/aboutdialog/libattica-ocsclient/contentjob.cpp src/aboutdialog/libattica-ocsclient/contentlistjob.cpp src/aboutdialog/libattica-ocsclient/folderlistjob.cpp src/aboutdialog/libattica-ocsclient/knowledgebasejob.cpp src/aboutdialog/libattica-ocsclient/knowledgebaselistjob.cpp src/aboutdialog/libattica-ocsclient/messagelistjob.cpp src/aboutdialog/libattica-ocsclient/personjob.cpp src/aboutdialog/libattica-ocsclient/personlistjob.cpp src/aboutdialog/libattica-ocsclient/postjob.cpp src/aboutdialog/libattica-ocsclient/provider.cpp src/amarok_export.h src/amarokconfig.kcfg src/amarokurls/AmarokUrl.cpp src/amarokurls/AmarokUrlHandler.cpp src/amarokurls/BookmarkCurrentButton.cpp src/amarokurls/BookmarkGroup.cpp src/amarokurls/BookmarkGroup.h src/amarokurls/BookmarkManager.cpp src/amarokurls/BookmarkManagerWidget.cpp src/amarokurls/BookmarkManagerWidget.h src/amarokurls/BookmarkMetaActions.cpp src/amarokurls/BookmarkModel.cpp src/amarokurls/BookmarkModel.h src/amarokurls/BookmarkTreeView.cpp src/amarokurls/BookmarkViewItem.h src/amarokurls/ContextUrlGenerator.cpp src/amarokurls/ContextUrlRunner.cpp src/amarokurls/NavigationUrlGenerator.cpp src/amarokurls/NavigationUrlRunner.cpp src/amarokurls/PlayUrlGenerator.cpp src/browsers/BrowserBreadcrumbItem.cpp src/browsers/BrowserBreadcrumbItem.h src/browsers/BrowserBreadcrumbWidget.cpp src/browsers/BrowserBreadcrumbWidget.h src/browsers/BrowserCategory.cpp src/browsers/BrowserCategory.h src/browsers/BrowserCategoryList.cpp src/browsers/BrowserDock.cpp src/browsers/BrowserDock.h src/browsers/BrowserMessageArea.cpp src/browsers/BrowserMessageArea.h src/browsers/CollectionSortFilterProxyModel.cpp src/browsers/CollectionSortFilterProxyModel.h src/browsers/CollectionTreeItem.cpp src/browsers/CollectionTreeItemModel.cpp src/browsers/CollectionTreeItemModelBase.cpp src/browsers/CollectionTreeItemModelBase.h src/browsers/CollectionTreeView.cpp src/browsers/CollectionTreeView.h src/browsers/InfoProxy.cpp src/browsers/SingleCollectionTreeItemModel.cpp src/browsers/collectionbrowser/CollectionWidget.cpp src/browsers/filebrowser/FileBrowser.cpp src/browsers/filebrowser/FileBrowser_p.h src/browsers/filebrowser/FileView.cpp src/browsers/filebrowser/FileView.h src/browsers/playlistbrowser/APGCategory.cpp src/browsers/playlistbrowser/DynamicBiasDialog.cpp src/browsers/playlistbrowser/DynamicBiasDialog.h src/browsers/playlistbrowser/DynamicCategory.cpp src/browsers/playlistbrowser/DynamicView.cpp src/browsers/playlistbrowser/PlaylistBrowser.cpp src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp src/browsers/playlistbrowser/PlaylistBrowserCategory.h src/browsers/playlistbrowser/PlaylistBrowserView.cpp src/browsers/playlistbrowser/PlaylistViewItem.h src/browsers/playlistbrowser/PlaylistsByProviderProxy.h src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp src/browsers/playlistbrowser/PlaylistsInFoldersProxy.h src/browsers/playlistbrowser/PodcastCategory.cpp src/browsers/playlistbrowser/PodcastModel.cpp src/browsers/playlistbrowser/PodcastModel.h src/browsers/playlistbrowser/QtGroupingProxy.h src/browsers/playlistbrowser/UserPlaylistCategory.cpp src/browsers/playlistbrowser/UserPlaylistCategory.h src/browsers/servicebrowser/ServiceBrowser.cpp src/browsers/servicebrowser/ServiceBrowser.h src/configdialog/ConfigDialog.cpp src/configdialog/ConfigDialog.h src/configdialog/dialogs/CollectionConfig.cpp src/configdialog/dialogs/CollectionConfig.ui src/configdialog/dialogs/DatabaseConfig.cpp src/configdialog/dialogs/ExcludedLabelsDialog.cpp src/configdialog/dialogs/ExcludedLabelsDialog.h src/configdialog/dialogs/ExcludedLabelsDialog.ui src/configdialog/dialogs/GeneralConfig.cpp src/configdialog/dialogs/GeneralConfig.ui src/configdialog/dialogs/MetadataConfig.cpp src/configdialog/dialogs/MetadataConfig.h src/configdialog/dialogs/NotificationsConfig.ui src/configdialog/dialogs/PlaybackConfig.cpp src/configdialog/dialogs/PluginsConfig.cpp src/configdialog/dialogs/ScriptSelector.cpp src/configdialog/dialogs/ScriptSelector.h src/configdialog/dialogs/ScriptsConfig.cpp src/configdialog/dialogs/ScriptsConfig.h src/configdialog/dialogs/ScriptsConfig.ui src/context/CMakeLists.txt src/context/LyricsManager.cpp src/context/LyricsManager.h src/context/popupdropper/libpud/PopupDropper.cpp src/context/popupdropper/libpud/PopupDropperItem.cpp src/core-impl/capabilities/timecode/TimecodeLoadCapability.h src/core-impl/capabilities/timecode/TimecodeWriteCapability.cpp src/core-impl/collections/CMakeLists.txt src/core-impl/collections/aggregate/AggregateCollection.cpp src/core-impl/collections/aggregate/AggregateCollection.h src/core-impl/collections/aggregate/AggregateMeta.cpp src/core-impl/collections/aggregate/AggregateQueryMaker.cpp src/core-impl/collections/aggregate/AggregateQueryMaker.h src/core-impl/collections/audiocd/AudioCdCollection.cpp src/core-impl/collections/audiocd/AudioCdCollection.h src/core-impl/collections/audiocd/AudioCdCollectionLocation.cpp src/core-impl/collections/audiocd/AudioCdMeta.h src/core-impl/collections/audiocd/CMakeLists.txt src/core-impl/collections/audiocd/FormatSelectionDialog.cpp src/core-impl/collections/audiocd/handler/AudioCdHandler.cpp src/core-impl/collections/daap/CMakeLists.txt src/core-impl/collections/daap/DaapCollection.cpp src/core-impl/collections/daap/DaapCollection.h src/core-impl/collections/daap/DaapMeta.h src/core-impl/collections/daap/daapreader/Reader.cpp src/core-impl/collections/daap/daapreader/Reader.h src/core-impl/collections/daap/daapreader/authentication/contentfetcher.cpp src/core-impl/collections/daap/daapreader/authentication/contentfetcher.h src/core-impl/collections/db/MountPointManager.cpp src/core-impl/collections/db/MountPointManager.h src/core-impl/collections/db/sql/CMakeLists.txt src/core-impl/collections/db/sql/DatabaseUpdater.cpp src/core-impl/collections/db/sql/SqlCapabilities.cpp src/core-impl/collections/db/sql/SqlCapabilities.h src/core-impl/collections/db/sql/SqlCollection.cpp src/core-impl/collections/db/sql/SqlCollectionLocation.cpp src/core-impl/collections/db/sql/SqlCollectionLocation.h src/core-impl/collections/db/sql/SqlMeta.cpp src/core-impl/collections/db/sql/SqlMeta.h src/core-impl/collections/db/sql/SqlQueryMaker.cpp src/core-impl/collections/db/sql/SqlQueryMakerInternal.cpp src/core-impl/collections/db/sql/SqlQueryMakerInternal.h src/core-impl/collections/db/sql/SqlRegistry.cpp src/core-impl/collections/db/sql/SqlRegistry.h src/core-impl/collections/db/sql/SqlRegistry_p.cpp src/core-impl/collections/db/sql/amarok_sqlcollection_export.h src/core-impl/collections/db/sql/device/nfs/NfsDeviceHandler.h src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt src/core-impl/collections/ipodcollection/CMakeLists.txt src/core-impl/collections/ipodcollection/IpodCollection.cpp src/core-impl/collections/ipodcollection/IpodCollection.h src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp src/core-impl/collections/ipodcollection/IpodCollectionLocation.cpp src/core-impl/collections/ipodcollection/IpodCollectionLocation.h src/core-impl/collections/ipodcollection/IpodMeta.cpp src/core-impl/collections/ipodcollection/IpodMeta.h src/core-impl/collections/ipodcollection/IpodPlaylist.cpp src/core-impl/collections/ipodcollection/IpodPlaylist.h src/core-impl/collections/ipodcollection/IpodPlaylistProvider.cpp src/core-impl/collections/ipodcollection/IpodPlaylistProvider.h src/core-impl/collections/ipodcollection/jobs/IpodCopyTracksJob.cpp src/core-impl/collections/ipodcollection/jobs/IpodCopyTracksJob.h src/core-impl/collections/ipodcollection/jobs/IpodDeleteTracksJob.cpp src/core-impl/collections/ipodcollection/jobs/IpodDeleteTracksJob.h src/core-impl/collections/ipodcollection/jobs/IpodParseTracksJob.cpp src/core-impl/collections/ipodcollection/support/IphoneMountPoint.cpp src/core-impl/collections/ipodcollection/support/IpodDeviceHelper.cpp src/core-impl/collections/ipodcollection/support/IpodDeviceHelper.h src/core-impl/collections/ipodcollection/support/IpodTranscodeCapability.cpp src/core-impl/collections/ipodcollection/support/IpodTranscodeCapability.h src/core-impl/collections/mediadevicecollection/MediaDeviceCollectionLocation.cpp src/core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp src/core-impl/collections/mediadevicecollection/MediaDeviceMeta.h src/core-impl/collections/mediadevicecollection/handler/MediaDeviceHandlerCapability.h src/core-impl/collections/mediadevicecollection/playlist/MediaDevicePlaylist.h src/core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.cpp src/core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.h src/core-impl/collections/mediadevicecollection/podcast/MediaDevicePodcastMeta.h src/core-impl/collections/mediadevicecollection/support/ConnectionAssistant.cpp src/core-impl/collections/mediadevicecollection/support/mediadevicecollection_export.h src/core-impl/collections/mtpcollection/CMakeLists.txt src/core-impl/collections/mtpcollection/handler/MtpHandler.cpp src/core-impl/collections/mtpcollection/handler/MtpHandler.h src/core-impl/collections/mtpcollection/handler/capabilities/MtpReadCapability.cpp src/core-impl/collections/mtpcollection/handler/capabilities/MtpReadCapability.h src/core-impl/collections/nepomukcollection/CMakeLists.txt src/core-impl/collections/nepomukcollection/NepomukParser.cpp src/core-impl/collections/playdarcollection/CMakeLists.txt src/core-impl/collections/playdarcollection/PlaydarCollection.cpp src/core-impl/collections/playdarcollection/PlaydarCollection.h src/core-impl/collections/playdarcollection/PlaydarMeta.cpp src/core-impl/collections/playdarcollection/PlaydarMeta.h src/core-impl/collections/playdarcollection/PlaydarQueryMaker.cpp src/core-impl/collections/playdarcollection/PlaydarQueryMaker.h src/core-impl/collections/playdarcollection/support/Controller.cpp src/core-impl/collections/playdarcollection/support/Controller.h src/core-impl/collections/playdarcollection/support/ProxyResolver.cpp src/core-impl/collections/playdarcollection/support/Query.cpp src/core-impl/collections/playdarcollection/support/Query.h src/core-impl/collections/support/ArtistHelper.cpp (338 more files...) To: malteveerman, #amarok Cc: #amarok, yaohanchen, malteveerman, markey, progwolff, cochise, tbettler, Smar, ricktimmis, asturmlechner, schweingruber
