From 249549203578b584c538fb6dca3ab61ff0d985c4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 1 Jul 2013 12:54:42 +0200 Subject: [PATCH] Cleanup Playlist.h --- src/libtomahawk/Playlist.cpp | 126 ++++++++++++++++++ src/libtomahawk/Playlist.h | 66 +++++---- src/libtomahawk/Query.cpp | 6 +- .../spotify/SpotifyPlaylistUpdater.cpp | 5 +- .../DatabaseCommand_LoadPlaylistEntries.h | 8 +- .../DatabaseCommand_SetPlaylistRevision.cpp | 1 + src/libtomahawk/database/DatabaseImpl.cpp | 15 ++- src/libtomahawk/database/FuzzyIndex.cpp | 1 + src/libtomahawk/network/StreamConnection.cpp | 1 + src/libtomahawk/utils/JspfLoader.cpp | 15 ++- src/libtomahawk/utils/XspfGenerator.cpp | 11 +- src/libtomahawk/utils/XspfLoader.cpp | 9 +- .../widgets/RecentlyPlayedPlaylistsModel.cpp | 6 +- src/tomahawk/SocialWidget.cpp | 7 +- src/tomahawk/TomahawkTrayIcon.cpp | 14 +- 15 files changed, 219 insertions(+), 72 deletions(-) diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp index 5d0ae1840..9255949d9 100644 --- a/src/libtomahawk/Playlist.cpp +++ b/src/libtomahawk/Playlist.cpp @@ -783,3 +783,129 @@ Playlist::playlistInterface() return m_playlistInterface; } + + +QString +Playlist::currentrevision() const +{ + return m_currentrevision; +} + + +QString +Playlist::title() const +{ + return m_title; +} + + +QString +Playlist::info() const +{ + return m_info; +} + + +QString +Playlist::creator() const +{ + return m_creator; +} + + +QString +Playlist::guid() const +{ + return m_guid; +} + + +bool +Playlist::shared() const +{ + return m_shared; +} + + +unsigned int +Playlist::lastmodified() const +{ + return m_lastmodified; +} + + +uint +Playlist::createdOn() const +{ + return m_createdOn; +} + + +bool +Playlist::busy() const +{ + return m_busy; +} + + +bool +Playlist::loaded() const +{ + return m_loaded; +} + + +const QList& +Playlist::entries() +{ + return m_entries; +} + + +void +Playlist::setCurrentrevision( const QString& s ) +{ + m_currentrevision = s; +} + + +void +Playlist::setInfo( const QString& s ) +{ + m_info = s; +} + + +void +Playlist::setCreator( const QString& s ) +{ + m_creator = s; +} + + +void +Playlist::setGuid( const QString& s ) +{ + m_guid = s; +} + + +void +Playlist::setShared( bool b ) +{ + m_shared = b; +} + + +void +Playlist::setCreatedOn( uint createdOn ) +{ + m_createdOn = createdOn; +} + + +QList +Playlist::updaters() const +{ + return m_updaters; +} diff --git a/src/libtomahawk/Playlist.h b/src/libtomahawk/Playlist.h index a800dd69a..8f69d154a 100644 --- a/src/libtomahawk/Playlist.h +++ b/src/libtomahawk/Playlist.h @@ -29,8 +29,6 @@ #include "Typedefs.h" #include "PlaylistEntry.h" -#include "PlaylistInterface.h" -#include "playlist/PlaylistUpdaterInterface.h" #include "Query.h" #include "DllMacro.h" @@ -113,31 +111,31 @@ public: virtual void loadRevision( const QString& rev = "" ); source_ptr author() const; - QString currentrevision() const { return m_currentrevision; } - QString title() const { return m_title; } - QString info() const { return m_info; } - QString creator() const { return m_creator; } - QString guid() const { return m_guid; } - bool shared() const { return m_shared; } - unsigned int lastmodified() const { return m_lastmodified; } - uint createdOn() const { return m_createdOn; } + QString currentrevision() const; + QString title() const; + QString info() const; + QString creator() const; + QString guid() const; + bool shared() const; + unsigned int lastmodified() const; + uint createdOn() const; - bool busy() const { return m_busy; } - bool loaded() const { return m_loaded; } + bool busy() const; + bool loaded() const; - const QList< plentry_ptr >& entries() { return m_entries; } + const QList< plentry_ptr >& entries(); // // these need to exist and be public for the json serialization stuff // you SHOULD NOT call them. They are used for an alternate CTOR method from json. // maybe friend QObjectHelper and make them private? explicit Playlist( const source_ptr& author ); - void setCurrentrevision( const QString& s ) { m_currentrevision = s; } - void setInfo( const QString& s ) { m_info = s; } - void setCreator( const QString& s ) { m_creator = s; } - void setGuid( const QString& s ) { m_guid = s; } - void setShared( bool b ) { m_shared = b; } - void setCreatedOn( uint createdOn ) { m_createdOn = createdOn; } + void setCurrentrevision( const QString& s ); + void setInfo( const QString& s ); + void setCreator( const QString& s ); + void setGuid( const QString& s ); + void setShared( bool b ); + void setCreatedOn( uint createdOn ); void setTitle( const QString& s ); // @@ -145,7 +143,7 @@ public: void addUpdater( PlaylistUpdaterInterface* updater ); void removeUpdater( PlaylistUpdaterInterface* updater ); - QList updaters() const { return m_updaters; } + QList updaters() const; /** * Some updaters might have custom deleters in order to perform more actions that require @@ -162,10 +160,14 @@ public: Tomahawk::playlistinterface_ptr playlistInterface(); signals: - /// emitted when the playlist revision changes (whenever the playlist changes) + /** + * emitted when the playlist revision changes (whenever the playlist changes) + */ void revisionLoaded( Tomahawk::PlaylistRevision ); - /// watch for this to see when newly created playlist is synced to DB (if you care) + /** + * watch for this to see when newly created playlist is synced to DB (if you care) + */ void created(); /// renamed etc. @@ -173,23 +175,29 @@ signals: void renamed( const QString& newTitle, const QString& oldTitle ); /** - * delete command is scheduled but not completed. Do not call remove() again once this - * is emitted. + * Delete command is scheduled but not completed. Do not call remove() again once this + * is emitted. */ void aboutToBeDeleted( const Tomahawk::playlist_ptr& pl ); /// was deleted, eh? void deleted( const Tomahawk::playlist_ptr& pl ); - /// Notification for tracks being inserted at a specific point - /// Contiguous range from startPosition + /** + * Notification for tracks being inserted at a specific point + * Contiguous range from startPosition + */ void tracksInserted( const QList< Tomahawk::plentry_ptr >& tracks, int startPosition ); - /// Notification for tracks being removed from playlist + /** + * Notification for tracks being removed from PlaylistModel + */ void tracksRemoved( const QList< Tomahawk::query_ptr >& tracks ); - /// Notification for tracks being moved in a playlist. List is of new tracks, and new position of first track - /// Contiguous range from startPosition + /** + * Notification for tracks being moved in a playlist. List is of new tracks, and new position of first track + * Contiguous range from startPosition + */ void tracksMoved( const QList< Tomahawk::plentry_ptr >& tracks, int startPosition ); public slots: diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 6fbb062d7..ece2835b1 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -19,8 +19,6 @@ #include "Query.h" -#include - #include "audio/AudioEngine.h" #include "collection/Collection.h" #include "database/Database.h" @@ -31,13 +29,15 @@ #include "database/DatabaseCommand_SocialAction.h" #include "database/DatabaseCommand_TrackStats.h" #include "resolvers/Resolver.h" +#include "utils/Logger.h" #include "Album.h" #include "Pipeline.h" #include "Result.h" #include "SourceList.h" -#include "utils/Logger.h" +#include +#include using namespace Tomahawk; diff --git a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp index 10934a06e..efbdc2ee9 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp +++ b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp @@ -21,11 +21,12 @@ #include "SpotifyPlaylistUpdater.h" #include "accounts/AccountManager.h" -#include "SpotifyAccount.h" #include "utils/TomahawkUtils.h" +#include "SpotifyAccount.h" +#include "Track.h" -#include #include +#include using namespace Tomahawk; using namespace Accounts; diff --git a/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h index eed131fe0..c2f86c53a 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h @@ -20,13 +20,13 @@ #ifndef DATABASECOMMAND_LOADPLAYLIST_H #define DATABASECOMMAND_LOADPLAYLIST_H -#include -#include - #include "DatabaseCommand.h" +#include "DllMacro.h" #include "Playlist.h" -#include "DllMacro.h" +#include +#include +#include class DLLEXPORT DatabaseCommand_LoadPlaylistEntries : public DatabaseCommand { diff --git a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp index 46969b719..4c10b93bd 100644 --- a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp @@ -25,6 +25,7 @@ #include "DatabaseImpl.h" #include "Source.h" #include "TomahawkSqlQuery.h" +#include "Track.h" #include #include diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 2fbe4c775..93718afc1 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -20,20 +20,21 @@ #include "DatabaseImpl.h" +#include #include +#include #include #include -#include -#include +#include #include "database/Database.h" -#include "FuzzyIndex.h" -#include "SourceList.h" -#include "Result.h" -#include "Artist.h" -#include "Album.h" #include "utils/TomahawkUtils.h" #include "utils/Logger.h" +#include "Album.h" +#include "Artist.h" +#include "FuzzyIndex.h" +#include "Result.h" +#include "SourceList.h" /* !!!! You need to manually generate Schema.sql.h when the schema changes: cd src/libtomahawk/database diff --git a/src/libtomahawk/database/FuzzyIndex.cpp b/src/libtomahawk/database/FuzzyIndex.cpp index 62e90b083..35ba457b2 100644 --- a/src/libtomahawk/database/FuzzyIndex.cpp +++ b/src/libtomahawk/database/FuzzyIndex.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/src/libtomahawk/network/StreamConnection.cpp b/src/libtomahawk/network/StreamConnection.cpp index b6fcec806..46b098904 100644 --- a/src/libtomahawk/network/StreamConnection.cpp +++ b/src/libtomahawk/network/StreamConnection.cpp @@ -36,6 +36,7 @@ #include #include +#include using namespace Tomahawk; diff --git a/src/libtomahawk/utils/JspfLoader.cpp b/src/libtomahawk/utils/JspfLoader.cpp index 444038180..cf4ad1f76 100644 --- a/src/libtomahawk/utils/JspfLoader.cpp +++ b/src/libtomahawk/utils/JspfLoader.cpp @@ -19,19 +19,20 @@ #include "JspfLoader.h" +#include "utils/Logger.h" +#include "utils/NetworkReply.h" +#include "utils/TomahawkUtils.h" + +#include "Playlist.h" +#include "SourceList.h" +#include "Track.h" + #include #include #include #include -#include "SourceList.h" -#include "Playlist.h" - -#include "utils/NetworkReply.h" -#include "utils/TomahawkUtils.h" -#include "utils/Logger.h" - using namespace Tomahawk; diff --git a/src/libtomahawk/utils/XspfGenerator.cpp b/src/libtomahawk/utils/XspfGenerator.cpp index ec48afe1f..89d474f45 100644 --- a/src/libtomahawk/utils/XspfGenerator.cpp +++ b/src/libtomahawk/utils/XspfGenerator.cpp @@ -19,15 +19,16 @@ #include "XspfGenerator.h" +#include "utils/Logger.h" +#include "Playlist.h" +#include "Query.h" +#include "Source.h" +#include "Track.h" + #include #include #include -#include "Playlist.h" -#include "Query.h" -#include "utils/Logger.h" -#include "Source.h" - using namespace Tomahawk; diff --git a/src/libtomahawk/utils/XspfLoader.cpp b/src/libtomahawk/utils/XspfLoader.cpp index 928f3a8c2..0d044373f 100644 --- a/src/libtomahawk/utils/XspfLoader.cpp +++ b/src/libtomahawk/utils/XspfLoader.cpp @@ -26,15 +26,16 @@ #include "jobview/ErrorStatusMessage.h" #endif -#include "SourceList.h" -#include "Playlist.h" #include "playlist/XspfUpdater.h" -#include "Pipeline.h" - #include "utils/NetworkReply.h" #include "utils/TomahawkUtils.h" #include "utils/Logger.h" +#include "Pipeline.h" +#include "Playlist.h" +#include "SourceList.h" +#include "Track.h" + #include using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp index c905c95a1..25d88e257 100644 --- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp +++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp @@ -25,9 +25,11 @@ #include "playlist/dynamic/DynamicPlaylist.h" #include "utils/Logger.h" -#include "TomahawkSettings.h" -#include "SourceList.h" #include "Playlist.h" +#include "PlaylistInterface.h" +#include "SourceList.h" +#include "TomahawkSettings.h" +#include "Track.h" using namespace Tomahawk; diff --git a/src/tomahawk/SocialWidget.cpp b/src/tomahawk/SocialWidget.cpp index a82b51f04..69ba8a77d 100644 --- a/src/tomahawk/SocialWidget.cpp +++ b/src/tomahawk/SocialWidget.cpp @@ -20,14 +20,15 @@ #include "SocialWidget.h" #include "ui_SocialWidget.h" -#include "GlobalActionManager.h" -#include "Source.h" - #include "utils/ImageRegistry.h" #include "utils/TomahawkStyle.h" #include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" +#include "GlobalActionManager.h" +#include "Source.h" +#include "Track.h" + #include #include #include diff --git a/src/tomahawk/TomahawkTrayIcon.cpp b/src/tomahawk/TomahawkTrayIcon.cpp index 84bc664fc..a5c378e91 100644 --- a/src/tomahawk/TomahawkTrayIcon.cpp +++ b/src/tomahawk/TomahawkTrayIcon.cpp @@ -19,17 +19,19 @@ #include "TomahawkTrayIcon.h" -#include "Artist.h" #include "audio/AudioEngine.h" -#include "TomahawkApp.h" -#include "TomahawkWindow.h" -#include "Query.h" -#include "Source.h" #include "collection/Collection.h" -#include "ActionCollection.h" #include "utils/Logger.h" #include "utils/TomahawkUtilsGui.h" +#include "ActionCollection.h" +#include "Artist.h" +#include "Query.h" +#include "Source.h" +#include "TomahawkApp.h" +#include "TomahawkWindow.h" +#include "Track.h" + #include TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )