mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-29 16:50:11 +02:00
Code Issues Releases Wiki Activity

Move NetworkActivityWidget into Tomahawk::Widgets namespace

Browse Source
This commit is contained in:
Dominik Schmidt
2013-06-30 23:39:20 +02:00
parent edbc60f274
commit 4ec651c378
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/widgets/NetworkActivityWidget.cpp
View File

@@ -34,6 +34,7 @@
#define NETWORKCHARTS_NUM_TRACKS 100 #define NETWORKCHARTS_NUM_TRACKS 100
using namespace Tomahawk; using namespace Tomahawk;
using namespace Tomahawk::Widgets;
NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
: QWidget( parent ) : QWidget( parent )

9
src/libtomahawk/widgets/NetworkActivityWidget.h
View File

@@ -34,6 +34,11 @@ namespace Ui
class NetworkActivityWidget; class NetworkActivityWidget;
} }
namespace Tomahawk
{
namespace Widgets
{
class TOMAHAWK_WIDGETS_EXPORT NetworkActivityWidget : public QWidget, public Tomahawk::ViewPage class TOMAHAWK_WIDGETS_EXPORT NetworkActivityWidget : public QWidget, public Tomahawk::ViewPage
{ {
Q_OBJECT Q_OBJECT
@@ -77,4 +82,8 @@ private:
NetworkActivityWidgetPrivate* d_ptr; NetworkActivityWidgetPrivate* d_ptr;
}; };
}; // Widgets
}; // Tomahawk
#endif // NETWORKACTIVITYWIDGET_H #endif // NETWORKACTIVITYWIDGET_H

8
src/libtomahawk/widgets/NetworkActivityWidget_p.h
View File

@@ -25,14 +25,14 @@
class NetworkActivityWidgetPrivate class NetworkActivityWidgetPrivate
{ {
public: public:
NetworkActivityWidgetPrivate( NetworkActivityWidget* q ) NetworkActivityWidgetPrivate( Tomahawk::Widgets::NetworkActivityWidget* q )
: q_ptr ( q ) : q_ptr ( q )
, ui( new Ui::NetworkActivityWidget ) , ui( new Ui::NetworkActivityWidget )
, sortedProxy( 0 ) , sortedProxy( 0 )
{ {
} }
NetworkActivityWidget* q_ptr; Tomahawk::Widgets::NetworkActivityWidget* q_ptr;
Q_DECLARE_PUBLIC ( NetworkActivityWidget ) Q_DECLARE_PUBLIC ( Tomahawk::Widgets::NetworkActivityWidget )
private: private:
QSharedPointer<Ui::NetworkActivityWidget> ui; QSharedPointer<Ui::NetworkActivityWidget> ui;
@@ -44,7 +44,7 @@ private:
QPointer<PlaylistModel> monthlyChartsModel; QPointer<PlaylistModel> monthlyChartsModel;
QPointer<PlaylistModel> yearlyChartsModel; QPointer<PlaylistModel> yearlyChartsModel;
QPointer<PlaylistModel> overallChartsModel; QPointer<PlaylistModel> overallChartsModel;
NetworkActivityWidget::ViewType activeView; Tomahawk::Widgets::NetworkActivityWidget::ViewType activeView;
}; };
#endif // NETWORKACTIVITYWIDGET_P_H #endif // NETWORKACTIVITYWIDGET_P_H

2
src/tomahawk/sourcetree/SourcesModel.cpp
View File

@@ -352,7 +352,7 @@ SourcesModel::appendGroups()
ViewManager::instance()->addDynamicPage("network_activity", ViewManager::instance()->addDynamicPage("network_activity",
tr( "Network Activity" ), tr( "Network Activity" ),
TomahawkUtils::defaultPixmap( TomahawkUtils::NetworkActivity, TomahawkUtils::Original ), TomahawkUtils::defaultPixmap( TomahawkUtils::NetworkActivity, TomahawkUtils::Original ),
boost::lambda::bind( boost::lambda::new_ptr< NetworkActivityWidget >() ) boost::lambda::bind( boost::lambda::new_ptr< Tomahawk::Widgets::NetworkActivityWidget >() )
); );
} }