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

5 files changed, 10 insertions, 10 deletions

diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp
index 5215540c96..3906e03e14 100644
--- a/src/library/browse/browsefeature.cpp
+++ b/src/library/browse/browsefeature.cpp
@@ -270,7 +270,7 @@ void BrowseFeature::activateChild(const QModelIndex& index) {
     emit enableCoverArtDisplay(false);
 }
 
-void BrowseFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
+void BrowseFeature::onRightClickChild(const QPoint& globalPos, const QModelIndex& index) {
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
     m_pLastRightClickedItem = item;
 
@@ -457,7 +457,7 @@ void BrowseFeature::loadQuickLinks() {
     }
 }
 
-QString BrowseFeature::extractNameFromPath(QString spath) {
+QString BrowseFeature::extractNameFromPath(const QString& spath) {
     QString path = spath.left(spath.count()-1);
     int index = path.lastIndexOf("/");
     QString name = (spath.count() > 1) ? path.mid(index+1) : spath;
diff --git a/src/library/browse/browsefeature.h b/src/library/browse/browsefeature.h
index 0665a96b3c..0cab0654fe 100644
--- a/src/library/browse/browsefeature.h
+++ b/src/library/browse/browsefeature.h
@@ -49,19 +49,19 @@ class BrowseFeature : public LibraryFeature {
     void slotAddToLibrary();
     void activate();
     void activateChild(const QModelIndex& index);
-    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void onRightClickChild(const QPoint& globalPos, const QModelIndex& index);
     void onLazyChildExpandation(const QModelIndex& index);
     void slotLibraryScanStarted();
     void slotLibraryScanFinished();
 
   signals:
     void setRootIndex(const QModelIndex&);
-    void requestAddDir(QString);
+    void requestAddDir(const QString&);
     void scanLibrary();
 
   private:
     QString getRootViewHtml() const;
-    QString extractNameFromPath(QString spath);
+    QString extractNameFromPath(const QString& spath);
     QStringList getDefaultQuickLinks() const;
     void saveQuickLinks();
     void loadQuickLinks();
diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 91f65fce3a..67c60c9eed 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -437,7 +437,7 @@ bool BrowseTableModel::setData(
     return true;
 }
 
-void BrowseTableModel::trackLoaded(QString group, TrackPointer pTrack) {
+void BrowseTableModel::trackLoaded(const QString& group, TrackPointer pTrack) {
     if (group == m_previewDeckGroup) {
         for (int row = 0; row < rowCount(); ++row) {
             QModelIndex i = index(row, COLUMN_PREVIEW);
diff --git a/src/library/browse/browsetablemodel.h b/src/library/browse/browsetablemodel.h
index 5e959a9d90..dfb7fa60b1 100644
--- a/src/library/browse/browsetablemodel.h
+++ b/src/library/browse/browsetablemodel.h
@@ -77,7 +77,7 @@ class BrowseTableModel final : public QStandardItemModel, public virtual TrackMo
   public slots:
     void slotClear(BrowseTableModel*);
     void slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*);
-    void trackLoaded(QString group, TrackPointer pTrack);
+    void trackLoaded(const QString& group, TrackPointer pTrack);
 
   private:
     void addSearchColumn(int index);
diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
index 774e56f9fc..a6d9e520c8 100644
--- a/src/library/browse/browsethread.cpp
+++ b/src/library/browse/browsethread.cpp
@@ -93,9 +93,9 @@ namespace {
 
 class YearItem: public QStandardItem {
 public:
-    explicit YearItem(QString year):
-        QStandardItem(year) {
-    }
+  explicit YearItem(const QString& year)
+          : QStandardItem(year) {
+  }
 
     QVariant data(int role) const {
         switch (role) {