diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index c34689c38..3106808ad 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -680,7 +680,7 @@ ViewManager::addDynamicPage( Tomahawk::ViewPagePlugin* viewPage, const QString& /*void -ViewManager::addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, boost::function instanceLoader, int sortValue ) +ViewManager::addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, function instanceLoader, int sortValue ) { tLog() << Q_FUNC_INFO << "Trying to add" << pageName; diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index 19efc2154..cf97bb63f 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -21,19 +21,17 @@ #define VIEWMANAGER_H #include "Artist.h" +#include "ViewPage.h" +#include "ViewPagePlugin.h" #include "collection/Collection.h" #include "PlaylistInterface.h" #include "playlist/QueueView.h" -#include "ViewPage.h" -#include "ViewPagePlugin.h" +#include "utils/tr1-functional.h" #include #include #include -// best regards to you, mr. pimple aka xhochy :) -#include - #include "DllMacro.h" class AlbumModel; @@ -119,7 +117,7 @@ public slots: Tomahawk::ViewPage* showInboxPage(); Tomahawk::ViewPage* showQueuePage(); -// void addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, boost::function< Tomahawk::ViewPage*() > instanceLoader, int sortValue = 0 ); +// void addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, function< Tomahawk::ViewPage*() > instanceLoader, int sortValue = 0 ); Tomahawk::ViewPage* showDynamicPage( const QString& pageName ); void showCurrentTrack(); @@ -161,7 +159,7 @@ private: QHash< QString, Tomahawk::ViewPage* > m_dynamicPages; QHash< QString, QPointer< Tomahawk::ViewPagePlugin > > m_dynamicPagePlugins; - QHash< QString, boost::function< Tomahawk::ViewPage*() > > m_dynamicPagesInstanceLoaders; + QHash< QString, function< Tomahawk::ViewPage*() > > m_dynamicPagesInstanceLoaders; QHash< Tomahawk::dynplaylist_ptr, QPointer > m_dynamicWidgets; QHash< Tomahawk::collection_ptr, QPointer > m_collectionViews;