mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Remove boost usage from ViewManger

Browse Source
This commit is contained in:
Uwe L. Korn
2014-08-18 16:51:56 +01:00
parent 07c5e9d182
commit 6cffce4d32
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/ViewManager.cpp
View File

@@ -680,7 +680,7 @@ ViewManager::addDynamicPage( Tomahawk::ViewPagePlugin* viewPage, const QString&
/*void /*void
ViewManager::addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, boost::function<Tomahawk::ViewPage*()> instanceLoader, int sortValue ) ViewManager::addDynamicPage( const QString& pageName, const QString& text, const QIcon& icon, function<Tomahawk::ViewPage*()> instanceLoader, int sortValue )
{ {
tLog() << Q_FUNC_INFO << "Trying to add" << pageName; tLog() << Q_FUNC_INFO << "Trying to add" << pageName;

12
src/libtomahawk/ViewManager.h
View File

@@ -21,19 +21,17 @@
#define VIEWMANAGER_H #define VIEWMANAGER_H
#include "Artist.h" #include "Artist.h"
#include "ViewPage.h"
#include "ViewPagePlugin.h"
#include "collection/Collection.h" #include "collection/Collection.h"
#include "PlaylistInterface.h" #include "PlaylistInterface.h"
#include "playlist/QueueView.h" #include "playlist/QueueView.h"
#include "ViewPage.h" #include "utils/tr1-functional.h"
#include "ViewPagePlugin.h"
#include <QObject> #include <QObject>
#include <QHash> #include <QHash>
#include <QStackedWidget> #include <QStackedWidget>
// best regards to you, mr. pimple aka xhochy :)
#include <boost/function.hpp>
#include "DllMacro.h" #include "DllMacro.h"
class AlbumModel; class AlbumModel;
@@ -119,7 +117,7 @@ public slots:
Tomahawk::ViewPage* showInboxPage(); Tomahawk::ViewPage* showInboxPage();
Tomahawk::ViewPage* showQueuePage(); 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 ); Tomahawk::ViewPage* showDynamicPage( const QString& pageName );
void showCurrentTrack(); void showCurrentTrack();
@@ -161,7 +159,7 @@ private:
QHash< QString, Tomahawk::ViewPage* > m_dynamicPages; QHash< QString, Tomahawk::ViewPage* > m_dynamicPages;
QHash< QString, QPointer< Tomahawk::ViewPagePlugin > > m_dynamicPagePlugins; 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<Tomahawk::DynamicWidget> > m_dynamicWidgets; QHash< Tomahawk::dynplaylist_ptr, QPointer<Tomahawk::DynamicWidget> > m_dynamicWidgets;
QHash< Tomahawk::collection_ptr, QPointer<FlexibleTreeView> > m_collectionViews; QHash< Tomahawk::collection_ptr, QPointer<FlexibleTreeView> > m_collectionViews;