From 443d7519ac10329fb0c5c1a93d455d648199284b Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 3 Nov 2012 03:24:36 +0100 Subject: [PATCH] Move implementations to source files in app --- src/ConfigDelegateBase.cpp | 25 +++ src/ConfigDelegateBase.h | 2 +- src/SocialWidget.cpp | 14 ++ src/SocialWidget.h | 4 +- src/TomahawkApp.cpp | 14 ++ src/TomahawkApp.h | 8 +- src/TomahawkWindow.cpp | 14 ++ src/TomahawkWindow.h | 4 +- src/sourcetree/AnimationHelper.cpp | 14 ++ src/sourcetree/AnimationHelper.h | 4 +- src/sourcetree/SourcesModel.cpp | 7 + src/sourcetree/SourcesModel.h | 2 +- src/sourcetree/items/CategoryItems.cpp | 28 +++ src/sourcetree/items/CategoryItems.h | 15 +- src/sourcetree/items/GenericPageItems.cpp | 14 ++ src/sourcetree/items/GenericPageItems.h | 4 +- src/sourcetree/items/GroupItem.cpp | 30 ++++ src/sourcetree/items/GroupItem.h | 8 +- src/sourcetree/items/LovedTracksItem.cpp | 22 ++- src/sourcetree/items/LovedTracksItem.h | 6 +- src/sourcetree/items/PlaylistItems.cpp | 20 +++ src/sourcetree/items/PlaylistItems.h | 6 +- src/sourcetree/items/SourceItem.cpp | 28 +++ src/sourcetree/items/SourceItem.h | 8 +- src/sourcetree/items/SourceTreeItem.cpp | 190 +++++++++++++++++++++ src/sourcetree/items/SourceTreeItem.h | 54 +++--- src/sourcetree/items/TemporaryPageItem.cpp | 21 +++ src/sourcetree/items/TemporaryPageItem.h | 6 +- src/web/Api_v1.cpp | 5 + src/web/Api_v1.h | 5 +- src/widgets/ContainedMenuButton.cpp | 7 + src/widgets/ContainedMenuButton.h | 2 +- src/widgets/SlideSwitchButton.h | 14 +- src/widgets/UnstyledFrame.h | 2 +- 34 files changed, 521 insertions(+), 86 deletions(-) create mode 100644 src/ConfigDelegateBase.cpp diff --git a/src/ConfigDelegateBase.cpp b/src/ConfigDelegateBase.cpp new file mode 100644 index 000000000..216cc783f --- /dev/null +++ b/src/ConfigDelegateBase.cpp @@ -0,0 +1,25 @@ +/* + Copyright (C) 2011 Leo Franchi + + This program 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. + + This program 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 this program. If not, see . +*/ + +#include "ConfigDelegateBase.h" + + +QList< int > +ConfigDelegateBase::extraCheckRoles() const +{ + return QList(); +} diff --git a/src/ConfigDelegateBase.h b/src/ConfigDelegateBase.h index 80081f720..1a2587e91 100644 --- a/src/ConfigDelegateBase.h +++ b/src/ConfigDelegateBase.h @@ -40,7 +40,7 @@ public: // if you want to use a config wrench, you need to have this say where to paint it virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0; - virtual QList extraCheckRoles() const { return QList(); } + virtual QList extraCheckRoles() const; signals: void configPressed( const QModelIndex& idx ); diff --git a/src/SocialWidget.cpp b/src/SocialWidget.cpp index fb1cc5ece..129a8bf7d 100644 --- a/src/SocialWidget.cpp +++ b/src/SocialWidget.cpp @@ -266,3 +266,17 @@ SocialWidget::eventFilter( QObject* object, QEvent* event ) return QObject::eventFilter( object, event ); } + + +Tomahawk::query_ptr +SocialWidget::query() const +{ + return m_query; +} + + +QPoint +SocialWidget::position() const +{ + return m_position; +} diff --git a/src/SocialWidget.h b/src/SocialWidget.h index 876ec3efc..e43812896 100644 --- a/src/SocialWidget.h +++ b/src/SocialWidget.h @@ -39,10 +39,10 @@ public: SocialWidget( QWidget* parent ); ~SocialWidget(); - Tomahawk::query_ptr query() const { return m_query; } + Tomahawk::query_ptr query() const; void setQuery( const Tomahawk::query_ptr& query ); - QPoint position() const { return m_position; } + QPoint position() const; void setPosition( QPoint position ); bool shown() const; diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index 474b5cdb1..53e7eb093 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -782,3 +782,17 @@ TomahawkApp::instanceStarted( KDSingleApplicationGuard::Instance instance ) else activate(); } + + +TomahawkWindow* +TomahawkApp::mainWindow() const +{ + return m_mainwindow; +} + + +bool +TomahawkApp::isTomahawkLoaded() const +{ + return m_loaded; +} diff --git a/src/TomahawkApp.h b/src/TomahawkApp.h index 28247d79d..d4e09ac61 100644 --- a/src/TomahawkApp.h +++ b/src/TomahawkApp.h @@ -46,7 +46,6 @@ class ScanManager; class Servent; class SipHandler; class TomahawkSettings; -class XMPPBot; class AudioControls; namespace Tomahawk @@ -87,17 +86,15 @@ public: void init(); static TomahawkApp* instance(); - XMPPBot* xmppBot() { return m_xmppBot.data(); } - #ifndef ENABLE_HEADLESS AudioControls* audioControls(); - TomahawkWindow* mainWindow() const { return m_mainwindow; } + TomahawkWindow* mainWindow() const; #endif // PlatformInterface virtual bool loadUrl( const QString& url ); - bool isTomahawkLoaded() const { return m_loaded; } + bool isTomahawkLoaded() const; // reimplemented from QApplication/QCoreApplication virtual bool notify( QObject* receiver, QEvent* e ); @@ -133,7 +130,6 @@ private: QWeakPointer m_audioEngine; QWeakPointer m_servent; QWeakPointer m_infoSystem; - QWeakPointer m_xmppBot; QWeakPointer m_shortcutHandler; QWeakPointer< Tomahawk::Accounts::AccountManager > m_accountManager; bool m_scrubFriendlyName; diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index a886eddfd..08558775d 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -1318,3 +1318,17 @@ TomahawkWindow::toggleMenuBar() //SLOT saveSettings(); #endif } + + +AudioControls* +TomahawkWindow::audioControls() +{ + return m_audioControls; +} + + +SourceTreeView* +TomahawkWindow::sourceTreeView() const +{ + return m_sourcetree; +} diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h index 99969c30b..9a836a5a0 100644 --- a/src/TomahawkWindow.h +++ b/src/TomahawkWindow.h @@ -76,8 +76,8 @@ public: TomahawkWindow( QWidget* parent = 0 ); ~TomahawkWindow(); - AudioControls* audioControls() { return m_audioControls; } - SourceTreeView* sourceTreeView() const { return m_sourcetree; } + AudioControls* audioControls(); + SourceTreeView* sourceTreeView() const; void setWindowTitle( const QString& title ); diff --git a/src/sourcetree/AnimationHelper.cpp b/src/sourcetree/AnimationHelper.cpp index b761580df..057bd9939 100644 --- a/src/sourcetree/AnimationHelper.cpp +++ b/src/sourcetree/AnimationHelper.cpp @@ -128,3 +128,17 @@ void AnimationHelper::collapseAnimationFinished() { emit finished( m_index ); } + + +QSize +AnimationHelper::originalSize() const +{ + return m_startSize; +} + + +QSize +AnimationHelper::size() const +{ + return m_size; +} diff --git a/src/sourcetree/AnimationHelper.h b/src/sourcetree/AnimationHelper.h index 9c86568d0..ab8c0fddc 100644 --- a/src/sourcetree/AnimationHelper.h +++ b/src/sourcetree/AnimationHelper.h @@ -34,8 +34,8 @@ class AnimationHelper: public QObject public: AnimationHelper( const QModelIndex& index, QObject *parent = 0 ); - QSize originalSize() const { return m_startSize; } - QSize size() const { return m_size; } + QSize originalSize() const; + QSize size() const; bool initialized() const; void initialize( const QSize& startValue, const QSize& endValue, int duration ); diff --git a/src/sourcetree/SourcesModel.cpp b/src/sourcetree/SourcesModel.cpp index 4f2b4891d..95b200294 100644 --- a/src/sourcetree/SourcesModel.cpp +++ b/src/sourcetree/SourcesModel.cpp @@ -674,3 +674,10 @@ SourcesModel::itemToggleExpandRequest( SourceTreeItem *item ) { emit toggleExpandRequest( QPersistentModelIndex( indexFromItem( item ) ) ); } + + +QList< source_ptr > +SourcesModel::sourcesWithViewPage() const +{ + return m_sourcesWithViewPage; +} diff --git a/src/sourcetree/SourcesModel.h b/src/sourcetree/SourcesModel.h index 314c03295..03ed2dd43 100644 --- a/src/sourcetree/SourcesModel.h +++ b/src/sourcetree/SourcesModel.h @@ -108,7 +108,7 @@ public: QModelIndex indexFromItem( SourceTreeItem* item ) const; - QList< Tomahawk::source_ptr > sourcesWithViewPage() const { return m_sourcesWithViewPage; } + QList< Tomahawk::source_ptr > sourcesWithViewPage() const; public slots: void loadSources(); diff --git a/src/sourcetree/items/CategoryItems.cpp b/src/sourcetree/items/CategoryItems.cpp index 1956ea0af..6fb2f94d3 100644 --- a/src/sourcetree/items/CategoryItems.cpp +++ b/src/sourcetree/items/CategoryItems.cpp @@ -378,3 +378,31 @@ CategoryItem::activate() { emit toggleExpandRequest( this ); } + + +QString +CategoryItem::text() const +{ + switch( m_category ) + { + case SourcesModel::PlaylistsCategory: + return tr( "Playlists" ); + case SourcesModel::StationsCategory: + return tr( "Stations" ); + } + return QString(); +} + + +Qt::ItemFlags +CategoryItem::flags() const +{ + return Qt::ItemIsEnabled; +} + + +SourcesModel::CategoryType +CategoryItem::categoryType() +{ + return m_category; +} diff --git a/src/sourcetree/items/CategoryItems.h b/src/sourcetree/items/CategoryItems.h index 85db4578f..d32b56695 100644 --- a/src/sourcetree/items/CategoryItems.h +++ b/src/sourcetree/items/CategoryItems.h @@ -56,25 +56,16 @@ class CategoryItem : public SourceTreeItem public: CategoryItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType category, bool showAddItem ); - virtual QString text() const { - switch( m_category ) - { - case SourcesModel::PlaylistsCategory: - return tr( "Playlists" ); - case SourcesModel::StationsCategory: - return tr( "Stations" ); - } - return QString(); - } + virtual QString text() const; virtual void activate(); virtual int peerSortValue() const; - virtual Qt::ItemFlags flags() const { return Qt::ItemIsEnabled; } + virtual Qt::ItemFlags flags() const; // inserts an item at the end, but before the category add item void insertItem( SourceTreeItem* item ); void insertItems( QList< SourceTreeItem* > item ); - SourcesModel::CategoryType categoryType() { return m_category; } + SourcesModel::CategoryType categoryType(); private: SourcesModel::CategoryType m_category; diff --git a/src/sourcetree/items/GenericPageItems.cpp b/src/sourcetree/items/GenericPageItems.cpp index 97a790ad3..e57f243d9 100644 --- a/src/sourcetree/items/GenericPageItems.cpp +++ b/src/sourcetree/items/GenericPageItems.cpp @@ -99,3 +99,17 @@ GenericPageItem::isBeingPlayed() const return false; } + + +int +GenericPageItem::peerSortValue() const +{ + return m_sortValue; +} + + +void +GenericPageItem::setSortValue(int value) +{ + m_sortValue = value; +} diff --git a/src/sourcetree/items/GenericPageItems.h b/src/sourcetree/items/GenericPageItems.h index 971621261..e508fb598 100644 --- a/src/sourcetree/items/GenericPageItems.h +++ b/src/sourcetree/items/GenericPageItems.h @@ -37,11 +37,11 @@ public: virtual void activate(); virtual bool willAcceptDrag( const QMimeData* data ) const; virtual QIcon icon() const; - virtual int peerSortValue() const { return m_sortValue; } // How to sort relative to peers in the tree. + virtual int peerSortValue() const; // How to sort relative to peers in the tree. virtual bool isBeingPlayed() const; void setText( const QString& text ); - void setSortValue( int value ) { m_sortValue = value; } + void setSortValue( int value ); signals: void activated(); diff --git a/src/sourcetree/items/GroupItem.cpp b/src/sourcetree/items/GroupItem.cpp index d78228032..094b2f15a 100644 --- a/src/sourcetree/items/GroupItem.cpp +++ b/src/sourcetree/items/GroupItem.cpp @@ -71,3 +71,33 @@ GroupItem::text() const { return m_text; } + + +bool +GroupItem::willAcceptDrag(const QMimeData* data) const +{ + Q_UNUSED( data ); + return false; +} + + +QIcon +GroupItem::icon() const +{ + return QIcon(); +} + + +bool +GroupItem::isBeingPlayed() const +{ + return false; +} + + +void +GroupItem::setDefaultExpanded(bool b) +{ + m_defaultExpanded = b; +} + diff --git a/src/sourcetree/items/GroupItem.h b/src/sourcetree/items/GroupItem.h index 987096a5b..bfd03bdf5 100644 --- a/src/sourcetree/items/GroupItem.h +++ b/src/sourcetree/items/GroupItem.h @@ -34,12 +34,12 @@ public: virtual ~GroupItem(); virtual QString text() const; - virtual bool willAcceptDrag( const QMimeData* data ) const { Q_UNUSED( data ); return false; } - virtual QIcon icon() const { return QIcon(); } - virtual bool isBeingPlayed() const { return false; } + virtual bool willAcceptDrag( const QMimeData* data ) const; + virtual QIcon icon() const; + virtual bool isBeingPlayed() const; void checkExpandedState(); - void setDefaultExpanded( bool b ) { m_defaultExpanded = b; } + void setDefaultExpanded( bool b ); public slots: virtual void activate(); diff --git a/src/sourcetree/items/LovedTracksItem.cpp b/src/sourcetree/items/LovedTracksItem.cpp index 4623b3437..259c5b344 100644 --- a/src/sourcetree/items/LovedTracksItem.cpp +++ b/src/sourcetree/items/LovedTracksItem.cpp @@ -57,6 +57,13 @@ LovedTracksItem::text() const } +QIcon +LovedTracksItem::icon() const +{ + return QIcon( RESPATH "images/loved_playlist.png" ); +} + + void LovedTracksItem::activate() { @@ -134,10 +141,23 @@ LovedTracksItem::dropMimeData( const QMimeData* data, Qt::DropAction action ) } +int +LovedTracksItem::peerSortValue() const +{ + return m_sortValue; +} + + +void +LovedTracksItem::setSortValue(int value) +{ + m_sortValue = value; +} + + void LovedTracksItem::loveDroppedTracks( QList< Tomahawk::query_ptr > qrys ) { foreach( Tomahawk::query_ptr qry, qrys ) qry->setLoved( true ); } - diff --git a/src/sourcetree/items/LovedTracksItem.h b/src/sourcetree/items/LovedTracksItem.h index 815fea1b8..fb71e8106 100644 --- a/src/sourcetree/items/LovedTracksItem.h +++ b/src/sourcetree/items/LovedTracksItem.h @@ -34,15 +34,15 @@ public: virtual ~LovedTracksItem(); virtual QString text() const; - virtual QIcon icon() const { return QIcon( RESPATH "images/loved_playlist.png" ); } - virtual int peerSortValue() const { return m_sortValue; } + virtual QIcon icon() const; + virtual int peerSortValue() const; virtual void activate(); virtual bool willAcceptDrag( const QMimeData* data ) const; virtual DropTypes supportedDropTypes( const QMimeData* data ) const; virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action ); - void setSortValue( int value ) { m_sortValue = value; } + void setSortValue( int value ); private slots: void loveDroppedTracks( QList< Tomahawk::query_ptr > qrys ); diff --git a/src/sourcetree/items/PlaylistItems.cpp b/src/sourcetree/items/PlaylistItems.cpp index 978db3f2d..16dd8bd47 100644 --- a/src/sourcetree/items/PlaylistItems.cpp +++ b/src/sourcetree/items/PlaylistItems.cpp @@ -610,3 +610,23 @@ DynamicPlaylistItem::isBeingPlayed() const return false; } + +bool +PlaylistItem::canSubscribe() const +{ + return m_canSubscribe; +} + + +bool +PlaylistItem::subscribed() const +{ + return m_showSubscribed; +} + + +QPixmap +PlaylistItem::subscribedIcon() const +{ + return m_showSubscribed ? m_subscribedOnIcon : m_subscribedOffIcon; +} diff --git a/src/sourcetree/items/PlaylistItems.h b/src/sourcetree/items/PlaylistItems.h index 7f346b0f5..1b7e1e3e7 100644 --- a/src/sourcetree/items/PlaylistItems.h +++ b/src/sourcetree/items/PlaylistItems.h @@ -43,9 +43,9 @@ public: virtual SourceTreeItem* activateCurrent(); // subscription management - bool canSubscribe() const { return m_canSubscribe; } - bool subscribed() const { return m_showSubscribed; } - QPixmap subscribedIcon() const { return m_showSubscribed ? m_subscribedOnIcon : m_subscribedOffIcon; } + bool canSubscribe() const; + bool subscribed() const; + QPixmap subscribedIcon() const; void setSubscribed( bool subscribed ); bool collaborative() const; diff --git a/src/sourcetree/items/SourceItem.cpp b/src/sourcetree/items/SourceItem.cpp index a70e4228c..770ad9382 100644 --- a/src/sourcetree/items/SourceItem.cpp +++ b/src/sourcetree/items/SourceItem.cpp @@ -581,3 +581,31 @@ SourceItem::getRecentPlaysPage() const { return m_recentPlaysPage; } + + +CategoryItem* +SourceItem::stationsCategory() const +{ + return m_stations; +} + + +CategoryItem* +SourceItem::playlistsCategory() const +{ + return m_playlists; +} + + +void +SourceItem::setStationsCategory(CategoryItem* item) +{ + m_stations = item; +} + + +void +SourceItem::setPlaylistsCategory(CategoryItem* item) +{ + m_playlists = item; +} diff --git a/src/sourcetree/items/SourceItem.h b/src/sourcetree/items/SourceItem.h index 891db69a9..e7a762e04 100644 --- a/src/sourcetree/items/SourceItem.h +++ b/src/sourcetree/items/SourceItem.h @@ -48,10 +48,10 @@ public: Tomahawk::source_ptr source() const; - CategoryItem* stationsCategory() const { return m_stations; } - CategoryItem* playlistsCategory() const { return m_playlists; } - void setStationsCategory( CategoryItem* item ) { m_stations = item; } - void setPlaylistsCategory( CategoryItem* item ) { m_playlists = item; } + CategoryItem* stationsCategory() const; + CategoryItem* playlistsCategory() const; + void setStationsCategory( CategoryItem* item ); + void setPlaylistsCategory( CategoryItem* item ); public slots: virtual void activate(); diff --git a/src/sourcetree/items/SourceTreeItem.cpp b/src/sourcetree/items/SourceTreeItem.cpp index d169e8c51..2225c6b09 100644 --- a/src/sourcetree/items/SourceTreeItem.cpp +++ b/src/sourcetree/items/SourceTreeItem.cpp @@ -54,3 +54,193 @@ SourceTreeItem::~SourceTreeItem() { qDeleteAll( m_children ); } + + +SourcesModel::RowType +SourceTreeItem::type() const +{ + return m_type; +} + + +SourceTreeItem* +SourceTreeItem::parent() const +{ + return m_parent; +} + + +SourcesModel* +SourceTreeItem::model() const +{ + return m_model; +} + + +QList< SourceTreeItem* > +SourceTreeItem::children() const +{ + return m_children; +} + + +void +SourceTreeItem::appendChild(SourceTreeItem* item) +{ + m_children.append( item ); +} + + +void +SourceTreeItem::insertChild(int index, SourceTreeItem* item) +{ + m_children.insert( index, item ); +} + + +void +SourceTreeItem::removeChild(SourceTreeItem* item) +{ + m_children.removeAll( item ); +} + + +QString +SourceTreeItem::text() const +{ + return QString(); +} + + +QString +SourceTreeItem::tooltip() const +{ + return QString(); +} + + +Qt::ItemFlags +SourceTreeItem::flags() const +{ + return Qt::ItemIsSelectable | Qt::ItemIsEnabled; +} + + +QIcon +SourceTreeItem::icon() const +{ + return QIcon(); +} + + +bool +SourceTreeItem::willAcceptDrag(const QMimeData*) const +{ + return false; +} + + +bool +SourceTreeItem::dropMimeData(const QMimeData*, Qt::DropAction) +{ + return false; +} + + +bool +SourceTreeItem::setData(const QVariant&, bool) +{ + return false; +} + + +int +SourceTreeItem::peerSortValue() const +{ + return m_peerSortValue; +} + + +int +SourceTreeItem::IDValue() const +{ + return 0; +} + + +SourceTreeItem::DropTypes +SourceTreeItem::supportedDropTypes(const QMimeData* mimeData) const +{ + Q_UNUSED( mimeData ); + return DropTypesNone; +} + + +void +SourceTreeItem::setDropType(SourceTreeItem::DropType type) +{ + m_dropType = type; +} + + +SourceTreeItem::DropType +SourceTreeItem::dropType() const +{ + return m_dropType; +} + + +bool +SourceTreeItem::isBeingPlayed() const +{ + return false; +} + + +QList< QAction* > +SourceTreeItem::customActions() const +{ + return QList< QAction* >(); +} + + +void +SourceTreeItem::beginRowsAdded(int from, int to) +{ + emit beginChildRowsAdded( from, to ); +} + + +void +SourceTreeItem::endRowsAdded() +{ + emit childRowsAdded(); +} + + +void +SourceTreeItem::beginRowsRemoved(int from, int to) +{ + emit beginChildRowsRemoved( from, to ); +} + + +void +SourceTreeItem::endRowsRemoved() +{ + emit childRowsRemoved(); +} + + +void +SourceTreeItem::setRowType(SourcesModel::RowType t) +{ + m_type = t; +} + + +void +SourceTreeItem::setParentItem(SourceTreeItem* item) +{ + m_parent = item; +} diff --git a/src/sourcetree/items/SourceTreeItem.h b/src/sourcetree/items/SourceTreeItem.h index b89fa6430..ea7dbe880 100644 --- a/src/sourcetree/items/SourceTreeItem.h +++ b/src/sourcetree/items/SourceTreeItem.h @@ -47,36 +47,36 @@ public: virtual ~SourceTreeItem(); // generic info used by the tree model - SourcesModel::RowType type() const { return m_type; } - SourceTreeItem* parent() const { return m_parent; } - SourcesModel* model() const { return m_model; } + SourcesModel::RowType type() const; + SourceTreeItem* parent() const; + SourcesModel* model() const; - QList< SourceTreeItem* > children() const { return m_children; } - void appendChild( SourceTreeItem* item ) { m_children.append( item ); } - void insertChild( int index, SourceTreeItem* item ) { m_children.insert( index, item ); } - void removeChild( SourceTreeItem* item ) { m_children.removeAll( item ); } + QList< SourceTreeItem* > children() const; + void appendChild( SourceTreeItem* item ); + void insertChild( int index, SourceTreeItem* item ); + void removeChild( SourceTreeItem* item ); // varies depending on the type of the item - virtual QString text() const { return QString(); } - virtual QString tooltip() const { return QString(); } - virtual Qt::ItemFlags flags() const { return Qt::ItemIsSelectable | Qt::ItemIsEnabled; } - virtual QIcon icon() const { return QIcon(); } - virtual bool willAcceptDrag( const QMimeData* ) const { return false; } - virtual bool dropMimeData( const QMimeData*, Qt::DropAction ) { return false; } - virtual bool setData( const QVariant&, bool ) { return false; } - virtual int peerSortValue() const { return m_peerSortValue; } // How to sort relative to peers in the tree. - virtual int IDValue() const { return 0; } - virtual DropTypes supportedDropTypes( const QMimeData* mimeData ) const { Q_UNUSED( mimeData ); return DropTypesNone; } - virtual void setDropType( DropType type ) { m_dropType = type; } - virtual DropType dropType() const { return m_dropType; } - virtual bool isBeingPlayed() const { return false; } - virtual QList< QAction* > customActions() const { return QList< QAction* >(); } + virtual QString text() const; + virtual QString tooltip() const; + virtual Qt::ItemFlags flags() const; + virtual QIcon icon() const; + virtual bool willAcceptDrag( const QMimeData* ) const; + virtual bool dropMimeData( const QMimeData*, Qt::DropAction ); + virtual bool setData( const QVariant&, bool ); + virtual int peerSortValue() const; // How to sort relative to peers in the tree. + virtual int IDValue() const; + virtual DropTypes supportedDropTypes( const QMimeData* mimeData ) const; + virtual void setDropType( DropType type ); + virtual DropType dropType() const; + virtual bool isBeingPlayed() const; + virtual QList< QAction* > customActions() const; /// don't call me unless you are a sourcetreeitem. i prefer this to making everyone a friend - void beginRowsAdded( int from, int to ) { emit beginChildRowsAdded( from, to ); } - void endRowsAdded() { emit childRowsAdded(); } - void beginRowsRemoved( int from, int to ) { emit beginChildRowsRemoved( from, to ); } - void endRowsRemoved() { emit childRowsRemoved(); } + void beginRowsAdded( int from, int to ); + void endRowsAdded(); + void beginRowsRemoved( int from, int to ); + void endRowsRemoved(); public slots: virtual void activate() {} @@ -95,8 +95,8 @@ signals: void childRowsRemoved(); protected: - void setRowType( SourcesModel::RowType t ) { m_type = t; } - void setParentItem( SourceTreeItem* item ) { m_parent = item; } + void setRowType( SourcesModel::RowType t ); + void setParentItem( SourceTreeItem* item ); private: SourcesModel::RowType m_type; diff --git a/src/sourcetree/items/TemporaryPageItem.cpp b/src/sourcetree/items/TemporaryPageItem.cpp index 25bd2413c..9c5f13e78 100644 --- a/src/sourcetree/items/TemporaryPageItem.cpp +++ b/src/sourcetree/items/TemporaryPageItem.cpp @@ -171,3 +171,24 @@ TemporaryPageItem::linkActionTriggered( QAction* action ) } } } + + +QList< QAction* > +TemporaryPageItem::customActions() const +{ + return m_customActions; +} + + +ViewPage* +TemporaryPageItem::page() const +{ + return m_page; +} + + +bool +TemporaryPageItem::isBeingPlayed() const +{ + return m_page->isBeingPlayed(); +} diff --git a/src/sourcetree/items/TemporaryPageItem.h b/src/sourcetree/items/TemporaryPageItem.h index 72350d87f..72d1280e3 100644 --- a/src/sourcetree/items/TemporaryPageItem.h +++ b/src/sourcetree/items/TemporaryPageItem.h @@ -36,10 +36,10 @@ public: virtual QIcon icon() const; virtual int peerSortValue() const; virtual int IDValue() const; - virtual QList< QAction* > customActions() const { return m_customActions; } + virtual QList< QAction* > customActions() const; - Tomahawk::ViewPage* page() const { return m_page; } - virtual bool isBeingPlayed() const { return m_page->isBeingPlayed(); } + Tomahawk::ViewPage* page() const; + virtual bool isBeingPlayed() const; public slots: void removeFromList(); diff --git a/src/web/Api_v1.cpp b/src/web/Api_v1.cpp index a70146be0..819d8c6a2 100644 --- a/src/web/Api_v1.cpp +++ b/src/web/Api_v1.cpp @@ -34,6 +34,11 @@ using namespace Tomahawk; +Api_v1::Api_v1(QxtAbstractWebSessionManager* sm, QObject* parent) + : QxtWebSlotService(sm, parent) +{ +} + void Api_v1::auth_1( QxtWebRequestEvent* event, QString arg ) diff --git a/src/web/Api_v1.h b/src/web/Api_v1.h index c068419fd..3d1739aab 100644 --- a/src/web/Api_v1.h +++ b/src/web/Api_v1.h @@ -42,10 +42,7 @@ Q_OBJECT public: - Api_v1( QxtAbstractWebSessionManager* sm, QObject* parent = 0 ) - : QxtWebSlotService( sm, parent ) - { - } + Api_v1( QxtAbstractWebSessionManager* sm, QObject* parent = 0 ); public slots: // authenticating uses /auth_1 diff --git a/src/widgets/ContainedMenuButton.cpp b/src/widgets/ContainedMenuButton.cpp index 308b72fdd..168b35c88 100644 --- a/src/widgets/ContainedMenuButton.cpp +++ b/src/widgets/ContainedMenuButton.cpp @@ -50,3 +50,10 @@ ContainedMenuButton::menuHidden() { setDown( false ); } + + +QMenu* +ContainedMenuButton::menu() const +{ + return m_menu; +} diff --git a/src/widgets/ContainedMenuButton.h b/src/widgets/ContainedMenuButton.h index 5a62b7d23..4642c3243 100644 --- a/src/widgets/ContainedMenuButton.h +++ b/src/widgets/ContainedMenuButton.h @@ -34,7 +34,7 @@ public: explicit ContainedMenuButton( QWidget *parent = 0 ); void setMenu( QMenu *menu ); - QMenu *menu() const { return m_menu; } + QMenu *menu() const; protected: void mousePressEvent( QMouseEvent *event ); diff --git a/src/widgets/SlideSwitchButton.h b/src/widgets/SlideSwitchButton.h index 4b8c3b329..496993bcd 100644 --- a/src/widgets/SlideSwitchButton.h +++ b/src/widgets/SlideSwitchButton.h @@ -45,21 +45,21 @@ public: void init(); virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const { return sizeHint(); } + virtual QSize minimumSizeHint() const; //the back check-state cannot be changed by the user, only programmatically //to notify that the user-requested operation has completed void setBackChecked( bool state ); bool backChecked() const; - void setKnobX( qreal x ) { m_knobX = x; repaint(); } - qreal knobX() const { return m_knobX; } + void setKnobX( qreal x ); + qreal knobX() const; - void setBaseColorTop( const QColor& color ) { m_baseColorTop = color; repaint(); } - QColor baseColorTop() const { return m_baseColorTop; } + void setBaseColorTop( const QColor& color ); + QColor baseColorTop() const; - void setBaseColorBottom( const QColor& color ) { m_baseColorBottom = color; } - QColor baseColorBottom() const { return m_baseColorBottom; } + void setBaseColorBottom( const QColor& color ); + QColor baseColorBottom() const; protected: void paintEvent( QPaintEvent* event ); diff --git a/src/widgets/UnstyledFrame.h b/src/widgets/UnstyledFrame.h index 929b2c041..c016abd16 100644 --- a/src/widgets/UnstyledFrame.h +++ b/src/widgets/UnstyledFrame.h @@ -32,7 +32,7 @@ class UnstyledFrame : public QWidget public: explicit UnstyledFrame( QWidget* parent = 0 ); - void setFrameColor( const QColor& color ) { m_frameColor = color; repaint(); } + void setFrameColor( const QColor& color ); protected: void paintEvent( QPaintEvent* event );