From 58b640d389ff2eaaa9d84e4d41cbc93abc77675c Mon Sep 17 00:00:00 2001 From: Romanov Date: Fri, 22 Apr 2016 11:24:14 -0700 Subject: [PATCH] Mark overrides as such --- src/accounts/xmpp/XmppInfoPlugin.h | 8 ++++---- src/accounts/zeroconf/Zeroconf.h | 8 ++++---- .../database/DatabaseCommand_AllArtists.h | 4 ++-- .../database/DatabaseCommand_AllTracks.h | 2 +- src/libtomahawk/database/DatabaseResolver.h | 6 +++--- src/libtomahawk/network/DbSyncConnection.h | 4 ++-- src/libtomahawk/playlist/PlayableProxyModel.h | 10 +++++----- .../resolvers/ScriptCommand_AllAlbums.h | 8 ++++---- .../resolvers/ScriptCommand_AllArtists.h | 4 ++-- .../resolvers/ScriptCommand_AllTracks.h | 4 ++-- .../resolvers/ScriptCommand_LookupUrl.h | 2 +- src/tomahawk/sourcetree/items/CollectionItem.h | 8 ++++---- src/viewpages/whatsnew_0_8/WhatsNew_0_8.h | 14 +++++++------- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/accounts/xmpp/XmppInfoPlugin.h b/src/accounts/xmpp/XmppInfoPlugin.h index 92916cb4a..1a87deaaf 100644 --- a/src/accounts/xmpp/XmppInfoPlugin.h +++ b/src/accounts/xmpp/XmppInfoPlugin.h @@ -44,12 +44,12 @@ namespace Tomahawk { void publishTune( QUrl url, Tomahawk::InfoSystem::InfoStringHash trackInfo ); public slots: - void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ); + void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ) override; protected slots: - void init(); - void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ); - void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ); + void init() override; + void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ) override; + void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) override; private slots: void audioStarted( const Tomahawk::InfoSystem::PushInfoPair& pushInfoPair ); diff --git a/src/accounts/zeroconf/Zeroconf.h b/src/accounts/zeroconf/Zeroconf.h index cca443d0a..4bbd509c6 100644 --- a/src/accounts/zeroconf/Zeroconf.h +++ b/src/accounts/zeroconf/Zeroconf.h @@ -54,14 +54,14 @@ public: Account::ConnectionState connectionState() const; public slots: - void connectPlugin(); - void disconnectPlugin(); + void connectPlugin() override; + void disconnectPlugin() override; void advertise(); - virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& /* receiver */, const QList& /* info */ ) {} + virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& /* receiver */, const QList& /* info */ ) override {} void broadcastMsg( const QString& ) {} - bool addContact( const QString&, AddContactOptions, const QString& ) { return false; } + bool addContact( const QString&, AddContactOptions, const QString& ) override { return false; } private slots: void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid ); diff --git a/src/libtomahawk/database/DatabaseCommand_AllArtists.h b/src/libtomahawk/database/DatabaseCommand_AllArtists.h index 6943b0e7e..502d052c5 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllArtists.h +++ b/src/libtomahawk/database/DatabaseCommand_AllArtists.h @@ -59,10 +59,10 @@ public: void setLimit( unsigned int amount ) { m_amount = amount; } void setSortOrder( DatabaseCommand_AllArtists::SortOrder order ) { m_sortOrder = order; } void setSortDescending( bool descending ) { m_sortDescending = descending; } - void setFilter( const QString& filter ) { m_filter = filter; } + void setFilter( const QString& filter ) override { m_filter = filter; } signals: - void artists( const QList& ); + void artists( const QList& ) override; void done(); private: diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.h b/src/libtomahawk/database/DatabaseCommand_AllTracks.h index 0053517c5..db8cfee5d 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllTracks.h +++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.h @@ -74,7 +74,7 @@ public: signals: void tracks( const QList&, const QVariant& data ); - void tracks( const QList& ); + void tracks( const QList& ) override; void done( const Tomahawk::collection_ptr& ); private: diff --git a/src/libtomahawk/database/DatabaseResolver.h b/src/libtomahawk/database/DatabaseResolver.h index de5ac0c4d..a14d66d0b 100644 --- a/src/libtomahawk/database/DatabaseResolver.h +++ b/src/libtomahawk/database/DatabaseResolver.h @@ -34,11 +34,11 @@ public: explicit DatabaseResolver( int weight ); QString name() const override; - virtual unsigned int weight() const { return m_weight; } - virtual unsigned int timeout() const { return 0; } + virtual unsigned int weight() const override{ return m_weight; } + virtual unsigned int timeout() const override{ return 0; } public slots: - virtual void resolve( const Tomahawk::query_ptr& query ); + virtual void resolve( const Tomahawk::query_ptr& query ) override; private slots: void gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results ); diff --git a/src/libtomahawk/network/DbSyncConnection.h b/src/libtomahawk/network/DbSyncConnection.h index 5616e4d93..a6abe7416 100644 --- a/src/libtomahawk/network/DbSyncConnection.h +++ b/src/libtomahawk/network/DbSyncConnection.h @@ -42,8 +42,8 @@ public: explicit DBSyncConnection( Servent* s, const Tomahawk::source_ptr& src ); virtual ~DBSyncConnection(); - void setup(); - Connection* clone(); + void setup() override; + Connection* clone() override; signals: void stateChanged( Tomahawk::DBSyncConnectionState newstate, Tomahawk::DBSyncConnectionState oldstate, const QString& info ); diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h index 93656e3cc..0cc943ed0 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.h +++ b/src/libtomahawk/playlist/PlayableProxyModel.h @@ -59,7 +59,7 @@ public: PlayableModel* sourceModel() const { return m_model; } virtual void setSourcePlayableModel( PlayableModel* sourceModel ); - virtual void setSourceModel( QAbstractItemModel* model ); + virtual void setSourceModel( QAbstractItemModel* model ) override; virtual bool isLoading() const; @@ -91,9 +91,9 @@ public: QList< double > columnWeights() const; - virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const; - virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; - virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const; + virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const override; + virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; + virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const override; virtual void setFilter( const QString& pattern ); virtual void updateDetailedInfo( const QModelIndex& index ); @@ -120,7 +120,7 @@ signals: protected: bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const Q_DECL_OVERRIDE; - virtual bool lessThan( const QModelIndex& left, const QModelIndex& right ) const; + virtual bool lessThan( const QModelIndex& left, const QModelIndex& right ) const override; Tomahawk::playlistinterface_ptr m_playlistInterface; diff --git a/src/libtomahawk/resolvers/ScriptCommand_AllAlbums.h b/src/libtomahawk/resolvers/ScriptCommand_AllAlbums.h index 676cc0671..eea911e32 100644 --- a/src/libtomahawk/resolvers/ScriptCommand_AllAlbums.h +++ b/src/libtomahawk/resolvers/ScriptCommand_AllAlbums.h @@ -41,12 +41,12 @@ public: void setFilter( const QString& filter ) override; signals: - void albums( const QList< Tomahawk::album_ptr >& ); - void done(); + void albums( const QList< Tomahawk::album_ptr >& ) override; + void done() override; protected: - virtual void exec(); - virtual void reportFailure(); + virtual void exec() override; + virtual void reportFailure() override; private slots: void onAlbumsJobDone( const QVariantMap& result ); diff --git a/src/libtomahawk/resolvers/ScriptCommand_AllArtists.h b/src/libtomahawk/resolvers/ScriptCommand_AllArtists.h index 4225284f4..f928f6b12 100644 --- a/src/libtomahawk/resolvers/ScriptCommand_AllArtists.h +++ b/src/libtomahawk/resolvers/ScriptCommand_AllArtists.h @@ -42,8 +42,8 @@ public: void setFilter( const QString& filter ) override; signals: - void artists( const QList< Tomahawk::artist_ptr >& ); - void done(); + void artists( const QList< Tomahawk::artist_ptr >& ) override; + void done() override; protected: void exec() override; diff --git a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.h b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.h index 3106e9582..233d79014 100644 --- a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.h +++ b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.h @@ -39,8 +39,8 @@ public: void enqueue() override; signals: - void tracks( const QList< Tomahawk::query_ptr >& ); - void done(); + void tracks( const QList< Tomahawk::query_ptr >& ) override; + void done() override; protected: Q_INVOKABLE void exec() override; diff --git a/src/libtomahawk/resolvers/ScriptCommand_LookupUrl.h b/src/libtomahawk/resolvers/ScriptCommand_LookupUrl.h index 7f68e37a1..985eab007 100644 --- a/src/libtomahawk/resolvers/ScriptCommand_LookupUrl.h +++ b/src/libtomahawk/resolvers/ScriptCommand_LookupUrl.h @@ -45,7 +45,7 @@ public: signals: void information( const QString& url, const QSharedPointer& variant ); - void done(); + void done() override; protected: void exec() override; diff --git a/src/tomahawk/sourcetree/items/CollectionItem.h b/src/tomahawk/sourcetree/items/CollectionItem.h index 3f1a2a2bb..edbff438f 100644 --- a/src/tomahawk/sourcetree/items/CollectionItem.h +++ b/src/tomahawk/sourcetree/items/CollectionItem.h @@ -30,9 +30,9 @@ public: explicit CollectionItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::collection_ptr& collection ); virtual ~CollectionItem(); - virtual QString text() const; - virtual QIcon icon() const; - virtual int peerSortValue() const; + virtual QString text() const override; + virtual QIcon icon() const override; + virtual int peerSortValue() const override; void setSortValue( int value ); bool isBeingPlayed() const override; @@ -40,7 +40,7 @@ public: int trackCount() const; public slots: - virtual void activate(); + virtual void activate() override; private: int m_sortValue; diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h index b30a71edb..97864e5f3 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h @@ -85,17 +85,17 @@ public: WhatsNew_0_8( QWidget* parent = 0 ); virtual ~WhatsNew_0_8(); - const QString defaultName() { return WHATSNEW_0_8_VIEWPAGE_NAME; } - QString title() const { return tr( "What's new in 0.8?" ); } - QString description() const { return tr( "An overview of the changes and additions since 0.7." ); } - const QString pixmapPath() const { return ( RESPATH "images/whatsnew.svg" ); } + const QString defaultName() override { return WHATSNEW_0_8_VIEWPAGE_NAME; } + QString title() const override { return tr( "What's new in 0.8?" ); } + QString description() const override { return tr( "An overview of the changes and additions since 0.7." ); } + const QString pixmapPath() const override { return ( RESPATH "images/whatsnew.svg" ); } - bool addPageItem() const; + bool addPageItem() const override; bool isRemovable() const override { return true; } bool isDeletable() const override { return false; } - void onItemDeleted(); + void onItemDeleted() override; - int sortValue() { return 1; } + int sortValue() override { return 1; } };