From 002fa8f4aa4e0a9afa615a9e29779c5bdec5736c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 13 Oct 2023 22:49:20 +0200
Subject: [PATCH] Fix mismatched definition

---
 ext/libstrawberry-tagreader/tagreadergme.h | 2 +-
 src/context/contextalbum.h                 | 4 ++--
 src/qobuz/qobuzservice.h                   | 2 +-
 src/tidal/tidalrequest.h                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/libstrawberry-tagreader/tagreadergme.h b/ext/libstrawberry-tagreader/tagreadergme.h
index 96521a53..f9e9421b 100644
--- a/ext/libstrawberry-tagreader/tagreadergme.h
+++ b/ext/libstrawberry-tagreader/tagreadergme.h
@@ -34,7 +34,7 @@ namespace GME {
 bool IsSupportedFormat(const QFileInfo &file_info);
 bool ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
 
-uint32_t UnpackBytes32(const char *const arr, size_t length);
+uint32_t UnpackBytes32(const char *const bytes, size_t length);
 
 namespace SPC {
 // SPC SPEC: http://vspcplay.raphnet.net/spc_file_format.txt
diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h
index e3b7ff6f..fffbcc16 100644
--- a/src/context/contextalbum.h
+++ b/src/context/contextalbum.h
@@ -87,8 +87,8 @@ class ContextAlbum : public QWidget {
   void AutomaticCoverSearchDone();
   void FadeCurrentCover(const qreal value);
   void FadeCurrentCoverFinished();
-  void FadePreviousCover(SharedPtr<PreviousCover> previouscover);
-  void FadePreviousCoverFinished(SharedPtr<PreviousCover> previouscover);
+  void FadePreviousCover(SharedPtr<PreviousCover> previous_cover);
+  void FadePreviousCoverFinished(SharedPtr<PreviousCover> previous_cover);
 
  public slots:
   void SearchCoverInProgress();
diff --git a/src/qobuz/qobuzservice.h b/src/qobuz/qobuzservice.h
index 90fb5918..edfb76e2 100644
--- a/src/qobuz/qobuzservice.h
+++ b/src/qobuz/qobuzservice.h
@@ -143,7 +143,7 @@ class QobuzService : public InternetService {
   using Param = QPair<QString, QString>;
   using ParamList = QList<Param>;
 
-  QString DecodeAppSecret(const QString &app_secret_encoded) const;
+  QString DecodeAppSecret(const QString &app_secret_base64) const;
   void SendSearch();
   void LoginError(const QString &error = QString(), const QVariant &debug = QVariant());
 
diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h
index 148ddad0..7ae3023a 100644
--- a/src/tidal/tidalrequest.h
+++ b/src/tidal/tidalrequest.h
@@ -111,7 +111,7 @@ class TidalRequest : public TidalBaseRequest {
   void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
 
   void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
-  void AlbumsReceived(QNetworkReply *reply, const Artist &artist_artist, const int limit_requested, const int offset_requested, const bool auto_login);
+  void AlbumsReceived(QNetworkReply *reply, const Artist &artist_requested, const int limit_requested, const int offset_requested, const bool auto_login);
 
   void SongsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
   void SongsReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int limit_requested, const int offset_requested, const bool auto_login = false);