From 8fbc0319ba08a82504c5aede011504ec9c1959cc Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 9 Feb 2016 23:59:43 +0100 Subject: [PATCH 1/2] Erase elements from QStringList safely --- src/libtomahawk/DropJob.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/DropJob.cpp b/src/libtomahawk/DropJob.cpp index c301bb610..fc9663cda 100644 --- a/src/libtomahawk/DropJob.cpp +++ b/src/libtomahawk/DropJob.cpp @@ -263,9 +263,14 @@ bool DropJob::validateLocalFiles(const QString &paths, const QString &suffix) { QStringList filePaths = paths.split( QRegExp( "\\s+" ), QString::SkipEmptyParts ); - for ( QStringList::iterator it = filePaths.begin(); it != filePaths.end(); ++it ) + QStringList::iterator it = filePaths.begin(); + while ( it != filePaths.end() ) + { if ( !validateLocalFile( *it, suffix ) ) - filePaths.erase( it ); + it = filePaths.erase( it ); + else + ++it; + } return !filePaths.isEmpty(); } From f81858e28a357116676b26732c98b49dcf17bae0 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 10 Feb 2016 00:07:09 +0100 Subject: [PATCH 2/2] pass by reference --- src/libtomahawk/audio/AudioEngine.cpp | 2 +- src/libtomahawk/audio/AudioEngine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index 008353642..71a708bdd 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -669,7 +669,7 @@ AudioEngine::performLoadIODevice( const result_ptr& result, const QString& url ) void -AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ) +AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io ) { if ( QThread::currentThread() != thread() ) { diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h index 674b50099..bc129c383 100644 --- a/src/libtomahawk/audio/AudioEngine.h +++ b/src/libtomahawk/audio/AudioEngine.h @@ -186,7 +186,7 @@ private slots: void performLoadIODevice( const Tomahawk::result_ptr& result, const QString& url ); //only call from loadTrack kthxbi - void performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi + void performLoadTrack( const Tomahawk::result_ptr result, const QString& url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi void loadPreviousTrack(); void loadNextTrack();