From 6bf3c34fe5e693e3a30efcad876fed38e7784f77 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 22 Jun 2021 13:56:27 +0200
Subject: [PATCH] Fix parameter name mismatch

---
 src/collection/collectionbackend.h                 | 4 ++--
 src/core/mainwindow.h                              | 2 +-
 src/device/gpoddevice.h                            | 2 +-
 src/internet/internetsearchview.h                  | 2 +-
 src/qobuz/qobuzrequest.h                           | 2 +-
 src/smartplaylists/smartplaylistsearchtermwidget.h | 2 +-
 src/smartplaylists/smartplaylistsmodel.cpp         | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h
index 5a923caa1..909cfc990 100644
--- a/src/collection/collectionbackend.h
+++ b/src/collection/collectionbackend.h
@@ -164,10 +164,10 @@ class CollectionBackend : public CollectionBackendInterface {
   AlbumList GetCompilationAlbums(const QueryOptions &opt = QueryOptions()) override;
   AlbumList GetAlbumsByArtist(const QString &artist, const QueryOptions &opt = QueryOptions()) override;
 
-  void UpdateManualAlbumArtAsync(const QString &album_artist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) override;
+  void UpdateManualAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url, const bool clear_art_automatic = false) override;
   void UpdateAutomaticAlbumArtAsync(const QString &effective_albumartist, const QString &album, const QUrl &cover_url) override;
 
-  Album GetAlbumArt(const QString &album_artist, const QString &album) override;
+  Album GetAlbumArt(const QString &effective_albumartist, const QString &album) override;
 
   Song GetSongById(const int id) override;
   SongList GetSongsById(const QList<int> &ids);
diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index b8f2ffcb9..af4db2fcc 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -149,7 +149,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
   void ForceShowOSD(const Song &song, const bool toggle);
 
   void PlaylistMenuHidden();
-  void PlaylistRightClick(const QPoint global_pos, const QModelIndex &idx);
+  void PlaylistRightClick(const QPoint global_pos, const QModelIndex &index);
   void PlaylistCurrentChanged(const QModelIndex &current);
   void PlaylistViewSelectionModelChanged();
   void PlaylistPlay();
diff --git a/src/device/gpoddevice.h b/src/device/gpoddevice.h
index 0f976aa13..dcb5964d5 100644
--- a/src/device/gpoddevice.h
+++ b/src/device/gpoddevice.h
@@ -64,7 +64,7 @@ class GPodDevice : public ConnectedDevice, public virtual MusicStorage {
 
   bool GetSupportedFiletypes(QList<Song::FileType> *ret) override;
 
-  bool StartCopy(QList<Song::FileType> *supported_types) override;
+  bool StartCopy(QList<Song::FileType> *supported_filetypes) override;
   bool CopyToStorage(const CopyJob &job) override;
   void FinishCopy(bool success) override;
 
diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h
index 8f77d2300..dc6bfc6cd 100644
--- a/src/internet/internetsearchview.h
+++ b/src/internet/internetsearchview.h
@@ -86,7 +86,7 @@ class InternetSearchView : public QWidget {
 
   void Init(Application *app, InternetService *service);
 
-  void LazyLoadAlbumCover(const QModelIndex &idx);
+  void LazyLoadAlbumCover(const QModelIndex &proxy_index);
 
   protected:
   struct PendingState {
diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h
index 7756f14a9..ac6ada906 100644
--- a/src/qobuz/qobuzrequest.h
+++ b/src/qobuz/qobuzrequest.h
@@ -57,7 +57,7 @@ class QobuzRequest : public QobuzBaseRequest {
   void ReloadSettings();
 
   void Process();
-  void Search(const int search_id, const QString &search_text);
+  void Search(const int query_id, const QString &search_text);
 
  signals:
   void LoginSuccess();
diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.h b/src/smartplaylists/smartplaylistsearchtermwidget.h
index 63d78a283..50d4a06f8 100644
--- a/src/smartplaylists/smartplaylistsearchtermwidget.h
+++ b/src/smartplaylists/smartplaylistsearchtermwidget.h
@@ -72,7 +72,7 @@ class SmartPlaylistSearchTermWidget : public QWidget {
 
  private slots:
   void FieldChanged(const int index);
-  void OpChanged(const int index);
+  void OpChanged(const int idx);
   void RelativeValueChanged();
   void Grab();
 
diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp
index 471d62da3..b128dd2e7 100644
--- a/src/smartplaylists/smartplaylistsmodel.cpp
+++ b/src/smartplaylists/smartplaylistsmodel.cpp
@@ -288,8 +288,8 @@ QVariant SmartPlaylistsModel::data(const QModelIndex &idx, const int role) const
 
 }
 
-void SmartPlaylistsModel::LazyPopulate(SmartPlaylistsItem *parent, const bool signal) {
-  Q_UNUSED(parent);
+void SmartPlaylistsModel::LazyPopulate(SmartPlaylistsItem *item, const bool signal) {
+  Q_UNUSED(item);
   Q_UNUSED(signal);
 }