From 10bac1cd2df9c002ccd70b882255c088b000e542 Mon Sep 17 00:00:00 2001
From: David Guillen Fandos <david@davidgf.net>
Date: Sat, 12 Mar 2016 19:44:32 +0000
Subject: [PATCH] Fixing issues in the pull request.

---
 src/covers/albumcoverloader.h             | 3 ++-
 src/internet/subsonic/subsonicservice.cpp | 7 ++++---
 src/internet/subsonic/subsonicservice.h   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h
index ac635e037..6eeb09486 100644
--- a/src/covers/albumcoverloader.h
+++ b/src/covers/albumcoverloader.h
@@ -110,7 +110,8 @@ class AlbumCoverLoader : public QObject {
 
   NetworkAccessManager* network_;
 
-  bool connected_spotify_, connected_subsonic_;
+  bool connected_spotify_;
+  bool connected_subsonic_;
 
   static const int kMaxRedirects = 3;
 };
diff --git a/src/internet/subsonic/subsonicservice.cpp b/src/internet/subsonic/subsonicservice.cpp
index ca494b50a..27eed3ebc 100644
--- a/src/internet/subsonic/subsonicservice.cpp
+++ b/src/internet/subsonic/subsonicservice.cpp
@@ -59,6 +59,7 @@ const char* SubsonicService::kSongsTable = "subsonic_songs";
 const char* SubsonicService::kFtsTable = "subsonic_songs_fts";
 
 const int SubsonicService::kMaxRedirects = 10;
+const int SubsonicService::kCoverArtSize = 1024;
 
 SubsonicService::SubsonicService(Application* app, InternetModel* parent)
     : InternetService(kServiceName, app, parent, parent),
@@ -573,7 +574,7 @@ void SubsonicLibraryScanner::OnGetAlbumCoverFinished(QNetworkReply* reply, QStri
 
   QByteArray image = reply->readAll();
 
-  service_->emitImageLoaded(albumid, QImage::fromData(image));
+  service_->EmitImageLoaded(albumid, QImage::fromData(image));
 }
 
 void SubsonicLibraryScanner::GetAlbumList(int offset) {
@@ -589,7 +590,7 @@ void SubsonicLibraryScanner::GetAlbumList(int offset) {
 void SubsonicLibraryScanner::GetAlbumCover(const QString& id) {
   QUrl url = service_->BuildRequestUrl("getCoverArt");
   url.addQueryItem("id", id);
-  url.addQueryItem("size", "1024");
+  url.addQueryItem("size", QString::number(kCoverArtSize));
   QNetworkReply* reply = service_->Send(url);
   NewClosure(reply, SIGNAL(finished()), this,
              SLOT(OnGetAlbumCoverFinished(QNetworkReply*,QString)), reply, id);
@@ -600,7 +601,7 @@ void SubsonicService::LoadImage(const QString& id) {
   scanner_->GetAlbumCover(id);
 }
 
-void SubsonicService::emitImageLoaded(const QString& id, const QImage& image) {
+void SubsonicService::EmitImageLoaded(const QString& id, const QImage& image) {
   emit ImageLoaded(id, image);
 }
 
diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h
index cdba572da..8aada17a9 100644
--- a/src/internet/subsonic/subsonicservice.h
+++ b/src/internet/subsonic/subsonicservice.h
@@ -102,7 +102,7 @@ class SubsonicService : public InternetService {
   LoginState login_state() const { return login_state_; }
 
   Q_INVOKABLE void LoadImage(const QString& id);
-  void emitImageLoaded(const QString& id, const QImage& image);
+  void EmitImageLoaded(const QString& id, const QImage& image);
 
   // Subsonic API methods
   void Ping();