diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index e835d635d..2c4c9083f 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -30,6 +30,12 @@ #include +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Query.h" +#endif + + ActionCollection* ActionCollection::s_instance = 0; ActionCollection* ActionCollection::instance() { diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp index 67a07c1a7..07266cdd6 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.cpp +++ b/src/libtomahawk/AlbumPlaylistInterface.cpp @@ -20,17 +20,23 @@ #include "AlbumPlaylistInterface.h" -#include "Artist.h" +#include "utils/Logger.h" #include "collection/TracksRequest.h" #include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/DatabaseCommand_AllTracks.h" + +#include "Artist.h" #include "Pipeline.h" #include "Query.h" #include "Source.h" #include "SourceList.h" -#include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Result.h" +#endif + using namespace Tomahawk; diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp index bc901abcb..2571d8740 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.cpp +++ b/src/libtomahawk/ArtistPlaylistInterface.cpp @@ -19,14 +19,19 @@ #include "ArtistPlaylistInterface.h" -#include "Artist.h" #include "collection/Collection.h" -#include "Query.h" #include "database/Database.h" #include "database/DatabaseCommand_AllTracks.h" +#include "utils/Logger.h" + +#include "Artist.h" +#include "Query.h" #include "Source.h" -#include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Result.h" +#endif using namespace Tomahawk; diff --git a/src/libtomahawk/LatchManager.cpp b/src/libtomahawk/LatchManager.cpp index 9073429ca..aeb05dfcc 100644 --- a/src/libtomahawk/LatchManager.cpp +++ b/src/libtomahawk/LatchManager.cpp @@ -29,6 +29,12 @@ #include +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Result.h" +#endif + + using namespace Tomahawk; LatchManager::LatchManager( QObject* parent ) diff --git a/src/libtomahawk/context/ContextPage.cpp b/src/libtomahawk/context/ContextPage.cpp index 59435edb6..45106f5dc 100644 --- a/src/libtomahawk/context/ContextPage.cpp +++ b/src/libtomahawk/context/ContextPage.cpp @@ -24,6 +24,13 @@ #include "utils/TomahawkStyle.h" #include "utils/TomahawkUtilsGui.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" + #include "Source.h" +#endif + + using namespace Tomahawk; diff --git a/src/libtomahawk/database/DatabaseCommand.cpp b/src/libtomahawk/database/DatabaseCommand.cpp index b86fd2d53..4c9df989a 100644 --- a/src/libtomahawk/database/DatabaseCommand.cpp +++ b/src/libtomahawk/database/DatabaseCommand.cpp @@ -18,6 +18,8 @@ #include "DatabaseCommand.h" +#include "utils/Logger.h" + #include "DatabaseCommand_AddFiles.h" #include "DatabaseCommand_CreatePlaylist.h" #include "DatabaseCommand_DeleteFiles.h" @@ -30,11 +32,14 @@ #include "DatabaseCommand_SetDynamicPlaylistRevision.h" #include "DatabaseCommand_SocialAction.h" #include "DatabaseCommand_ShareTrack.h" - -#include "utils/Logger.h" #include "DatabaseCommand_SetCollectionAttributes.h" #include "DatabaseCommand_SetTrackAttributes.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" +#endif + DatabaseCommand::DatabaseCommand( QObject* parent ) : QObject( parent ) diff --git a/src/libtomahawk/database/DatabaseCommand_ArtistStats.cpp b/src/libtomahawk/database/DatabaseCommand_ArtistStats.cpp index 52deff020..adad25959 100644 --- a/src/libtomahawk/database/DatabaseCommand_ArtistStats.cpp +++ b/src/libtomahawk/database/DatabaseCommand_ArtistStats.cpp @@ -23,6 +23,12 @@ #include "SourceList.h" #include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" +#endif + + using namespace Tomahawk; diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp index d2c99bcbc..5dfb17440 100644 --- a/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp @@ -24,6 +24,11 @@ #include +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" +#endif + using namespace Tomahawk; diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp index c5c42536e..a0beff7a1 100644 --- a/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp @@ -21,6 +21,11 @@ #include "Query.h" #include "Track.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Source.h" +#endif + DatabaseCommand_DeleteInboxEntry::DatabaseCommand_DeleteInboxEntry( const Tomahawk::query_ptr& query, QObject* parent ) diff --git a/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp b/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp index 386eb8511..8ef0bd252 100644 --- a/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp +++ b/src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp @@ -21,6 +21,11 @@ #include "Query.h" #include "Track.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Source.h" +#endif + DatabaseCommand_ModifyInboxEntry::DatabaseCommand_ModifyInboxEntry( const Tomahawk::query_ptr& query, bool newValue, diff --git a/src/libtomahawk/database/DatabaseCommand_NetworkCharts.cpp b/src/libtomahawk/database/DatabaseCommand_NetworkCharts.cpp index ac7f26769..96e8c3be4 100644 --- a/src/libtomahawk/database/DatabaseCommand_NetworkCharts.cpp +++ b/src/libtomahawk/database/DatabaseCommand_NetworkCharts.cpp @@ -22,6 +22,12 @@ #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Source.h" +#endif + + DatabaseCommand_NetworkCharts::DatabaseCommand_NetworkCharts( const QDateTime &from, const QDateTime &to, QObject *parent ) : DatabaseCommand( parent ) , m_amount( 0 ) diff --git a/src/libtomahawk/database/DatabaseCommand_TrackStats.cpp b/src/libtomahawk/database/DatabaseCommand_TrackStats.cpp index dc763b941..2cfd20331 100644 --- a/src/libtomahawk/database/DatabaseCommand_TrackStats.cpp +++ b/src/libtomahawk/database/DatabaseCommand_TrackStats.cpp @@ -23,6 +23,11 @@ #include "SourceList.h" #include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" +#endif + using namespace Tomahawk; diff --git a/src/libtomahawk/jobview/InboxJobItem.cpp b/src/libtomahawk/jobview/InboxJobItem.cpp index 0193175a2..b6f5b5a18 100644 --- a/src/libtomahawk/jobview/InboxJobItem.cpp +++ b/src/libtomahawk/jobview/InboxJobItem.cpp @@ -29,6 +29,12 @@ #include +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Source.h" +#endif + + InboxJobItem::InboxJobItem( Side side, const QString& prettyName, diff --git a/src/libtomahawk/jobview/TransferStatusItem.cpp b/src/libtomahawk/jobview/TransferStatusItem.cpp index 76a07feb3..bc794697b 100644 --- a/src/libtomahawk/jobview/TransferStatusItem.cpp +++ b/src/libtomahawk/jobview/TransferStatusItem.cpp @@ -33,6 +33,12 @@ #include "JobStatusView.h" #endif +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" +#endif + + TransferStatusItem::TransferStatusItem( TransferStatusManager* p, StreamConnection* sc ) : m_parent( p ) , m_stream( QPointer< StreamConnection >( sc ) ) diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp index fdb6bf514..62ed153b3 100644 --- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp @@ -39,6 +39,12 @@ #include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "utils/PixmapDelegateFader.h" +#endif + + using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 18a07adb2..bda8908f9 100644 --- a/src/libtomahawk/playlist/TrackView.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -36,6 +36,12 @@ #include "utils/Logger.h" #include "InboxModel.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "collection/Collection.h" + #include "utils/PixmapDelegateFader.h" +#endif + #include #include diff --git a/src/libtomahawk/utils/ItunesParser.cpp b/src/libtomahawk/utils/ItunesParser.cpp index d08d0f9e2..9959da5b4 100644 --- a/src/libtomahawk/utils/ItunesParser.cpp +++ b/src/libtomahawk/utils/ItunesParser.cpp @@ -34,6 +34,12 @@ #include "utils/TomahawkUtils.h" #include "utils/Logger.h" +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Playlist.h" +#endif + + using namespace Tomahawk; QPixmap* ItunesParser::s_pixmap = 0; diff --git a/src/libtomahawk/widgets/OverlayWidget.cpp b/src/libtomahawk/widgets/OverlayWidget.cpp index ba518c8e3..f8af87db5 100644 --- a/src/libtomahawk/widgets/OverlayWidget.cpp +++ b/src/libtomahawk/widgets/OverlayWidget.cpp @@ -26,6 +26,11 @@ #include #include +// Forward Declarations breaking QSharedPointer +#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include "Source.h" +#endif + #define CORNER_ROUNDNESS 8.0 #define FADING_DURATION 500