From 64c11238d44d799e51d71b6ab5d25580824c384c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 18 Oct 2014 00:21:25 +0200 Subject: [PATCH] Modernize DatabaseCommand_AllTracks --- .../database/DatabaseCommand_AllTracks.cpp | 6 ++++-- .../database/DatabaseCommand_AllTracks.h | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp index 7f548533f..f0a6220df 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp @@ -30,6 +30,8 @@ #include "SourceList.h" #include "Track.h" +#include + namespace Tomahawk { @@ -100,7 +102,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi ) // Small cache to keep already created source objects. // This saves some mutex locking. - std::map sourceCache; + std::unordered_map sourceCache; while( query.next() ) { @@ -119,7 +121,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi ) uint albumpos = query.value( 13 ).toUInt(); uint trackId = query.value( 14 ).toUInt(); - std::map::const_iterator _s = sourceCache.find( sourceId ); + std::unordered_map::const_iterator _s = sourceCache.find( sourceId ); Tomahawk::source_ptr s; if ( _s == sourceCache.end() ) { diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.h b/src/libtomahawk/database/DatabaseCommand_AllTracks.h index 05abd9408..4d1869b30 100644 --- a/src/libtomahawk/database/DatabaseCommand_AllTracks.h +++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.h @@ -47,22 +47,22 @@ public: AlbumPosition = 3 }; - explicit DatabaseCommand_AllTracks( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = 0 ) + explicit DatabaseCommand_AllTracks( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = nullptr ) : DatabaseCommand( parent ) , m_collection( collection ) - , m_artist( 0 ) - , m_album( 0 ) + , m_artist( nullptr ) + , m_album( nullptr ) , m_amount( 0 ) , m_sortOrder( DatabaseCommand_AllTracks::None ) , m_sortDescending( false ) {} - virtual void exec( DatabaseImpl* ); + void exec( DatabaseImpl* ) override; - virtual bool doesMutates() const { return false; } - virtual QString commandname() const { return "alltracks"; } + bool doesMutates() const override { return false; } + QString commandname() const override { return "alltracks"; } - virtual void enqueue() { Database::instance()->enqueue( Tomahawk::dbcmd_ptr( this ) ); } + void enqueue() override { Database::instance()->enqueue( Tomahawk::dbcmd_ptr( this ) ); } void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; } void setAlbum( const Tomahawk::album_ptr& album ) { m_album = album; }