Merge branch '2.3' into clazy-returning-void-expression

103 files changed, 459 insertions, 392 deletions

diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp
index c2c609399d..e03220f8e7 100644
--- a/src/library/analysisfeature.cpp
+++ b/src/library/analysisfeature.cpp
@@ -85,7 +85,7 @@ void AnalysisFeature::bindLibraryWidget(WLibrary* libraryWidget,
     connect(m_pAnalysisView,
             &DlgAnalysis::loadTrackToPlayer,
             this,
-            [=](TrackPointer track, QString group) {
+            [=](TrackPointer track, const QString& group) {
                 emit loadTrackToPlayer(track, group, false);
             });
     connect(m_pAnalysisView,
@@ -134,7 +134,7 @@ void AnalysisFeature::activate() {
     emit enableCoverArtDisplay(true);
 }
 
-void AnalysisFeature::analyzeTracks(QList<TrackId> trackIds) {
+void AnalysisFeature::analyzeTracks(const QList<TrackId>& trackIds) {
     if (!m_pTrackAnalysisScheduler) {
         const int numAnalyzerThreads = numberOfAnalyzerThreads();
         kLogger.info()
@@ -229,13 +229,13 @@ void AnalysisFeature::onTrackAnalysisSchedulerFinished() {
     emit analysisActive(false);
 }
 
-bool AnalysisFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
+bool AnalysisFeature::dropAccept(const QList<QUrl>& urls, QObject* pSource) {
     QList<TrackId> trackIds = m_pLibrary->trackCollection().resolveTrackIdsFromUrls(urls,
             !pSource);
     analyzeTracks(trackIds);
     return trackIds.size() > 0;
 }
 
-bool AnalysisFeature::dragMoveAccept(QUrl url) {
+bool AnalysisFeature::dragMoveAccept(const QUrl& url) {
     return SoundSourceProxy::isUrlSupported(url);
 }
diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h
index 50587b046e..a66086a4e7 100644
--- a/src/library/analysisfeature.h
+++ b/src/library/analysisfeature.h
@@ -35,8 +35,8 @@ class AnalysisFeature : public LibraryFeature {
         return m_icon;
     }
 
-    bool dropAccept(QList<QUrl> urls, QObject* pSource) override;
-    bool dragMoveAccept(QUrl url) override;
+    bool dropAccept(const QList<QUrl>& urls, QObject* pSource) override;
+    bool dragMoveAccept(const QUrl& url) override;
     void bindLibraryWidget(WLibrary* libraryWidget,
                     KeyboardEventFilter* keyboard) override;
 
@@ -48,7 +48,7 @@ class AnalysisFeature : public LibraryFeature {
 
   public slots:
     void activate() override;
-    void analyzeTracks(QList<TrackId> trackIds);
+    void analyzeTracks(const QList<TrackId>& trackIds);
 
     void suspendAnalysis();
     void resumeAnalysis();
diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp
index 1b4f394df8..16d728fd1c 100644
--- a/src/library/autodj/autodjfeature.cpp
+++ b/src/library/autodj/autodjfeature.cpp
@@ -166,7 +166,7 @@ void AutoDJFeature::activate() {
     emit enableCoverArtDisplay(true);
 }
 
-bool AutoDJFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
+bool AutoDJFeature::dropAccept(const QList<QUrl>& urls, QObject* pSource) {
     // If a track is dropped onto the Auto DJ tree node, but the track isn't in the
     // library, then add the track to the library before adding it to the
     // Auto DJ playlist.
@@ -182,7 +182,7 @@ bool AutoDJFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
     return m_playlistDao.appendTracksToPlaylist(trackIds, m_iAutoDJPlaylistId);
 }
 
-bool AutoDJFeature::dragMoveAccept(QUrl url) {
+bool AutoDJFeature::dragMoveAccept(const QUrl& url) {
     return SoundSourceProxy::isUrlSupported(url) ||
             Parser::isPlaylistFilenameSupported(url.toLocalFile());
 }
@@ -289,7 +289,7 @@ void AutoDJFeature::constructCrateChildModel() {
 }
 
 void AutoDJFeature::onRightClickChild(const QPoint& globalPos,
-                                      QModelIndex index) {
+        const QModelIndex& index) {
     TreeItem* pClickedItem = static_cast<TreeItem*>(index.internalPointer());
     QMenu menu(m_pSidebarWidget);
     if (m_pCratesTreeItem == pClickedItem) {
diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
index 94f1a986b5..4e0e03a75e 100644
--- a/src/library/autodj/autodjfeature.h
+++ b/src/library/autodj/autodjfeature.h
@@ -41,8 +41,8 @@ class AutoDJFeature : public LibraryFeature {
     QVariant title() override;
     QIcon getIcon() override;
 
-    bool dropAccept(QList<QUrl> urls, QObject* pSource) override;
-    bool dragMoveAccept(QUrl url) override;
+    bool dropAccept(const QList<QUrl>& urls, QObject* pSource) override;
+    bool dragMoveAccept(const QUrl& url) override;
 
     void bindLibraryWidget(WLibrary* libraryWidget,
                     KeyboardEventFilter* keyboard) override;
@@ -58,7 +58,7 @@ class AutoDJFeature : public LibraryFeature {
     void activate() override;
 
     // Temporary, until WCrateTableView can be written.
-    void onRightClickChild(const QPoint& globalPos, QModelIndex index) override;
+    void onRightClickChild(const QPoint& globalPos, const QModelIndex& index) override;
 
   private:
     TrackCollection* const m_pTrackCollection;
diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h
index da51b6d32c..af73c612f6 100644
--- a/src/library/autodj/autodjprocessor.h
+++ b/src/library/autodj/autodjprocessor.h
@@ -203,8 +203,7 @@ class AutoDJProcessor : public QObject {
     AutoDJError toggleAutoDJ(bool enable);
 
   signals:
-    void loadTrackToPlayer(TrackPointer pTrack, QString group,
-                                   bool play);
+    void loadTrackToPlayer(TrackPointer pTrack, const QString& group, bool play);
     void autoDJStateChanged(AutoDJProcessor::AutoDJState state);
     void transitionTimeChanged(int time);
     void randomTrackRequested(int tracksToAdd);
@@ -229,7 +228,7 @@ class AutoDJProcessor : public QObject {
 
   protected:
     // The following virtual signal wrappers are used for testing
-    virtual void emitLoadTrackToPlayer(TrackPointer pTrack, QString group, bool play) {
+    virtual void emitLoadTrackToPlayer(TrackPointer pTrack, const QString& group, bool play) {
         emit loadTrackToPlayer(pTrack, group, play);
     }
     virtual void emitAutoDJStateChanged(AutoDJProcessor::AutoDJState state) {
diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp
index cf6e721841..aede1ad54c 100644
--- a/src/library/autodj/dlgautodj.cpp
+++ b/src/library/autodj/dlgautodj.cpp
@@ -66,7 +66,7 @@ DlgAutoDJ::DlgAutoDJ(
             m_pTrackTableView,
             &WTrackTableView::setSelectedClick);
 
-    QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
+    QBoxLayout* box = qobject_cast<QBoxLayout*>(layout());
     VERIFY_OR_DEBUG_ASSERT(box) { //Assumes the form layout is a QVBox/QHBoxLayout!
     } else {
         box->removeWidget(m_pTrackTablePlaceholder);
@@ -222,7 +222,7 @@ DlgAutoDJ::~DlgAutoDJ() {
 
 void DlgAutoDJ::setupActionButton(QPushButton* pButton,
         void (DlgAutoDJ::*pSlot)(bool),
-        QString fallbackText) {
+        const QString& fallbackText) {
     connect(pButton, &QPushButton::clicked, this, pSlot);
     if (m_bShowButtonText) {
         pButton->setText(fallbackText);
@@ -243,7 +243,7 @@ void DlgAutoDJ::loadSelectedTrack() {
     m_pTrackTableView->loadSelectedTrack();
 }
 
-void DlgAutoDJ::loadSelectedTrackToGroup(QString group, bool play) {
+void DlgAutoDJ::loadSelectedTrackToGroup(const QString& group, bool play) {
     m_pTrackTableView->loadSelectedTrackToGroup(group, play);
 }
 
diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h
index bbdff9f988..5239570035 100644
--- a/src/library/autodj/dlgautodj.h
+++ b/src/library/autodj/dlgautodj.h
@@ -32,7 +32,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     bool hasFocus() const override;