diff --git a/src/audiocontrols.h b/src/audiocontrols.h index 7fc47eb92..dd99bfbf7 100644 --- a/src/audiocontrols.h +++ b/src/audiocontrols.h @@ -29,6 +29,7 @@ class QDropEvent; class QDragEnterEvent; class QDragMoveEvent; + namespace Ui { class AudioControls; diff --git a/src/libtomahawk/album.cpp b/src/libtomahawk/album.cpp index a3bafd563..1eb180686 100644 --- a/src/libtomahawk/album.cpp +++ b/src/libtomahawk/album.cpp @@ -18,9 +18,11 @@ #include "album.h" -#include "collection.h" +#include "artist.h" #include "database/database.h" +#include "database/databaseimpl.h" #include "database/databasecommand_alltracks.h" +#include "query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/album.h b/src/libtomahawk/album.h index 325d7fc57..4b62cc4dc 100644 --- a/src/libtomahawk/album.h +++ b/src/libtomahawk/album.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -23,10 +23,7 @@ #include #include "typedefs.h" -#include "artist.h" -#include "collection.h" #include "playlistinterface.h" - #include "dllmacro.h" namespace Tomahawk @@ -71,7 +68,7 @@ signals: void tracksAdded( const QList& tracks ); void trackCountChanged( unsigned int tracks ); void sourceTrackCountChanged( unsigned int tracks ); - + void nextTrackReady(); private slots: diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp index ce0c43ab6..00b6a14c6 100644 --- a/src/libtomahawk/artist.cpp +++ b/src/libtomahawk/artist.cpp @@ -20,7 +20,9 @@ #include "collection.h" #include "database/database.h" +#include "database/databaseimpl.h" #include "database/databasecommand_alltracks.h" +#include "query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/artist.h b/src/libtomahawk/artist.h index ba0b47dd2..afd1e40fd 100644 --- a/src/libtomahawk/artist.h +++ b/src/libtomahawk/artist.h @@ -23,9 +23,7 @@ #include #include "typedefs.h" - #include "playlistinterface.h" - #include "dllmacro.h" namespace Tomahawk diff --git a/src/libtomahawk/collection.cpp b/src/libtomahawk/collection.cpp index 1533e29f5..c5aadf495 100644 --- a/src/libtomahawk/collection.cpp +++ b/src/libtomahawk/collection.cpp @@ -21,8 +21,7 @@ #include #include -#include "dynamic/DynamicPlaylist.h" -#include "playlist.h" +#include "source.h" #include "utils/logger.h" diff --git a/src/libtomahawk/collection.h b/src/libtomahawk/collection.h index f916e8b10..0a1e1b8a6 100644 --- a/src/libtomahawk/collection.h +++ b/src/libtomahawk/collection.h @@ -31,10 +31,9 @@ #include #include +#include "typedefs.h" #include "functimeout.h" #include "playlist.h" -#include "source.h" -#include "typedefs.h" #include "playlist/dynamic/DynamicPlaylist.h" #include "dllmacro.h" diff --git a/src/libtomahawk/context/ContextPage.cpp b/src/libtomahawk/context/ContextPage.cpp index 0571943af..2f4db083e 100644 --- a/src/libtomahawk/context/ContextPage.cpp +++ b/src/libtomahawk/context/ContextPage.cpp @@ -20,6 +20,9 @@ #include +#include "playlistinterface.h" +#include "utils/stylehelper.h" + using namespace Tomahawk; diff --git a/src/libtomahawk/context/ContextPage.h b/src/libtomahawk/context/ContextPage.h index 83bae8902..c7e0e5449 100644 --- a/src/libtomahawk/context/ContextPage.h +++ b/src/libtomahawk/context/ContextPage.h @@ -24,13 +24,13 @@ #include #include "typedefs.h" -#include "playlistinterface.h" -#include "utils/stylehelper.h" #include "utils/tomahawkutils.h" #include "dllmacro.h" #include +class PlaylistInterface; + namespace Tomahawk { diff --git a/src/libtomahawk/context/ContextWidget.cpp b/src/libtomahawk/context/ContextWidget.cpp index 452c99064..3e3eb1b30 100644 --- a/src/libtomahawk/context/ContextWidget.cpp +++ b/src/libtomahawk/context/ContextWidget.cpp @@ -32,6 +32,8 @@ #include "playlist/artistview.h" #include "playlist/treemodel.h" +#include "utils/stylehelper.h" + #define ANIMATION_TIME 450 #define SLIDE_TIME 350 diff --git a/src/libtomahawk/contextmenu.h b/src/libtomahawk/contextmenu.h index 16a681f75..ea0b776d3 100644 --- a/src/libtomahawk/contextmenu.h +++ b/src/libtomahawk/contextmenu.h @@ -23,8 +23,6 @@ #include #include "typedefs.h" -#include "album.h" -#include "artist.h" #include "dllmacro.h" namespace Tomahawk diff --git a/src/libtomahawk/database/database.cpp b/src/libtomahawk/database/database.cpp index 3ab6eaeae..f7f26bb4b 100644 --- a/src/libtomahawk/database/database.cpp +++ b/src/libtomahawk/database/database.cpp @@ -18,6 +18,9 @@ #include "database.h" +#include "databasecommand.h" +#include "databaseimpl.h" +#include "databaseworker.h" #include "utils/logger.h" #define DEFAULT_WORKER_THREADS 4 diff --git a/src/libtomahawk/database/database.h b/src/libtomahawk/database/database.h index c326b6284..323a27527 100644 --- a/src/libtomahawk/database/database.h +++ b/src/libtomahawk/database/database.h @@ -22,12 +22,15 @@ #include #include -#include "database/databaseimpl.h" -#include "database/databasecommand.h" -#include "database/databaseworker.h" +#include "artist.h" +#include "album.h" #include "dllmacro.h" +class DatabaseCommand; +class DatabaseImpl; +class DatabaseWorker; + /* This class is really a firewall/pimpl - the public functions of LibraryImpl are the ones that operate on the database, without any locks. diff --git a/src/libtomahawk/database/databasecommand.h b/src/libtomahawk/database/databasecommand.h index d7cc6683e..55fb8bb0d 100644 --- a/src/libtomahawk/database/databasecommand.h +++ b/src/libtomahawk/database/databasecommand.h @@ -107,6 +107,4 @@ private: Q_DECLARE_METATYPE( DatabaseCommand ) -#include "source.h" - #endif // DATABASECOMMAND_H diff --git a/src/libtomahawk/database/databasecommand_addclientauth.cpp b/src/libtomahawk/database/databasecommand_addclientauth.cpp index 4b99a03cd..094d4190b 100644 --- a/src/libtomahawk/database/databasecommand_addclientauth.cpp +++ b/src/libtomahawk/database/databasecommand_addclientauth.cpp @@ -18,6 +18,8 @@ #include "databasecommand_addclientauth.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_addclientauth.h b/src/libtomahawk/database/databasecommand_addclientauth.h index b562ef65a..62a8e36ef 100644 --- a/src/libtomahawk/database/databasecommand_addclientauth.h +++ b/src/libtomahawk/database/databasecommand_addclientauth.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -19,12 +19,13 @@ #ifndef DATABASECOMMAND_ADDCLIENTAUTH_H #define DATABASECOMMAND_ADDCLIENTAUTH_H -#include "databaseimpl.h" #include "databasecommand.h" #include "dllmacro.h" #include +class DatabaseImpl; + class DLLEXPORT DatabaseCommand_AddClientAuth : public DatabaseCommand { Q_OBJECT @@ -39,7 +40,7 @@ public: virtual void exec( DatabaseImpl* lib ); virtual bool doesMutates() const { return true; } - + private: QString m_clientToken, m_website, m_name, m_userAgent; }; diff --git a/src/libtomahawk/database/databasecommand_addfiles.cpp b/src/libtomahawk/database/databasecommand_addfiles.cpp index 262189536..d8d1ae2d4 100644 --- a/src/libtomahawk/database/databasecommand_addfiles.cpp +++ b/src/libtomahawk/database/databasecommand_addfiles.cpp @@ -26,7 +26,8 @@ #include "database/database.h" #include "databasecommand_collectionstats.h" #include "databaseimpl.h" -#include "network/controlconnection.h" +#include "network/dbsyncconnection.h" +#include "network/servent.h" #include "sourcelist.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_addsource.h b/src/libtomahawk/database/databasecommand_addsource.h index 375467ea1..89cf77677 100644 --- a/src/libtomahawk/database/databasecommand_addsource.h +++ b/src/libtomahawk/database/databasecommand_addsource.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -35,6 +35,7 @@ public: virtual void exec( DatabaseImpl* lib ); virtual bool doesMutates() const { return true; } virtual QString commandname() const { return "addsource"; } + signals: void done( unsigned int, const QString& ); diff --git a/src/libtomahawk/database/databasecommand_allalbums.cpp b/src/libtomahawk/database/databasecommand_allalbums.cpp index ee31bf22c..904cf315f 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.cpp +++ b/src/libtomahawk/database/databasecommand_allalbums.cpp @@ -20,7 +20,9 @@ #include +#include "artist.h" #include "databaseimpl.h" +#include "source.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_allalbums.h b/src/libtomahawk/database/databasecommand_allalbums.h index 0f077628c..cc6dfb473 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.h +++ b/src/libtomahawk/database/databasecommand_allalbums.h @@ -22,10 +22,9 @@ #include #include +#include "typedefs.h" #include "databasecommand.h" #include "album.h" -#include "collection.h" -#include "typedefs.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_allartists.cpp b/src/libtomahawk/database/databasecommand_allartists.cpp index 1e12574bc..fc3887e28 100644 --- a/src/libtomahawk/database/databasecommand_allartists.cpp +++ b/src/libtomahawk/database/databasecommand_allartists.cpp @@ -20,7 +20,9 @@ #include +#include "artist.h" #include "databaseimpl.h" +#include "source.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_allartists.h b/src/libtomahawk/database/databasecommand_allartists.h index 8abf29a46..3a80791e8 100644 --- a/src/libtomahawk/database/databasecommand_allartists.h +++ b/src/libtomahawk/database/databasecommand_allartists.h @@ -22,10 +22,8 @@ #include #include -#include "databasecommand.h" -#include "album.h" -#include "collection.h" #include "typedefs.h" +#include "databasecommand.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_alltracks.h b/src/libtomahawk/database/databasecommand_alltracks.h index 335c11585..89bd31874 100644 --- a/src/libtomahawk/database/databasecommand_alltracks.h +++ b/src/libtomahawk/database/databasecommand_alltracks.h @@ -23,7 +23,6 @@ #include #include "databasecommand.h" -#include "album.h" #include "collection.h" #include "typedefs.h" diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp b/src/libtomahawk/database/databasecommand_clientauthvalid.cpp index 97e783838..f077f8459 100644 --- a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp +++ b/src/libtomahawk/database/databasecommand_clientauthvalid.cpp @@ -18,6 +18,8 @@ #include "databasecommand_clientauthvalid.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.h b/src/libtomahawk/database/databasecommand_clientauthvalid.h index 94191200e..890ee43c1 100644 --- a/src/libtomahawk/database/databasecommand_clientauthvalid.h +++ b/src/libtomahawk/database/databasecommand_clientauthvalid.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -19,7 +19,6 @@ #ifndef DATABASECOMMAND_CLIENTAUTHVALID_H #define DATABASECOMMAND_CLIENTAUTHVALID_H -#include "databaseimpl.h" #include "databasecommand.h" #include "dllmacro.h" @@ -39,11 +38,11 @@ public: virtual void exec( DatabaseImpl* lib ); virtual bool doesMutates() const { return false; } - + signals: // if auth is invalid name is empty void authValid( const QString& clientToken, const QString& name, bool valid ); - + private: QString m_clientToken; }; diff --git a/src/libtomahawk/database/databasecommand_collectionstats.cpp b/src/libtomahawk/database/databasecommand_collectionstats.cpp index 4138bc58c..cd0d8415e 100644 --- a/src/libtomahawk/database/databasecommand_collectionstats.cpp +++ b/src/libtomahawk/database/databasecommand_collectionstats.cpp @@ -19,6 +19,7 @@ #include "databasecommand_collectionstats.h" #include "databaseimpl.h" +#include "source.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_collectionstats.h b/src/libtomahawk/database/databasecommand_collectionstats.h index 58b55aefc..659eb558d 100644 --- a/src/libtomahawk/database/databasecommand_collectionstats.h +++ b/src/libtomahawk/database/databasecommand_collectionstats.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -22,7 +22,6 @@ #include #include "databasecommand.h" -#include "source.h" #include "typedefs.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp index ebf79af55..e90b48713 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp @@ -21,12 +21,15 @@ #include #include +#include "databaseimpl.h" +#include "tomahawksqlquery.h" #include "dynamic/DynamicPlaylist.h" #include "dynamic/DynamicControl.h" #include "dynamic/GeneratorInterface.h" -#include "network/servent.h" +#include "source.h" #include "viewmanager.h" +#include "network/servent.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h b/src/libtomahawk/database/databasecommand_createdynamicplaylist.h index f0ad2369d..51ec3ae4b 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h +++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.h @@ -19,10 +19,8 @@ #ifndef DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H #define DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H -#include "databaseimpl.h" -#include "databasecommand_createplaylist.h" -#include "dynamic/DynamicPlaylist.h" #include "typedefs.h" +#include "databasecommand_createplaylist.h" /** * Create a new dynamic playlist in the database, based on an existing playlist. @@ -48,7 +46,6 @@ public: virtual bool loggable() const { return m_autoLoad; } - QVariant playlistV() const { if( m_v.isNull() ) diff --git a/src/libtomahawk/database/databasecommand_createplaylist.cpp b/src/libtomahawk/database/databasecommand_createplaylist.cpp index 36e2ceb5c..38fae2589 100644 --- a/src/libtomahawk/database/databasecommand_createplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_createplaylist.cpp @@ -20,8 +20,11 @@ #include -#include "network/servent.h" +#include "source.h" #include "viewmanager.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" +#include "network/servent.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_createplaylist.h b/src/libtomahawk/database/databasecommand_createplaylist.h index a6fe0c437..02d38a1eb 100644 --- a/src/libtomahawk/database/databasecommand_createplaylist.h +++ b/src/libtomahawk/database/databasecommand_createplaylist.h @@ -19,10 +19,9 @@ #ifndef DATABASECOMMAND_CREATEPLAYLIST_H #define DATABASECOMMAND_CREATEPLAYLIST_H -#include "databaseimpl.h" -#include "databasecommandloggable.h" -#include "playlist.h" #include "typedefs.h" +#include "databasecommandloggable.h" +#include "qjson/qobjecthelper.h" #include "dllmacro.h" @@ -62,6 +61,7 @@ protected: void setPlaylist( const Tomahawk::playlist_ptr& playlist ) { m_playlist = playlist; } QVariant m_v; + private: Tomahawk::playlist_ptr m_playlist; bool m_report; // call Playlist::reportCreated? diff --git a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h b/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h index be0ba5df1..fab4f9169 100644 --- a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h +++ b/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -19,27 +19,25 @@ #ifndef DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H #define DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H -#include "databaseimpl.h" #include "databasecommand_deleteplaylist.h" -#include "source.h" #include "typedefs.h" class DatabaseCommand_DeleteDynamicPlaylist : public DatabaseCommand_DeletePlaylist { - Q_OBJECT + Q_OBJECT public: explicit DatabaseCommand_DeleteDynamicPlaylist( QObject* parent = 0 ) : DatabaseCommand_DeletePlaylist( parent ) {} - + explicit DatabaseCommand_DeleteDynamicPlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid ); - + QString commandname() const { return "deletedynamicplaylist"; } - + virtual void exec( DatabaseImpl* lib ); virtual void postCommitHook(); virtual bool doesMutates() const { return true; } - + }; #endif // DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp index 62b177c31..e881c07c9 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.cpp +++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp @@ -23,10 +23,11 @@ #include "artist.h" #include "album.h" #include "collection.h" +#include "source.h" #include "database/database.h" #include "databasecommand_collectionstats.h" #include "databaseimpl.h" -#include "network/controlconnection.h" +#include "network/servent.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_deletefiles.h b/src/libtomahawk/database/databasecommand_deletefiles.h index 36b8d34b8..16a25c1e2 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.h +++ b/src/libtomahawk/database/databasecommand_deletefiles.h @@ -25,7 +25,6 @@ #include "database/databasecommandloggable.h" #include "typedefs.h" -#include "query.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.h b/src/libtomahawk/database/databasecommand_dirmtimes.h index 1b7d6b81b..0224cc39f 100644 --- a/src/libtomahawk/database/databasecommand_dirmtimes.h +++ b/src/libtomahawk/database/databasecommand_dirmtimes.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include #include +#include #include #include "databasecommand.h" @@ -37,7 +38,7 @@ public: explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 ) : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false ) {} - + explicit DatabaseCommand_DirMtimes( const QStringList& prefixes, QObject* parent = 0 ) : DatabaseCommand( parent ), m_prefixes( prefixes ), m_update( false ) {} @@ -57,7 +58,7 @@ public slots: private: void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap &mtimes ); - + void execSelect( DatabaseImpl* dbi ); void execUpdate( DatabaseImpl* dbi ); QString m_prefix; diff --git a/src/libtomahawk/database/databasecommand_filemtimes.h b/src/libtomahawk/database/databasecommand_filemtimes.h index dd9b71020..7322620cf 100644 --- a/src/libtomahawk/database/databasecommand_filemtimes.h +++ b/src/libtomahawk/database/databasecommand_filemtimes.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -22,6 +22,7 @@ #include #include #include +#include #include "databasecommand.h" @@ -37,7 +38,7 @@ public: explicit DatabaseCommand_FileMtimes( const QString& prefix = QString(), QObject* parent = 0 ) : DatabaseCommand( parent ), m_prefix( prefix ) {} - + explicit DatabaseCommand_FileMtimes( const QStringList& prefixes, QObject* parent = 0 ) : DatabaseCommand( parent ), m_prefixes( prefixes ) {} diff --git a/src/libtomahawk/database/databasecommand_genericselect.h b/src/libtomahawk/database/databasecommand_genericselect.h index da2989543..1a4f4d2f3 100644 --- a/src/libtomahawk/database/databasecommand_genericselect.h +++ b/src/libtomahawk/database/databasecommand_genericselect.h @@ -22,7 +22,6 @@ #include #include "databasecommand.h" -#include "source.h" #include "typedefs.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_importplaylist.h b/src/libtomahawk/database/databasecommand_importplaylist.h index 90629f1ba..918e422df 100644 --- a/src/libtomahawk/database/databasecommand_importplaylist.h +++ b/src/libtomahawk/database/databasecommand_importplaylist.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -23,7 +23,6 @@ #include #include "databasecommand.h" -#include "tomahawk/source.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp b/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp index 3eda9d501..2c561245f 100644 --- a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp +++ b/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp @@ -20,8 +20,9 @@ #include -#include "dynamic/DynamicPlaylist.h" #include "databaseimpl.h" +#include "source.h" +#include "dynamic/DynamicPlaylist.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp b/src/libtomahawk/database/databasecommand_loadallplaylists.cpp index b338f3444..90f8cac7c 100644 --- a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp +++ b/src/libtomahawk/database/databasecommand_loadallplaylists.cpp @@ -22,6 +22,7 @@ #include #include "playlist.h" +#include "source.h" #include "databaseimpl.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.h b/src/libtomahawk/database/databasecommand_loadallplaylists.h index 831a54044..59426dd16 100644 --- a/src/libtomahawk/database/databasecommand_loadallplaylists.h +++ b/src/libtomahawk/database/databasecommand_loadallplaylists.h @@ -23,8 +23,8 @@ #include #include -#include "databasecommand.h" #include "typedefs.h" +#include "databasecommand.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h b/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h index ed82e487e..330d022bf 100644 --- a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h +++ b/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H #define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H -#include "libtomahawk/database/databasecommand.h" +#include "databasecommand.h" #include "databasecommand_loadallplaylists.h" /** diff --git a/src/libtomahawk/database/databasecommand_loadallstations.cpp b/src/libtomahawk/database/databasecommand_loadallstations.cpp index 2d627dc66..25ba7380d 100644 --- a/src/libtomahawk/database/databasecommand_loadallstations.cpp +++ b/src/libtomahawk/database/databasecommand_loadallstations.cpp @@ -20,8 +20,9 @@ #include -#include "dynamic/DynamicPlaylist.h" #include "databaseimpl.h" +#include "source.h" +#include "dynamic/DynamicPlaylist.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp index 729408cbd..51acec2d4 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp @@ -20,8 +20,9 @@ #include -#include "dynamic/DynamicPlaylist.h" #include "databaseimpl.h" +#include "source.h" +#include "dynamic/DynamicPlaylist.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp index d76399e9a..e38f05af2 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp @@ -25,7 +25,8 @@ #include "tomahawksqlquery.h" #include "dynamic/DynamicControl.h" #include "dynamic/GeneratorInterface.h" -#include +#include "dynamic/GeneratorFactory.h" +#include "qjson/parser.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h index ab6571c8b..2ee5e346a 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h @@ -26,7 +26,6 @@ #include "databasecommand.h" #include "databasecommand_loadplaylistentries.h" #include "playlist.h" -#include "dynamic/DynamicControl.h" class DatabaseCommand_LoadDynamicPlaylistEntries : public DatabaseCommand_LoadPlaylistEntries { diff --git a/src/libtomahawk/database/databasecommand_loadops.cpp b/src/libtomahawk/database/databasecommand_loadops.cpp index fbdc0b7bd..efa95c095 100644 --- a/src/libtomahawk/database/databasecommand_loadops.cpp +++ b/src/libtomahawk/database/databasecommand_loadops.cpp @@ -18,6 +18,9 @@ #include "databasecommand_loadops.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" +#include "source.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_loadops.h b/src/libtomahawk/database/databasecommand_loadops.h index 06c8cb56f..f86e0fcd9 100644 --- a/src/libtomahawk/database/databasecommand_loadops.h +++ b/src/libtomahawk/database/databasecommand_loadops.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -21,7 +21,6 @@ #include "typedefs.h" #include "databasecommand.h" -#include "databaseimpl.h" #include "op.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp b/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp index 4e6d5a0d4..96fc0ec22 100644 --- a/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp +++ b/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp @@ -21,6 +21,8 @@ #include #include "databaseimpl.h" +#include "query.h" +#include "qjson/parser.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadplaylistentries.h b/src/libtomahawk/database/databasecommand_loadplaylistentries.h index 255c9a017..2a3ade540 100644 --- a/src/libtomahawk/database/databasecommand_loadplaylistentries.h +++ b/src/libtomahawk/database/databasecommand_loadplaylistentries.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -41,6 +41,7 @@ public: virtual QString commandname() const { return "loadplaylistentries"; } QString revisionGuid() const { return m_revguid; } + signals: void done( const QString& rev, const QList& orderedguid, @@ -51,12 +52,12 @@ signals: protected: void generateEntries( DatabaseImpl* dbi ); - + QStringList m_guids; QMap< QString, Tomahawk::plentry_ptr > m_entrymap; bool m_islatest; QStringList m_oldentries; - + private: QString m_revguid; }; diff --git a/src/libtomahawk/database/databasecommand_loadsocialactions.h b/src/libtomahawk/database/databasecommand_loadsocialactions.h index fddea0dfd..7a6ea5425 100644 --- a/src/libtomahawk/database/databasecommand_loadsocialactions.h +++ b/src/libtomahawk/database/databasecommand_loadsocialactions.h @@ -26,19 +26,18 @@ #include "sourcelist.h" #include "typedefs.h" #include "artist.h" -#include "result.h" #include "dllmacro.h" /** * \class DatabaseCommand_LoadSocialActions * \brief Database command used to load social actions from the database. - * + * * This Database command allows Tomahawk to load social actions from * the local database. The loaded social actions can be used to create * dynamic playlists, generate statistics and provide data to share with * friends on tomahawk. - * + * * \see DatabaseCommand_SocialAction */ class DLLEXPORT DatabaseCommand_LoadSocialActions : public DatabaseCommand @@ -48,20 +47,20 @@ Q_OBJECT public: /** * \brief Default constructor for DatabaseCommand_LoadSocialActions. - * + * * Constructs an empty database command for loading social actions. - */ + */ explicit DatabaseCommand_LoadSocialActions( QObject* parent = 0 ) : DatabaseCommand( parent ) {} - + /** * \brief Overloaded constructor for DatabaseCommand_LoadSocialAction. * \param result Pointer to a Tomahawk::Result. * \param parent Parent class. - * + * * Constructor which creates a new database command for loading all social actions. - */ + */ explicit DatabaseCommand_LoadSocialActions( Tomahawk::Result* result, QObject* parent = 0 ) : DatabaseCommand( parent ), m_result( result ) { @@ -69,7 +68,7 @@ public: setArtist( result->artist()->name() ); setTrack( result->track() ); } - + /** * \brief Returns the name of this database command. * \return QString containing the database command name 'loadsocialaction'. @@ -79,21 +78,21 @@ public: /** * \brief Executes the database command. * \param dbi Database instance. - * + * * This method prepares an sql query to load the social actions * from the database into a list of all social actions. - * + * * \see Result::setAllSocialActions() */ virtual void exec( DatabaseImpl* ); - + /** * \brief Returns the artist associated with this database command. * \return Name of the artist. * \see setArtist() */ QString artist() const { return m_artist; } - + /** * \brief Sets the artist name for this database command. * \param s QString containing the artist name. @@ -107,29 +106,29 @@ public: * \see setTrack() */ QString track() const { return m_track; } - + /** * \brief Sets the track name associated with this database command. * \param track QString containing the track name. * \see track() - */ + */ void setTrack( const QString& s ) { m_track = s; } - + signals: - + /** * \brief Emitted when the database command has finished the Query successfully - * + * * \param QList of all social actions * \see QList */ void done( QList< Tomahawk::SocialAction >& allSocialActions ); - + private: Tomahawk::Result* m_result; QString m_artist; QString m_track; - + }; #endif // DATABASECOMMAND_LOADSOCIALACTIONS_H diff --git a/src/libtomahawk/database/databasecommand_logplayback.h b/src/libtomahawk/database/databasecommand_logplayback.h index 0977a8091..7b9b2cf3c 100644 --- a/src/libtomahawk/database/databasecommand_logplayback.h +++ b/src/libtomahawk/database/databasecommand_logplayback.h @@ -25,9 +25,8 @@ #include "database/databasecommandloggable.h" #include "sourcelist.h" #include "typedefs.h" -#include "query.h" -#include "result.h" #include "artist.h" +#include "query.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_modifyplaylist.h b/src/libtomahawk/database/databasecommand_modifyplaylist.h index fd2f6e7d9..430f7401f 100644 --- a/src/libtomahawk/database/databasecommand_modifyplaylist.h +++ b/src/libtomahawk/database/databasecommand_modifyplaylist.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -22,9 +22,8 @@ #include #include +#include "typedefs.h" #include "databasecommand.h" -#include "source.h" -#include "playlist.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_playbackhistory.h b/src/libtomahawk/database/databasecommand_playbackhistory.h index 662e66ff2..5e5cbb530 100644 --- a/src/libtomahawk/database/databasecommand_playbackhistory.h +++ b/src/libtomahawk/database/databasecommand_playbackhistory.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -23,7 +23,6 @@ #include #include "databasecommand.h" -#include "source.h" #include "typedefs.h" #include "dllmacro.h" diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.cpp b/src/libtomahawk/database/databasecommand_renameplaylist.cpp index e7b6736a8..dc934ff9a 100644 --- a/src/libtomahawk/database/databasecommand_renameplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_renameplaylist.cpp @@ -20,8 +20,10 @@ #include -#include "network/servent.h" +#include "databaseimpl.h" #include "collection.h" +#include "source.h" +#include "network/servent.h" #include "utils/logger.h" using namespace Tomahawk; @@ -38,8 +40,6 @@ DatabaseCommand_RenamePlaylist::DatabaseCommand_RenamePlaylist( const source_ptr void DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib ) { - qDebug() << Q_FUNC_INFO; - TomahawkSqlQuery cre = lib->newquery(); QString sql = QString( "UPDATE playlist SET title = :title WHERE guid = :id AND source %1" ) @@ -58,13 +58,6 @@ DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib ) void DatabaseCommand_RenamePlaylist::postCommitHook() { - qDebug() << Q_FUNC_INFO << "..reporting.."; - if ( source().isNull() || source()->collection().isNull() ) - { - qDebug() << "Source has gone offline, not emitting to GUI."; - return; - } - playlist_ptr playlist = source()->collection()->playlist( m_playlistguid ); // fallback, check for auto and stations too if( playlist.isNull() ) diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.h b/src/libtomahawk/database/databasecommand_renameplaylist.h index 9b0015b70..7bb9b297e 100644 --- a/src/libtomahawk/database/databasecommand_renameplaylist.h +++ b/src/libtomahawk/database/databasecommand_renameplaylist.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -19,13 +19,13 @@ #ifndef DATABASECOMMAND_RENAMEPLAYLIST_H #define DATABASECOMMAND_RENAMEPLAYLIST_H -#include "databaseimpl.h" -#include "databasecommandloggable.h" -#include "source.h" #include "typedefs.h" +#include "databasecommandloggable.h" #include "dllmacro.h" +class DatabaseImpl; + class DLLEXPORT DatabaseCommand_RenamePlaylist : public DatabaseCommandLoggable { Q_OBJECT diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp index a29aacfe3..053ac7e06 100644 --- a/src/libtomahawk/database/databasecommand_resolve.cpp +++ b/src/libtomahawk/database/databasecommand_resolve.cpp @@ -18,6 +18,7 @@ #include "databasecommand_resolve.h" +#include "artist.h" #include "album.h" #include "sourcelist.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp index fdf9fb67b..b3e46f313 100644 --- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp +++ b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp @@ -20,9 +20,12 @@ #include +#include "source.h" +#include "databaseimpl.h" #include "tomahawksqlquery.h" #include "dynamic/DynamicPlaylist.h" #include "dynamic/DynamicControl.h" +#include "network/servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h index f40dbe4c6..c84348c92 100644 --- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h +++ b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h @@ -20,11 +20,7 @@ #define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H #include "databasecommand_setplaylistrevision.h" -#include "databaseimpl.h" -#include "collection.h" -#include "playlist.h" #include "dynamic/GeneratorInterface.h" -#include "network/servent.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp index 0f104fa15..ef49d2b69 100644 --- a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp +++ b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp @@ -20,6 +20,8 @@ #include +#include "source.h" +#include "databaseimpl.h" #include "tomahawksqlquery.h" #include "network/servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.h b/src/libtomahawk/database/databasecommand_setplaylistrevision.h index e71c1f7e1..431867be2 100644 --- a/src/libtomahawk/database/databasecommand_setplaylistrevision.h +++ b/src/libtomahawk/database/databasecommand_setplaylistrevision.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -20,9 +20,8 @@ #define DATABASECOMMAND_SETPLAYLISTREVISION_H #include "databasecommandloggable.h" -#include "databaseimpl.h" -#include "collection.h" #include "playlist.h" +#include "qjson/qobjecthelper.h" #include "dllmacro.h" @@ -99,7 +98,7 @@ protected: QString m_playlistguid; QString m_newrev, m_oldrev; QMap m_addedmap; - + QString m_currentRevision; private: QVariantList m_orderedguids; diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.cpp b/src/libtomahawk/database/databasecommand_sourceoffline.cpp index 6adfdabfe..4b161272c 100644 --- a/src/libtomahawk/database/databasecommand_sourceoffline.cpp +++ b/src/libtomahawk/database/databasecommand_sourceoffline.cpp @@ -18,6 +18,8 @@ #include "databasecommand_sourceoffline.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.h b/src/libtomahawk/database/databasecommand_sourceoffline.h index 302b349ec..5d8a09289 100644 --- a/src/libtomahawk/database/databasecommand_sourceoffline.h +++ b/src/libtomahawk/database/databasecommand_sourceoffline.h @@ -20,8 +20,6 @@ #define DATABASECOMMAND_SOURCEOFFLINE_H #include "databasecommand.h" -#include "databaseimpl.h" - #include "dllmacro.h" class DLLEXPORT DatabaseCommand_SourceOffline : public DatabaseCommand diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp index bac5d2994..dc5c1fb29 100644 --- a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp +++ b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp @@ -18,6 +18,8 @@ #include "databasecommand_updatesearchindex.h" +#include "databaseimpl.h" +#include "tomahawksqlquery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.h b/src/libtomahawk/database/databasecommand_updatesearchindex.h index 8a0fc95a8..91c2203d1 100644 --- a/src/libtomahawk/database/databasecommand_updatesearchindex.h +++ b/src/libtomahawk/database/databasecommand_updatesearchindex.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -20,8 +20,6 @@ #define DATABASECOMMAND_UPDATESEARCHINDEX_H #include "databasecommand.h" -#include "databaseimpl.h" - #include "dllmacro.h" class DLLEXPORT DatabaseCommand_UpdateSearchIndex : public DatabaseCommand @@ -39,7 +37,7 @@ signals: private: void indexTable( DatabaseImpl* db, const QString& table ); - + QString table; }; diff --git a/src/libtomahawk/database/databasecommandloggable.h b/src/libtomahawk/database/databasecommandloggable.h index be400621b..41e5f35d2 100644 --- a/src/libtomahawk/database/databasecommandloggable.h +++ b/src/libtomahawk/database/databasecommandloggable.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -20,7 +20,6 @@ #define DATABASECOMMANDLOGGABLE_H #include "database/databasecommand.h" - #include "dllmacro.h" /// A Database Command that will be added to the oplog and sent over the network diff --git a/src/libtomahawk/database/databaseresolver.cpp b/src/libtomahawk/database/databaseresolver.cpp index 2ae56e3ce..99e416a07 100644 --- a/src/libtomahawk/database/databaseresolver.cpp +++ b/src/libtomahawk/database/databaseresolver.cpp @@ -18,6 +18,7 @@ #include "databaseresolver.h" +#include "pipeline.h" #include "network/servent.h" #include "database/database.h" #include "database/databasecommand_resolve.h" diff --git a/src/libtomahawk/database/databaseresolver.h b/src/libtomahawk/database/databaseresolver.h index d1ac4845c..7d829029e 100644 --- a/src/libtomahawk/database/databaseresolver.h +++ b/src/libtomahawk/database/databaseresolver.h @@ -19,8 +19,6 @@ #ifndef DATABASERESOLVER_H #define DATABASERESOLVER_H -#include "pipeline.h" - #include "resolver.h" #include "result.h" diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/databaseworker.cpp index 9f5e2d8aa..4b8b3476e 100644 --- a/src/libtomahawk/database/databaseworker.cpp +++ b/src/libtomahawk/database/databaseworker.cpp @@ -22,8 +22,11 @@ #include #include -#include "database/database.h" -#include "database/databasecommandloggable.h" +#include "source.h" +#include "database.h" +#include "databaseimpl.h" +#include "databasecommandloggable.h" +#include "tomahawksqlquery.h" #include "utils/logger.h" #ifndef QT_NO_DEBUG diff --git a/src/libtomahawk/database/databaseworker.h b/src/libtomahawk/database/databaseworker.h index f4bfa2c70..9eae47c44 100644 --- a/src/libtomahawk/database/databaseworker.h +++ b/src/libtomahawk/database/databaseworker.h @@ -30,7 +30,6 @@ #include #include "databasecommand.h" -#include "databaseimpl.h" class Database; class DatabaseCommandLoggable; diff --git a/src/libtomahawk/dropjob.cpp b/src/libtomahawk/dropjob.cpp index 467821e29..f284cefdd 100644 --- a/src/libtomahawk/dropjob.cpp +++ b/src/libtomahawk/dropjob.cpp @@ -21,6 +21,7 @@ #include "artist.h" #include "album.h" +#include "source.h" #include "utils/spotifyparser.h" #include "utils/rdioparser.h" diff --git a/src/libtomahawk/globalactionmanager.h b/src/libtomahawk/globalactionmanager.h index 148d6e72a..8b0854fe0 100644 --- a/src/libtomahawk/globalactionmanager.h +++ b/src/libtomahawk/globalactionmanager.h @@ -20,8 +20,8 @@ #ifndef GLOBALACTIONMANAGER_H #define GLOBALACTIONMANAGER_H -#include "playlist.h" #include "query.h" +#include "playlist.h" #include "playlist/dynamic/DynamicPlaylist.h" #include "dllmacro.h" diff --git a/src/libtomahawk/infobar/infobar.h b/src/libtomahawk/infobar/infobar.h index df4d738ab..0e6353600 100644 --- a/src/libtomahawk/infobar/infobar.h +++ b/src/libtomahawk/infobar/infobar.h @@ -22,7 +22,6 @@ #include #include "dllmacro.h" -#include "query.h" class QTimeLine; class QSearchField; diff --git a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h index e1461daec..0e70fc35a 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h @@ -25,8 +25,10 @@ #include class QNetworkReply; -namespace Echonest { -class Artist; + +namespace Echonest +{ + class Artist; } namespace Tomahawk diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h index 071196402..49d352b40 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h @@ -20,7 +20,6 @@ #include "infosystem/infosystem.h" #include "infosystem/infosystemworker.h" -#include "result.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h b/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h index 00add8b27..ab840e361 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h @@ -26,9 +26,11 @@ #include #include -namespace Tomahawk { +namespace Tomahawk +{ -namespace InfoSystem { +namespace InfoSystem +{ class MprisPlugin : public InfoPlugin { @@ -41,7 +43,7 @@ public: // MPRIS DBus Methods // org.mpris.MediaPlayer2 - + Q_PROPERTY(bool CanQuit READ canQuit) bool canQuit() const; @@ -159,7 +161,7 @@ signals: private: // Get Info - + // Push Info void audioStarted( const QVariant &input ); void audioFinished( const QVariant &input ); @@ -171,12 +173,10 @@ private: void notifyPropertyChanged( const QString& interface, const QString& propertyName ); QString m_playbackStatus; QTemporaryFile *m_coverTempFile; - }; }; - } #endif // MPRISPLUGIN_H diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h b/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h index d94cfc90e..1cf145794 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h @@ -14,6 +14,7 @@ #include #include + class QByteArray; template class QList; template class QMap; diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h b/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h index ac4895bc4..4d348e879 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h @@ -14,6 +14,7 @@ #include #include + class QByteArray; template class QList; template class QMap; diff --git a/src/libtomahawk/network/controlconnection.cpp b/src/libtomahawk/network/controlconnection.cpp index 582e71564..32220853a 100644 --- a/src/libtomahawk/network/controlconnection.cpp +++ b/src/libtomahawk/network/controlconnection.cpp @@ -23,7 +23,9 @@ #include "database/databasecommand_collectionstats.h" #include "dbsyncconnection.h" #include "sourcelist.h" -#include +#include "network/dbsyncconnection.h" +#include "network/servent.h" +#include "sip/SipHandler.h" #include "utils/logger.h" #define TCP_TIMEOUT 600 diff --git a/src/libtomahawk/network/controlconnection.h b/src/libtomahawk/network/controlconnection.h index f0f2b105b..42fb3a7f0 100644 --- a/src/libtomahawk/network/controlconnection.h +++ b/src/libtomahawk/network/controlconnection.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -26,13 +26,14 @@ #ifndef CONTROLCONNECTION_H #define CONTROLCONNECTION_H -#include "connection.h" -#include "network/servent.h" -#include "source.h" #include "typedefs.h" +#include "connection.h" #include "dllmacro.h" +class Servent; +class DBSyncConnection; + class DLLEXPORT ControlConnection : public Connection { Q_OBJECT @@ -52,8 +53,6 @@ protected: protected slots: virtual void handleMsg( msg_ptr msg ); -signals: - private slots: void dbSyncConnFinished( QObject* c ); void registerSource(); diff --git a/src/libtomahawk/network/msgprocessor.h b/src/libtomahawk/network/msgprocessor.h index b8dc7ef7d..29ca5c0fe 100644 --- a/src/libtomahawk/network/msgprocessor.h +++ b/src/libtomahawk/network/msgprocessor.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -31,7 +31,6 @@ #define MSGPROCESSOR_H #include -#include "msg.h" #include #include #include @@ -40,6 +39,8 @@ #include #include +#include "msg.h" + class MsgProcessor : public QObject { Q_OBJECT diff --git a/src/libtomahawk/network/streamconnection.cpp b/src/libtomahawk/network/streamconnection.cpp index 37035d488..d9baee950 100644 --- a/src/libtomahawk/network/streamconnection.cpp +++ b/src/libtomahawk/network/streamconnection.cpp @@ -24,6 +24,7 @@ #include "bufferiodevice.h" #include "network/controlconnection.h" +#include "network/servent.h" #include "database/databasecommand_loadfile.h" #include "database/database.h" #include "sourcelist.h" diff --git a/src/libtomahawk/network/streamconnection.h b/src/libtomahawk/network/streamconnection.h index 86f0f1e71..c117fe9f2 100644 --- a/src/libtomahawk/network/streamconnection.h +++ b/src/libtomahawk/network/streamconnection.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -56,7 +56,7 @@ public: const QSharedPointer& iodevice() { return m_iodev; } ControlConnection* controlConnection() const { return m_cc; } - Tomahawk::source_ptr source() const; + Tomahawk::source_ptr source() const; Tomahawk::result_ptr track() const { return m_result; } qint64 transferRate() const { return m_transferRate; } diff --git a/src/libtomahawk/pipeline.h b/src/libtomahawk/pipeline.h index ec0646cfc..a9c0ea3e3 100644 --- a/src/libtomahawk/pipeline.h +++ b/src/libtomahawk/pipeline.h @@ -27,15 +27,13 @@ #include "typedefs.h" #include "query.h" -#include "result.h" -#include "resolver.h" #include "dllmacro.h" namespace Tomahawk { - class Resolver; +class ExternalResolver; class DLLEXPORT Pipeline : public QObject { diff --git a/src/libtomahawk/playlist.h b/src/libtomahawk/playlist.h index e97da070b..e57d2da78 100644 --- a/src/libtomahawk/playlist.h +++ b/src/libtomahawk/playlist.h @@ -23,14 +23,13 @@ #include #include #include +#include -#include "query.h" #include "typedefs.h" - +#include "result.h" #include "playlistinterface.h" #include "dllmacro.h" -#include class DatabaseCommand_LoadAllPlaylists; class DatabaseCommand_LoadAllSortedPlaylists; @@ -78,7 +77,6 @@ public: source_ptr lastSource() const; void setLastSource( source_ptr s ); - private: QString m_guid; Tomahawk::query_ptr m_query; diff --git a/src/libtomahawk/playlist/albumitemdelegate.cpp b/src/libtomahawk/playlist/albumitemdelegate.cpp index 4c9347e3f..03e84c365 100644 --- a/src/libtomahawk/playlist/albumitemdelegate.cpp +++ b/src/libtomahawk/playlist/albumitemdelegate.cpp @@ -22,6 +22,7 @@ #include #include +#include "artist.h" #include "query.h" #include "result.h" diff --git a/src/libtomahawk/playlist/albummodel.cpp b/src/libtomahawk/playlist/albummodel.cpp index 897fabc9b..a1307ca98 100644 --- a/src/libtomahawk/playlist/albummodel.cpp +++ b/src/libtomahawk/playlist/albummodel.cpp @@ -22,8 +22,10 @@ #include #include +#include "artist.h" +#include "albumitem.h" +#include "source.h" #include "database/database.h" - #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albummodel.h b/src/libtomahawk/playlist/albummodel.h index 3fe33d715..596bf5f42 100644 --- a/src/libtomahawk/playlist/albummodel.h +++ b/src/libtomahawk/playlist/albummodel.h @@ -23,15 +23,13 @@ #include #include "album.h" -#include "collection.h" #include "playlistinterface.h" #include "database/databasecommand_allalbums.h" #include "infosystem/infosystem.h" -#include "albumitem.h" - #include "dllmacro.h" +class AlbumItem; class QMetaData; class DLLEXPORT AlbumModel : public QAbstractItemModel diff --git a/src/libtomahawk/playlist/albumproxymodel.cpp b/src/libtomahawk/playlist/albumproxymodel.cpp index 48f8581cb..ae5a32d73 100644 --- a/src/libtomahawk/playlist/albumproxymodel.cpp +++ b/src/libtomahawk/playlist/albumproxymodel.cpp @@ -20,6 +20,8 @@ #include +#include "artist.h" +#include "albumitem.h" #include "query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumview.cpp b/src/libtomahawk/playlist/albumview.cpp index 56257ace5..bf09641b3 100644 --- a/src/libtomahawk/playlist/albumview.cpp +++ b/src/libtomahawk/playlist/albumview.cpp @@ -24,9 +24,11 @@ #include #include "audio/audioengine.h" - #include "tomahawksettings.h" +#include "artist.h" +#include "albumitem.h" #include "albumitemdelegate.h" +#include "albummodel.h" #include "viewmanager.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumview.h b/src/libtomahawk/playlist/albumview.h index 7b2e766e5..52dfecee3 100644 --- a/src/libtomahawk/playlist/albumview.h +++ b/src/libtomahawk/playlist/albumview.h @@ -21,12 +21,13 @@ #include #include +#include -#include "albummodel.h" -#include "albumproxymodel.h" #include "viewpage.h" - #include "dllmacro.h" +#include "albumproxymodel.h" + +class AlbumModel; class DLLEXPORT AlbumView : public QListView, public Tomahawk::ViewPage { diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/artistview.cpp index c0903b2d7..1bce0ff4e 100644 --- a/src/libtomahawk/playlist/artistview.cpp +++ b/src/libtomahawk/playlist/artistview.cpp @@ -30,6 +30,7 @@ #include "tomahawksettings.h" #include "treeheader.h" #include "treeitemdelegate.h" +#include "treemodel.h" #include "viewmanager.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/artistview.h b/src/libtomahawk/playlist/artistview.h index 8432f0c42..756bb8960 100644 --- a/src/libtomahawk/playlist/artistview.h +++ b/src/libtomahawk/playlist/artistview.h @@ -19,11 +19,11 @@ #ifndef ARTISTVIEW_H #define ARTISTVIEW_H -#include #include +#include +#include #include "contextmenu.h" -#include "treemodel.h" #include "treeproxymodel.h" #include "viewpage.h" @@ -32,6 +32,7 @@ class TreeHeader; class LoadingSpinner; class OverlayWidget; +class TreeModel; class DLLEXPORT ArtistView : public QTreeView, public Tomahawk::ViewPage { diff --git a/src/libtomahawk/playlist/collectionflatmodel.h b/src/libtomahawk/playlist/collectionflatmodel.h index cc1d5c79e..7a6e4e54f 100644 --- a/src/libtomahawk/playlist/collectionflatmodel.h +++ b/src/libtomahawk/playlist/collectionflatmodel.h @@ -23,12 +23,10 @@ #include #include -#include "trackmodelitem.h" -#include "trackmodel.h" -#include "collection.h" -#include "query.h" #include "typedefs.h" -#include "playlist.h" +#include "trackmodel.h" +#include "query.h" +#include "source.h" #include "playlistinterface.h" #include "database/databasecommand_alltracks.h" diff --git a/src/libtomahawk/playlist/collectionview.cpp b/src/libtomahawk/playlist/collectionview.cpp index f87a33922..ebb66f2be 100644 --- a/src/libtomahawk/playlist/collectionview.cpp +++ b/src/libtomahawk/playlist/collectionview.cpp @@ -21,7 +21,8 @@ #include #include -#include "playlist/collectionproxymodel.h" +#include "collectionproxymodel.h" +#include "trackmodel.h" #include "widgets/overlaywidget.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/collectionview.h b/src/libtomahawk/playlist/collectionview.h index a3893b270..3109c77d7 100644 --- a/src/libtomahawk/playlist/collectionview.h +++ b/src/libtomahawk/playlist/collectionview.h @@ -20,12 +20,13 @@ #define COLLECTIONVIEW_H #include "trackproxymodel.h" -#include "trackmodel.h" #include "trackview.h" #include "viewpage.h" #include "dllmacro.h" +class TrackModel; + class DLLEXPORT CollectionView : public TrackView, public Tomahawk::ViewPage { Q_OBJECT diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp index 436b47e6b..d0544e788 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp @@ -17,9 +17,13 @@ */ #include "playlist/dynamic/DynamicModel.h" + #include "GeneratorInterface.h" +#include "pipeline.h" +#include "query.h" +#include "source.h" #include "audio/audioengine.h" -#include + #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h index 655bef6f8..871533871 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h @@ -23,8 +23,8 @@ #include #include -#include "playlist.h" #include "typedefs.h" +#include "playlist.h" #include "playlist/dynamic/DynamicControl.h" #include "playlist/dynamic/DynamicPlaylistRevision.h" diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h index d393ede3d..31fc0d98e 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h +++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h @@ -20,7 +20,6 @@ #define COLLAPSIBLE_CONTROLS_H #include "typedefs.h" -#include "source.h" #include @@ -30,6 +29,7 @@ class QTimeLine; class QToolButton; class ElidedLabel; class QStackedLayout; + namespace Tomahawk { diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index 5e1b4e0fa..da2208ef0 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -32,6 +32,7 @@ #include "dynamic/GeneratorInterface.h" #include "dynamic/GeneratorFactory.h" #include "pipeline.h" +#include "source.h" #include "audio/audioengine.h" #include "ReadOrWriteWidget.h" #include "CollapsibleControls.h" diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/playlistitemdelegate.cpp index 070bab047..f38f2d89d 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/playlistitemdelegate.cpp @@ -27,6 +27,7 @@ #include "source.h" #include "sourcelist.h" +#include "trackmodel.h" #include "trackmodelitem.h" #include "trackproxymodel.h" #include "trackview.h" diff --git a/src/libtomahawk/playlist/playlistitemdelegate.h b/src/libtomahawk/playlist/playlistitemdelegate.h index 98fc25674..5bdf26c71 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.h +++ b/src/libtomahawk/playlist/playlistitemdelegate.h @@ -22,10 +22,10 @@ #include #include -#include "trackmodel.h" - #include "dllmacro.h" +class TrackModel; +class TrackModelItem; class TrackProxyModel; class TrackView; diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp index 7679df66b..7de20c0ca 100644 --- a/src/libtomahawk/playlist/playlistmodel.cpp +++ b/src/libtomahawk/playlist/playlistmodel.cpp @@ -21,8 +21,10 @@ #include #include +#include "artist.h" #include "album.h" #include "pipeline.h" +#include "source.h" #include "database/database.h" #include "database/databasecommand_playbackhistory.h" #include "dynamic/GeneratorInterface.h" diff --git a/src/libtomahawk/playlist/playlistmodel.h b/src/libtomahawk/playlist/playlistmodel.h index 63a9b90d1..0f2dc3fc5 100644 --- a/src/libtomahawk/playlist/playlistmodel.h +++ b/src/libtomahawk/playlist/playlistmodel.h @@ -22,12 +22,10 @@ #include #include -#include "trackmodelitem.h" -#include "trackmodel.h" -#include "collection.h" -#include "query.h" #include "typedefs.h" +#include "trackmodel.h" #include "playlist.h" +#include "query.h" #include "playlistinterface.h" #include "dllmacro.h" diff --git a/src/libtomahawk/playlist/playlistview.h b/src/libtomahawk/playlist/playlistview.h index 945a0d613..1879910d7 100644 --- a/src/libtomahawk/playlist/playlistview.h +++ b/src/libtomahawk/playlist/playlistview.h @@ -26,8 +26,6 @@ #include "dllmacro.h" -class PlaylistModel; - class DLLEXPORT PlaylistView : public TrackView, public Tomahawk::ViewPage { Q_OBJECT diff --git a/src/libtomahawk/playlist/queueview.cpp b/src/libtomahawk/playlist/queueview.cpp index 2668638bc..92ca8349a 100644 --- a/src/libtomahawk/playlist/queueview.cpp +++ b/src/libtomahawk/playlist/queueview.cpp @@ -25,6 +25,7 @@ #include "playlist/queueproxymodel.h" #include "widgets/overlaywidget.h" #include "utils/logger.h" +#include "playlistview.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/queueview.h b/src/libtomahawk/playlist/queueview.h index 266ab0008..df80c7c26 100644 --- a/src/libtomahawk/playlist/queueview.h +++ b/src/libtomahawk/playlist/queueview.h @@ -22,10 +22,11 @@ #include #include "widgets/animatedsplitter.h" -#include "playlistview.h" #include "dllmacro.h" +class PlaylistView; + namespace Ui { class QueueView; diff --git a/src/libtomahawk/playlist/trackmodel.cpp b/src/libtomahawk/playlist/trackmodel.cpp index 85ac47500..6fc240d73 100644 --- a/src/libtomahawk/playlist/trackmodel.cpp +++ b/src/libtomahawk/playlist/trackmodel.cpp @@ -18,12 +18,14 @@ #include "trackmodel.h" +#include #include #include #include "audio/audioengine.h" #include "utils/tomahawkutils.h" +#include "artist.h" #include "album.h" #include "pipeline.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/trackmodelitem.h b/src/libtomahawk/playlist/trackmodelitem.h index 3d0118c6c..1e3197c92 100644 --- a/src/libtomahawk/playlist/trackmodelitem.h +++ b/src/libtomahawk/playlist/trackmodelitem.h @@ -24,7 +24,6 @@ #include #include -#include "query.h" #include "typedefs.h" #include "dllmacro.h" diff --git a/src/libtomahawk/playlist/trackproxymodel.cpp b/src/libtomahawk/playlist/trackproxymodel.cpp index 8d8954f24..13ef4c365 100644 --- a/src/libtomahawk/playlist/trackproxymodel.cpp +++ b/src/libtomahawk/playlist/trackproxymodel.cpp @@ -20,6 +20,7 @@ #include +#include "artist.h" #include "album.h" #include "query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/trackview.cpp b/src/libtomahawk/playlist/trackview.cpp index 4cdf14f85..217a55b3f 100644 --- a/src/libtomahawk/playlist/trackview.cpp +++ b/src/libtomahawk/playlist/trackview.cpp @@ -26,7 +26,6 @@ #include "viewmanager.h" #include "trackmodel.h" #include "trackproxymodel.h" - #include "audio/audioengine.h" #include "context/ContextWidget.h" #include "widgets/overlaywidget.h" @@ -34,6 +33,7 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" #include "dropjob.h" +#include "artist.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/trackview.h b/src/libtomahawk/playlist/trackview.h index 8d04ed249..dc7df9d35 100644 --- a/src/libtomahawk/playlist/trackview.h +++ b/src/libtomahawk/playlist/trackview.h @@ -24,7 +24,6 @@ #include "contextmenu.h" #include "playlistitemdelegate.h" -#include "album.h" #include "dllmacro.h" diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp index efe9fe98b..e1d898641 100644 --- a/src/libtomahawk/playlist/treemodel.cpp +++ b/src/libtomahawk/playlist/treemodel.cpp @@ -22,6 +22,7 @@ #include #include +#include "source.h" #include "audio/audioengine.h" #include "database/databasecommand_allalbums.h" #include "database/databasecommand_alltracks.h" diff --git a/src/libtomahawk/playlist/treemodel.h b/src/libtomahawk/playlist/treemodel.h index 2828784d2..30550ba47 100644 --- a/src/libtomahawk/playlist/treemodel.h +++ b/src/libtomahawk/playlist/treemodel.h @@ -22,8 +22,10 @@ #include #include +#include "artist.h" #include "album.h" -#include "collection.h" +#include "query.h" +#include "result.h" #include "playlistinterface.h" #include "database/databasecommand_allartists.h" diff --git a/src/libtomahawk/playlist/treemodelitem.cpp b/src/libtomahawk/playlist/treemodelitem.cpp index 8d3c14880..a7dc0d1b4 100644 --- a/src/libtomahawk/playlist/treemodelitem.cpp +++ b/src/libtomahawk/playlist/treemodelitem.cpp @@ -20,7 +20,9 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" +#include "artist.h" #include "album.h" +#include "query.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/treemodelitem.h b/src/libtomahawk/playlist/treemodelitem.h index e3d650c08..1cf5a644c 100644 --- a/src/libtomahawk/playlist/treemodelitem.h +++ b/src/libtomahawk/playlist/treemodelitem.h @@ -24,8 +24,7 @@ #include #include -#include "result.h" - +#include "typedefs.h" #include "dllmacro.h" class DLLEXPORT TreeModelItem : public QObject diff --git a/src/libtomahawk/playlist/treeproxymodel.cpp b/src/libtomahawk/playlist/treeproxymodel.cpp index 0550a9b86..c3310c1e7 100644 --- a/src/libtomahawk/playlist/treeproxymodel.cpp +++ b/src/libtomahawk/playlist/treeproxymodel.cpp @@ -20,8 +20,10 @@ #include +#include "source.h" #include "query.h" #include "database/database.h" +#include "database/databaseimpl.h" #include "database/databasecommand_allalbums.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlistinterface.h b/src/libtomahawk/playlistinterface.h index f4c6650a1..65911a529 100644 --- a/src/libtomahawk/playlistinterface.h +++ b/src/libtomahawk/playlistinterface.h @@ -23,9 +23,7 @@ #include #include "typedefs.h" - #include "dllmacro.h" -#include "result.h" #include "utils/logger.h" namespace Tomahawk diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp index 83535139d..00234655e 100644 --- a/src/libtomahawk/query.cpp +++ b/src/libtomahawk/query.cpp @@ -21,6 +21,7 @@ #include #include "database/database.h" +#include "database/databaseimpl.h" #include "database/databasecommand_logplayback.h" #include "database/databasecommand_playbackhistory.h" #include "database/databasecommand_loadplaylistentries.h" diff --git a/src/libtomahawk/query.h b/src/libtomahawk/query.h index 4b12537d7..91d6944f3 100644 --- a/src/libtomahawk/query.h +++ b/src/libtomahawk/query.h @@ -24,8 +24,8 @@ #include #include -#include "result.h" #include "typedefs.h" +#include "result.h" #include "dllmacro.h" diff --git a/src/libtomahawk/resolvers/qtscriptresolver.h b/src/libtomahawk/resolvers/qtscriptresolver.h index 15a8bb0e9..e281ad9ac 100644 --- a/src/libtomahawk/resolvers/qtscriptresolver.h +++ b/src/libtomahawk/resolvers/qtscriptresolver.h @@ -21,7 +21,6 @@ #include "resolver.h" #include "query.h" -#include "result.h" #include "utils/tomahawkutils.h" #include "config.h" @@ -136,7 +135,7 @@ public: public slots: virtual void resolve( const Tomahawk::query_ptr& query ); virtual void stop(); -virtual void start(); + virtual void start(); signals: void stopped(); diff --git a/src/libtomahawk/resolvers/scriptresolver.h b/src/libtomahawk/resolvers/scriptresolver.h index 1dcd5dcdf..09a26d52c 100644 --- a/src/libtomahawk/resolvers/scriptresolver.h +++ b/src/libtomahawk/resolvers/scriptresolver.h @@ -25,10 +25,8 @@ #include #include -#include "resolver.h" #include "query.h" -#include "result.h" -#include "source.h" +#include "resolver.h" #include "dllmacro.h" @@ -42,7 +40,6 @@ public: explicit ScriptResolver( const QString& exe ); virtual ~ScriptResolver(); - virtual QString name() const { return m_name; } virtual unsigned int weight() const { return m_weight; } virtual unsigned int preference() const { return m_preference; } @@ -55,6 +52,7 @@ public: virtual void reload(); virtual bool running() const; + signals: void stopped(); diff --git a/src/libtomahawk/result.h b/src/libtomahawk/result.h index 64ee7d665..3b3a92654 100644 --- a/src/libtomahawk/result.h +++ b/src/libtomahawk/result.h @@ -19,8 +19,6 @@ #ifndef RESULT_H #define RESULT_H -#include - #include #include diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp index 0df020372..8b418b9f0 100644 --- a/src/libtomahawk/sip/SipHandler.cpp +++ b/src/libtomahawk/sip/SipHandler.cpp @@ -28,6 +28,7 @@ #include "database/database.h" #include "network/controlconnection.h" +#include "network/servent.h" #include "sourcelist.h" #include "tomahawksettings.h" #include "utils/logger.h" diff --git a/src/libtomahawk/sip/SipPlugin.h b/src/libtomahawk/sip/SipPlugin.h index ae8ce58b7..54f6657c6 100644 --- a/src/libtomahawk/sip/SipPlugin.h +++ b/src/libtomahawk/sip/SipPlugin.h @@ -27,7 +27,6 @@ #include #include - #include "dllmacro.h" class SipPlugin; @@ -113,7 +112,7 @@ signals: void addMenu( QMenu* menu ); void removeMenu( QMenu* menu ); - + void dataError( bool ); private slots: diff --git a/src/libtomahawk/sip/sipinfo.h b/src/libtomahawk/sip/sipinfo.h index 1a6b0f2aa..3f69cd4a3 100644 --- a/src/libtomahawk/sip/sipinfo.h +++ b/src/libtomahawk/sip/sipinfo.h @@ -23,7 +23,7 @@ #include #include "utils/logger.h" -#include "../dllmacro.h" +#include "dllmacro.h" class SipInfoPrivate; diff --git a/src/libtomahawk/source.h b/src/libtomahawk/source.h index 7efe154bd..10988397b 100644 --- a/src/libtomahawk/source.h +++ b/src/libtomahawk/source.h @@ -23,9 +23,10 @@ #include #include +#include "typedefs.h" #include "network/dbsyncconnection.h" #include "collection.h" -#include "typedefs.h" +#include "query.h" #include "dllmacro.h" @@ -84,8 +85,8 @@ signals: void online(); void offline(); - void collectionAdded( QSharedPointer ); - void collectionRemoved( QSharedPointer ); + void collectionAdded( const collection_ptr& collection ); + void collectionRemoved( const collection_ptr& collection ); void stats( const QVariantMap& ); void usernameChanged( const QString& ); diff --git a/src/libtomahawk/sourcelist.h b/src/libtomahawk/sourcelist.h index 4297c7cbb..abf9085ff 100644 --- a/src/libtomahawk/sourcelist.h +++ b/src/libtomahawk/sourcelist.h @@ -23,8 +23,8 @@ #include #include -#include "source.h" #include "typedefs.h" +#include "source.h" #include "dllmacro.h" diff --git a/src/libtomahawk/sourceplaylistinterface.h b/src/libtomahawk/sourceplaylistinterface.h index 097d1a4be..9564bbd4a 100644 --- a/src/libtomahawk/sourceplaylistinterface.h +++ b/src/libtomahawk/sourceplaylistinterface.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -23,7 +23,6 @@ #include #include "typedefs.h" -#include "collection.h" #include "playlistinterface.h" #include "dllmacro.h" @@ -71,7 +70,7 @@ signals: void trackCountChanged( unsigned int tracks ); void sourceTrackCountChanged( unsigned int tracks ); void nextTrackReady(); - + private slots: void onSourcePlaybackStarted( const Tomahawk::query_ptr& query ); void resolvingFinished( bool hasResults ); diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h index a90f0da82..9f518b21a 100644 --- a/src/libtomahawk/tomahawksettings.h +++ b/src/libtomahawk/tomahawksettings.h @@ -26,7 +26,6 @@ #include "AtticaManager.h" #include "playlist.h" -class AtticaManager; /** * Convenience wrapper around QSettings for tomahawk-specific config */ @@ -202,7 +201,6 @@ public: bool nowPlayingEnabled() const; // false by default void setNowPlayingEnabled( bool enable ); - signals: void changed(); void recentlyPlayedPlaylistAdded( const Tomahawk::playlist_ptr& playlist ); diff --git a/src/libtomahawk/typedefs.h b/src/libtomahawk/typedefs.h index f8529de91..945381bc2 100644 --- a/src/libtomahawk/typedefs.h +++ b/src/libtomahawk/typedefs.h @@ -22,6 +22,8 @@ #include #include +template class QSharedPointer; + namespace Tomahawk { class Artist; diff --git a/src/libtomahawk/utils/jspfloader.h b/src/libtomahawk/utils/jspfloader.h index 1228eac2f..531a8d69d 100644 --- a/src/libtomahawk/utils/jspfloader.h +++ b/src/libtomahawk/utils/jspfloader.h @@ -16,7 +16,6 @@ * along with Tomahawk. If not, see . */ - #ifndef JSPFLOADER_H #define JSPFLOADER_H @@ -30,6 +29,7 @@ #include "typedefs.h" #include "dllmacro.h" + namespace Tomahawk { diff --git a/src/libtomahawk/utils/rdioparser.h b/src/libtomahawk/utils/rdioparser.h index 669905f97..9bcf53a1e 100644 --- a/src/libtomahawk/utils/rdioparser.h +++ b/src/libtomahawk/utils/rdioparser.h @@ -23,7 +23,6 @@ #include #include "query.h" -#include "source.h" class QNetworkReply; namespace Tomahawk diff --git a/src/libtomahawk/utils/shortenedlinkparser.h b/src/libtomahawk/utils/shortenedlinkparser.h index 6a61eec9c..e21d0007e 100644 --- a/src/libtomahawk/utils/shortenedlinkparser.h +++ b/src/libtomahawk/utils/shortenedlinkparser.h @@ -30,31 +30,32 @@ class QNetworkReply; namespace Tomahawk { - /** - * Small class to parse whitelisted shortened links into the redirected urls - * - * Connect to urls() to get the result - * - */ - class DLLEXPORT ShortenedLinkParser : public QObject - { - Q_OBJECT - public: - explicit ShortenedLinkParser( const QStringList& urls, QObject* parent = 0 ); - virtual ~ShortenedLinkParser(); +/** + * Small class to parse whitelisted shortened links into the redirected urls + * + * Connect to urls() to get the result + * + */ +class DLLEXPORT ShortenedLinkParser : public QObject +{ + Q_OBJECT +public: + explicit ShortenedLinkParser( const QStringList& urls, QObject* parent = 0 ); + virtual ~ShortenedLinkParser(); - signals: - void urls( const QStringList& urls ); +public slots: + void lookupFinished(); - private: - void lengthenUrl( const QString& url ); - void checkFinished(); +signals: + void urls( const QStringList& urls ); - QStringList m_links; - QSet< QNetworkReply* > m_queries; - public slots: - void lookupFinished(); - }; +private: + void lengthenUrl( const QString& url ); + void checkFinished(); + + QStringList m_links; + QSet< QNetworkReply* > m_queries; +}; } diff --git a/src/libtomahawk/utils/xspfgenerator.cpp b/src/libtomahawk/utils/xspfgenerator.cpp index 89285f6f7..9131a4ff1 100644 --- a/src/libtomahawk/utils/xspfgenerator.cpp +++ b/src/libtomahawk/utils/xspfgenerator.cpp @@ -23,7 +23,8 @@ #include #include -#include +#include "playlist.h" +#include "query.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.h b/src/libtomahawk/widgets/RecentPlaylistsModel.h index 9a910e205..26b4039ce 100644 --- a/src/libtomahawk/widgets/RecentPlaylistsModel.h +++ b/src/libtomahawk/widgets/RecentPlaylistsModel.h @@ -24,6 +24,7 @@ #include #include "playlist.h" +#include "source.h" #include "database/databasecommand_loadallsortedplaylists.h" class RecentPlaylistsModel : public QAbstractListModel diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h index da271aea2..2f0cad63d 100644 --- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h +++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h @@ -23,7 +23,7 @@ #include #include "playlist.h" - +#include "source.h" class RecentlyPlayedPlaylistsModel : public QAbstractListModel { diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.h b/src/libtomahawk/widgets/SocialPlaylistWidget.h index e485ea88e..d7fecee0d 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.h +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.h @@ -35,8 +35,6 @@ #include "dllmacro.h" #include "typedefs.h" -#include "playlist/dynamic/DynamicPlaylist.h" -#include "source.h" class AlbumModel; class PlaylistModel; @@ -83,7 +81,6 @@ private: PlaylistModel* m_topForeignTracksModel; AlbumModel* m_popularNewAlbumsModel; - QString m_title; QString m_description; QString m_longDescription; diff --git a/src/libtomahawk/widgets/breadcrumbbar.h b/src/libtomahawk/widgets/breadcrumbbar.h index 2c2332b72..0ebe68df0 100644 --- a/src/libtomahawk/widgets/breadcrumbbar.h +++ b/src/libtomahawk/widgets/breadcrumbbar.h @@ -20,7 +20,6 @@ #ifndef BREADCRUMBBAR_H #define BREADCRUMBBAR_H - #include "breadcrumbbuttonbase.h" #include diff --git a/src/libtomahawk/widgets/headerbreadcrumb.h b/src/libtomahawk/widgets/headerbreadcrumb.h index cfcafa5cf..f06c5240d 100644 --- a/src/libtomahawk/widgets/headerbreadcrumb.h +++ b/src/libtomahawk/widgets/headerbreadcrumb.h @@ -21,10 +21,8 @@ #include "breadcrumbbar.h" - class QPaintEvent; - /** * \brief a bread crumb widget with Tomahawk's distinctive header style */ diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h index 3d52efa19..aa4f1016c 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -30,8 +30,6 @@ #include -#include "artist.h" -#include "result.h" #include "playlistinterface.h" #include "viewpage.h" #include "infosystem/infosystem.h" diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h index a5e49d2d4..c04ad14c6 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h @@ -31,8 +31,6 @@ #include -#include "artist.h" -#include "result.h" #include "playlistinterface.h" #include "viewpage.h" #include "infosystem/infosystem.h" diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp index 2145da2c4..1007e547d 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp @@ -19,7 +19,9 @@ #include "sourceinfowidget.h" #include "ui_sourceinfowidget.h" +#include "source.h" #include "viewmanager.h" + #include "playlist/albummodel.h" #include "playlist/collectionflatmodel.h" #include "playlist/playlistmodel.h" diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h index fa9fe994e..15d9f9188 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h +++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h @@ -21,8 +21,6 @@ #include -#include "album.h" -#include "result.h" #include "playlistinterface.h" #include "viewpage.h" diff --git a/src/libtomahawk/widgets/newplaylistwidget.h b/src/libtomahawk/widgets/newplaylistwidget.h index d992e5a8a..8d99a154c 100644 --- a/src/libtomahawk/widgets/newplaylistwidget.h +++ b/src/libtomahawk/widgets/newplaylistwidget.h @@ -22,8 +22,6 @@ #include #include -#include "album.h" -#include "result.h" #include "playlistinterface.h" #include "viewpage.h" diff --git a/src/libtomahawk/widgets/overlaywidget.h b/src/libtomahawk/widgets/overlaywidget.h index 5775b991d..b28e54d50 100644 --- a/src/libtomahawk/widgets/overlaywidget.h +++ b/src/libtomahawk/widgets/overlaywidget.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -21,9 +21,9 @@ #include #include +#include #include "dllmacro.h" -#include class DLLEXPORT OverlayWidget : public QWidget { diff --git a/src/libtomahawk/widgets/siblingcrumbbutton.h b/src/libtomahawk/widgets/siblingcrumbbutton.h index d7d89a7e8..7525f1c21 100644 --- a/src/libtomahawk/widgets/siblingcrumbbutton.h +++ b/src/libtomahawk/widgets/siblingcrumbbutton.h @@ -30,7 +30,6 @@ #include #include - /** * \brief A factory for sibling crumb buttons */ diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h index 9d7089582..ccd8985e0 100644 --- a/src/libtomahawk/widgets/welcomewidget.h +++ b/src/libtomahawk/widgets/welcomewidget.h @@ -25,8 +25,8 @@ #include "playlistinterface.h" -#include "playlist.h" -#include "result.h" +#include "query.h" +#include "source.h" #include "viewpage.h" #include "utils/tomahawkutils.h" diff --git a/src/libtomahawk/widgets/whatshotwidget.h b/src/libtomahawk/widgets/whatshotwidget.h index 35474018d..d6d0b6a0f 100644 --- a/src/libtomahawk/widgets/whatshotwidget.h +++ b/src/libtomahawk/widgets/whatshotwidget.h @@ -25,8 +25,6 @@ #include "playlistinterface.h" #include "infosystem/infosystem.h" -#include "playlist.h" -#include "result.h" #include "viewpage.h" #include "utils/tomahawkutils.h" @@ -86,7 +84,7 @@ private slots: private: void setLeftViewArtists(); void setLeftViewTracks(); - QStandardItem* parseNode(QStandardItem* parentItem, const QString &label, const QVariant &data); + QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data ); Ui::WhatsHotWidget *ui; PlaylistModel* m_tracksModel; diff --git a/src/musicscanner.h b/src/musicscanner.h index f2abc0967..0cebcf4bb 100644 --- a/src/musicscanner.h +++ b/src/musicscanner.h @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include // descend dir tree comparing dir mtimes to last known mtime diff --git a/src/resolverconfigdelegate.h b/src/resolverconfigdelegate.h index 5b8117dd5..62e3fe9ee 100644 --- a/src/resolverconfigdelegate.h +++ b/src/resolverconfigdelegate.h @@ -21,14 +21,13 @@ #define RESOLVERCONFIGDELEGATE_H #include "configdelegatebase.h" -#include "source.h" class ResolverConfigDelegate : public ConfigDelegateBase { Q_OBJECT public: - explicit ResolverConfigDelegate(QObject* parent = 0); - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; + explicit ResolverConfigDelegate( QObject* parent = 0 ); + virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; virtual QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const; virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const; diff --git a/src/scanmanager.h b/src/scanmanager.h index 5e6f01baf..8bc2ffa91 100644 --- a/src/scanmanager.h +++ b/src/scanmanager.h @@ -1,5 +1,5 @@ /* === This file is part of Tomahawk Player - === - * + * * Copyright 2010-2011, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify @@ -25,7 +25,6 @@ #include #include -#include "dllmacro.h" #include class MusicScanner; @@ -45,26 +44,26 @@ public: signals: void finished(); - + public slots: void runScan( bool manualFull = false ); void runDirScan( const QStringList& paths, bool manualFull ); private slots: void scannerFinished(); - + void runStartupScan(); void scanTimerTimeout(); void onSettingsChanged(); - + private: static ScanManager* s_instance; - + QWeakPointer< MusicScanner > m_scanner; QThread* m_musicScannerThreadController; QStringList m_currScannerPaths; - + QTimer* m_scanTimer; }; diff --git a/src/scrobbler.cpp b/src/scrobbler.cpp index 8fb2eedfa..f6732e0d2 100644 --- a/src/scrobbler.cpp +++ b/src/scrobbler.cpp @@ -22,6 +22,7 @@ #include #include +#include "artist.h" #include "album.h" #include "typedefs.h" #include "audio/audioengine.h" diff --git a/src/scrobbler.h b/src/scrobbler.h index 87c78290b..1bacf74a2 100644 --- a/src/scrobbler.h +++ b/src/scrobbler.h @@ -19,10 +19,8 @@ #ifndef TOMAHAWK_SCROBBLER_H #define TOMAHAWK_SCROBBLER_H -#include "result.h" - #include "lastfm/ScrobblePoint" - +#include "result.h" #include "infosystem/infosystem.h" #include diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 317673952..244886621 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -17,6 +17,7 @@ * along with Tomahawk. If not, see . */ +#include "settingsdialog.h" #include "config.h" #include @@ -33,29 +34,28 @@ #include #endif -#include "settingsdialog.h" - +#include "AtticaManager.h" #include "tomahawkapp.h" -#include "musicscanner.h" #include "tomahawksettings.h" -#include "sip/SipHandler.h" -#include "database/database.h" -#include "scanmanager.h" +#include "delegateconfigwrapper.h" +#include "GetNewStuffDialog.h" +#include "musicscanner.h" #include "pipeline.h" +#include "resolver.h" #include "resolverconfigdelegate.h" #include "resolversmodel.h" -#include "delegateconfigwrapper.h" -#include "sip/SipModel.h" -#include "sipconfigdelegate.h" +#include "scanmanager.h" #include "settingslistdelegate.h" - +#include "sipconfigdelegate.h" +#include "database/database.h" +#include "network/servent.h" +#include "playlist/dynamic/widgets/LoadingSpinner.h" +#include "sip/SipHandler.h" +#include "sip/SipModel.h" #include "utils/logger.h" #include "ui_proxydialog.h" #include "ui_stackedsettingsdialog.h" -#include -#include "GetNewStuffDialog.h" -#include "AtticaManager.h" static QString md5( const QByteArray& src ) diff --git a/src/sourcetree/animationhelper.cpp b/src/sourcetree/animationhelper.cpp index 8efa25bf8..933cfebee 100644 --- a/src/sourcetree/animationhelper.cpp +++ b/src/sourcetree/animationhelper.cpp @@ -1,3 +1,22 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2011, Michael Zanetti + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + #include "animationhelper.h" #include "QDebug" diff --git a/src/sourcetree/animationhelper.h b/src/sourcetree/animationhelper.h index 1e4998132..9c86568d0 100644 --- a/src/sourcetree/animationhelper.h +++ b/src/sourcetree/animationhelper.h @@ -1,3 +1,22 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2011, Michael Zanetti + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + #ifndef ANIMATIONHELPER_H #define ANIMATIONHELPER_H diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index 7db800565..1505c398c 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -25,8 +25,9 @@ #include "genericpageitems.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" -#include -#include +#include "widgets/SocialPlaylistWidget.h" +#include "playlist/customplaylistview.h" +#include "source.h" #include "temporarypageitem.h" /// CollectionItem diff --git a/src/sourcetree/items/collectionitem.h b/src/sourcetree/items/collectionitem.h index 838099d93..9d4385f07 100644 --- a/src/sourcetree/items/collectionitem.h +++ b/src/sourcetree/items/collectionitem.h @@ -24,7 +24,9 @@ class TemporaryPageItem; class GenericPageItem; class CategoryItem; -namespace Tomahawk { + +namespace Tomahawk +{ class ViewPage; } diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp index 1b39a32bc..59e3a9320 100644 --- a/src/sourcetree/items/playlistitems.cpp +++ b/src/sourcetree/items/playlistitems.cpp @@ -29,6 +29,7 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" #include "dropjob.h" +#include "source.h" using namespace Tomahawk; diff --git a/src/sourcetree/items/playlistitems.h b/src/sourcetree/items/playlistitems.h index 346755f66..f3d41acce 100644 --- a/src/sourcetree/items/playlistitems.h +++ b/src/sourcetree/items/playlistitems.h @@ -21,7 +21,6 @@ #include "sourcetreeitem.h" #include "playlist/dynamic/DynamicPlaylist.h" -#include "artist.h" class PlaylistItem : public SourceTreeItem { diff --git a/src/sourcetree/items/sourcetreeitem.h b/src/sourcetree/items/sourcetreeitem.h index a3bdaec1a..8b9dcbfb8 100644 --- a/src/sourcetree/items/sourcetreeitem.h +++ b/src/sourcetree/items/sourcetreeitem.h @@ -16,17 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #ifndef SOURCETREEITEM_H #define SOURCETREEITEM_H -#include "sourcesmodel.h" -#include "typedefs.h" -#include "playlist.h" -#include "playlist/dynamic/DynamicPlaylist.h" -#include "source.h" #include +#include "typedefs.h" +#include "sourcesmodel.h" + class QMimeData; class SourceTreeItem : public QObject { diff --git a/src/sourcetree/items/temporarypageitem.h b/src/sourcetree/items/temporarypageitem.h index 02632fd12..28e5f4821 100644 --- a/src/sourcetree/items/temporarypageitem.h +++ b/src/sourcetree/items/temporarypageitem.h @@ -21,7 +21,6 @@ #include "items/sourcetreeitem.h" - class TemporaryPageItem : public SourceTreeItem { Q_OBJECT diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp index 6027f8cda..020bc9c8e 100644 --- a/src/sourcetree/sourcedelegate.cpp +++ b/src/sourcetree/sourcedelegate.cpp @@ -24,10 +24,11 @@ #include "items/collectionitem.h" #include "items/playlistitems.h" #include "items/categoryitems.h" +#include "items/temporarypageitem.h" #include "utils/tomahawkutils.h" -#include "items/temporarypageitem.h" #include "animationhelper.h" +#include "source.h" #include #include diff --git a/src/sourcetree/sourcetreeview.h b/src/sourcetree/sourcetreeview.h index 6a60e07cf..a2612337b 100644 --- a/src/sourcetree/sourcetreeview.h +++ b/src/sourcetree/sourcetreeview.h @@ -22,10 +22,6 @@ #include #include -#include "source.h" -#include "sourcetree/sourcesmodel.h" -#include "sourcetree/sourcedelegate.h" - class CollectionModel; class PlaylistModel; class SourcesModel; @@ -65,6 +61,7 @@ private slots: void latchOff(); void onCustomContextMenu( const QPoint& pos ); + protected: // void drawBranches( QPainter* painter, const QRect& rect, const QModelIndex& index ) const {} void drawRow( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 0a5dfb611..c2b684dab 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -43,6 +43,7 @@ #include "playlist/dynamic/GeneratorFactory.h" #include "playlist/dynamic/echonest/EchonestGenerator.h" #include "playlist/dynamic/database/DatabaseGenerator.h" +#include "network/servent.h" #include "web/api_v1.h" #include "sourcelist.h" #include "shortcuthandler.h" @@ -52,6 +53,7 @@ #include "database/localcollection.h" #include "musicscanner.h" #include "AtticaManager.h" +#include "pipeline.h" #include "audio/audioengine.h" #include "utils/xspfloader.h" diff --git a/src/tomahawkapp.h b/src/tomahawkapp.h index b6b55d6c6..bd90c73eb 100644 --- a/src/tomahawkapp.h +++ b/src/tomahawkapp.h @@ -24,28 +24,24 @@ #include "headlesscheck.h" #include "config.h" -#include "mac/tomahawkapp_mac.h" // for PlatforInterface - #include #include #include #include +#include #include "QxtHttpServerConnector" #include "QxtHttpSessionManager" +#include "mac/tomahawkapp_mac.h" // for PlatforInterface #include "typedefs.h" -#include "playlist.h" -#include "source.h" -#include "resolver.h" -#include "network/servent.h" - #include "utils/tomahawkutils.h" #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h" class AudioEngine; class Database; class ScanManager; +class Servent; class SipHandler; class TomahawkSettings; class XMPPBot; diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 144114601..1da686748 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -41,6 +41,7 @@ #include "viewmanager.h" #include "sip/SipHandler.h" #include "sourcetree/sourcetreeview.h" +#include "network/servent.h" #include "utils/proxystyle.h" #include "utils/xspfloader.h" #include "widgets/animatedsplitter.h" @@ -48,6 +49,10 @@ #include "widgets/searchwidget.h" #include "widgets/playlisttypeselectordlg.h" #include "thirdparty/Qocoa/qsearchfield.h" +#include "playlist/dynamic/GeneratorInterface.h" +#include "playlist/playlistmodel.h" +#include "playlist/playlistview.h" +#include "playlist/queueview.h" #include "audiocontrols.h" #include "settingsdialog.h" @@ -57,9 +62,7 @@ #include "PipelineStatusView.h" #include "transferview.h" #include "tomahawktrayicon.h" -#include "playlist/dynamic/GeneratorInterface.h" #include "scanmanager.h" -#include "playlist/queueview.h" #include "tomahawkapp.h" #ifdef Q_WS_WIN diff --git a/src/web/api_v1.cpp b/src/web/api_v1.cpp index d5d35044d..65f177cc3 100644 --- a/src/web/api_v1.cpp +++ b/src/web/api_v1.cpp @@ -22,6 +22,13 @@ #include "utils/logger.h" +#include "utils/tomahawkutils.h" +#include "database/database.h" +#include "database/databasecommand_addclientauth.h" +#include "database/databasecommand_clientauthvalid.h" +#include "network/servent.h" +#include "pipeline.h" + using namespace Tomahawk; diff --git a/src/web/api_v1.h b/src/web/api_v1.h index cc065a41a..91be9c89d 100644 --- a/src/web/api_v1.h +++ b/src/web/api_v1.h @@ -21,11 +21,9 @@ // See: http://doc.libqxt.org/tip/qxtweb.html -#include "query.h" -#include "pipeline.h" - #include "QxtHttpServerConnector" #include "QxtHttpSessionManager" +#include "QxtWebContent" #include "QxtWebSlotService" #include "QxtWebPageEvent" @@ -37,13 +35,6 @@ #include #include -#include "network/servent.h" -#include "utils/tomahawkutils.h" -#include -#include -#include -#include - class Api_v1 : public QxtWebSlotService { Q_OBJECT