[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [amarok/spotify] src/core-impl/collections/spotifycollection: Fix signal & slot connections
From:       Edward Hades <edward.hades () gmail ! com>
Date:       2012-10-28 11:20:00
Message-ID: 20121028112000.03A25A610F () git ! kde ! org
[Download RAW message or body]

Git commit 7ac13fbd9c708d0f4819aaab814f5bf85917b622 by Edward Hades, on behalf of \
Ryan Feng. Committed on 15/08/2012 at 08:32.
Pushed by hades into branch 'spotify'.

Fix signal & slot connections

M  +5    -3    src/core-impl/collections/spotifycollection/SpotifyConfig.h
M  +1    -3    src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp

http://commits.kde.org/amarok/7ac13fbd9c708d0f4819aaab814f5bf85917b622

diff --git a/src/core-impl/collections/spotifycollection/SpotifyConfig.h \
b/src/core-impl/collections/spotifycollection/SpotifyConfig.h index 5646f06..62a3b81 \
                100644
--- a/src/core-impl/collections/spotifycollection/SpotifyConfig.h
+++ b/src/core-impl/collections/spotifycollection/SpotifyConfig.h
@@ -32,9 +32,6 @@ public:
 
     static const char *configSectionName() { return "Collection_Spotify"; }
     static const QString defaultResolverName();
-    void load();
-    void save();
-    void reset();
 
     const QString username() const { return m_username; }
     void setUsername( const QString& username ) { m_username = username; }
@@ -50,6 +47,11 @@ public:
     bool highQuality() const { return m_highQuality; }
     void setHighQuality( const bool highquality ) { m_highQuality = highquality; }
 
+public slots:
+    void load();
+    void save();
+    void reset();
+
 private:
     QString m_username;
     QString m_password;
diff --git a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp index \
                f4cf26a..13c1c91 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp
@@ -121,11 +121,9 @@ namespace Collections
                 m_querySent = true;
                 Spotify::Query* query = m_controller.data()->makeQuery( \
m_collection.data(), title, artist, album, genre );  connect( this, SIGNAL( \
                queryAborted() ),
-                         query, SLOT( abortQuery()) );
+                         query, SLOT( slotAbortQuery()) );
                 connect( query, SIGNAL(newTrackList( Meta::SpotifyTrackList ) ),
                          this, SLOT(slotCollectResults( Meta::SpotifyTrackList ) ) \
                );
-                connect( query, \
                SIGNAL(queryDone(Spotify::Query*,Meta::SpotifyTrackList)),
-                         this, \
SLOT(slotQueryDone(Spotify::Query*,Meta::SpotifyTrackList)));  
                 m_controller.data()->resolve( query );
             }


[prev in list] [next in list] [prev in thread] [next in thread]