From 7c0ab4212b5c6217c387162987c2a9510916ab83 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 19 Jun 2019 12:57:12 +0200
Subject: [PATCH] Fix minor code issues with Qobuz

---
 src/qobuz/qobuzrequest.cpp | 2 +-
 src/qobuz/qobuzrequest.h   | 1 -
 src/qobuz/qobuzservice.cpp | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp
index f0ea5ac31..7bc801669 100644
--- a/src/qobuz/qobuzrequest.cpp
+++ b/src/qobuz/qobuzrequest.cpp
@@ -996,7 +996,7 @@ int QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, int artist_
       Error("Invalid Json reply, track composer is missing id or name.", json_obj_composer);
       return -1;
     }
-    QString composer = json_obj_composer["name"].toString();
+    composer = json_obj_composer["name"].toString();
   }
 
   if (json_obj.contains("performer")) {
diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h
index f63b77a07..ce09cae20 100644
--- a/src/qobuz/qobuzrequest.h
+++ b/src/qobuz/qobuzrequest.h
@@ -72,7 +72,6 @@ class QobuzRequest : public QobuzBaseRequest {
   void StreamURLFinished(const QUrl original_url, const QUrl url, const Song::FileType, QString error = QString());
 
  private slots:
-  //void LoginComplete(bool success, QString error = QString());
 
   void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);
 
diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp
index af34088c5..77dd628aa 100644
--- a/src/qobuz/qobuzservice.cpp
+++ b/src/qobuz/qobuzservice.cpp
@@ -403,7 +403,6 @@ void QobuzService::GetArtists() {
   connect(artists_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(ArtistsUpdateStatus(QString)));
   connect(artists_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(ArtistsProgressSetMaximum(int)));
   connect(artists_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(ArtistsUpdateProgress(int)));
-  connect(this, SIGNAL(LoginComplete(bool, QString)), artists_request_.get(), SLOT(LoginComplete(bool, QString)));
 
   artists_request_->Process();
 
@@ -440,7 +439,6 @@ void QobuzService::GetAlbums() {
   connect(albums_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(AlbumsUpdateStatus(QString)));
   connect(albums_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(AlbumsProgressSetMaximum(int)));
   connect(albums_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(AlbumsUpdateProgress(int)));
-  connect(this, SIGNAL(LoginComplete(bool, QString)), albums_request_.get(), SLOT(LoginComplete(bool, QString)));
 
   albums_request_->Process();
 
@@ -477,7 +475,6 @@ void QobuzService::GetSongs() {
   connect(songs_request_.get(), SIGNAL(UpdateStatus(QString)), SIGNAL(SongsUpdateStatus(QString)));
   connect(songs_request_.get(), SIGNAL(ProgressSetMaximum(int)), SIGNAL(SongsProgressSetMaximum(int)));
   connect(songs_request_.get(), SIGNAL(UpdateProgress(int)), SIGNAL(SongsUpdateProgress(int)));
-  connect(this, SIGNAL(LoginComplete(bool, QString)), songs_request_.get(), SLOT(LoginComplete(bool, QString)));
 
   songs_request_->Process();