diff --git a/src/libtomahawk/resolvers/ScriptCollection.cpp b/src/libtomahawk/resolvers/ScriptCollection.cpp index 9cfba5b66..a1e21335e 100644 --- a/src/libtomahawk/resolvers/ScriptCollection.cpp +++ b/src/libtomahawk/resolvers/ScriptCollection.cpp @@ -137,7 +137,7 @@ Tomahawk::ArtistsRequest* ScriptCollection::requestArtists() { Tomahawk::collection_ptr thisCollection = m_resolver->collections().value( name() ); - if ( thisCollection->name() != this->name() ) + if ( thisCollection->name() != name() ) return 0; Tomahawk::ArtistsRequest* cmd = new ScriptCommand_AllArtists( thisCollection ); @@ -150,7 +150,7 @@ Tomahawk::AlbumsRequest* ScriptCollection::requestAlbums( const Tomahawk::artist_ptr& artist ) { Tomahawk::collection_ptr thisCollection = m_resolver->collections().value( name() ); - if ( thisCollection->name() != this->name() ) + if ( thisCollection->name() != name() ) return 0; Tomahawk::AlbumsRequest* cmd = new ScriptCommand_AllAlbums( thisCollection, artist ); @@ -163,7 +163,7 @@ Tomahawk::TracksRequest* ScriptCollection::requestTracks( const Tomahawk::album_ptr& album ) { Tomahawk::collection_ptr thisCollection = m_resolver->collections().value( name() ); - if ( thisCollection->name() != this->name() ) + if ( thisCollection->name() != name() ) return 0; Tomahawk::TracksRequest* cmd = new ScriptCommand_AllTracks( thisCollection, album ); diff --git a/src/libtomahawk/resolvers/ScriptCollection.h b/src/libtomahawk/resolvers/ScriptCollection.h index 1dbbfc549..5d1459f2c 100644 --- a/src/libtomahawk/resolvers/ScriptCollection.h +++ b/src/libtomahawk/resolvers/ScriptCollection.h @@ -1,6 +1,7 @@ /* === This file is part of Tomahawk Player - === * * Copyright 2013, Teo Mrnjavac + * Copyright 2014, Uwe L. Korn * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,7 +42,7 @@ class DLLEXPORT ScriptCollection : public Collection public: explicit ScriptCollection( const source_ptr& source, ExternalResolver* resolver, - QObject* parent = 0 ); + QObject* parent = nullptr ); virtual ~ScriptCollection(); /** @@ -53,26 +54,26 @@ public: * different from the resolver's name, to identify the specific service rather than just the * resolver. */ - virtual void setServiceName( const QString& name ); - virtual QString prettyName() const; - virtual QString itemName() const; - virtual BackendType backendType() const { return ScriptCollectionType; } + void setServiceName( const QString& name ); + QString prettyName() const override; + QString itemName() const override; + BackendType backendType() const override { return ScriptCollectionType; } - virtual void setIcon( const QIcon& icon ); - virtual QIcon icon() const; - virtual QPixmap bigIcon() const; + void setIcon( const QIcon& icon ); + QIcon icon() const override; + QPixmap bigIcon() const override; - virtual void setDescription( const QString& text ); - virtual QString description() const; + void setDescription( const QString& text ); + QString description() const override; virtual ExternalResolver* resolver() { return m_resolver; } - virtual Tomahawk::ArtistsRequest* requestArtists(); - virtual Tomahawk::AlbumsRequest* requestAlbums( const Tomahawk::artist_ptr& artist ); - virtual Tomahawk::TracksRequest* requestTracks( const Tomahawk::album_ptr& album ); + Tomahawk::ArtistsRequest* requestArtists() override; + Tomahawk::AlbumsRequest* requestAlbums( const Tomahawk::artist_ptr& artist ) override; + Tomahawk::TracksRequest* requestTracks( const Tomahawk::album_ptr& album ) override; - virtual void setTrackCount( int count ); - virtual int trackCount() const; + void setTrackCount( int count ); + int trackCount() const override; private: ExternalResolver* m_resolver;