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

List:       kde-commits
Subject:    [amarok/spotify] src/core-impl/collections/spotifycollection: spotify: fix headers to comply with st
From:       Edward Hades <edward.hades () gmail ! com>
Date:       2012-10-28 11:33:20
Message-ID: 20121028113320.58BBEA6078 () git ! kde ! org
[Download RAW message or body]

Git commit 34f11a069bc0c914d7a4ce571d5ec4aaa3302d6d by Edward Hades.
Committed on 28/10/2012 at 12:32.
Pushed by hades into branch 'spotify'.

spotify: fix headers to comply with style guidelines

M  +5    -3    src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
M  +6    -4    src/core-impl/collections/spotifycollection/SpotifyCollection.h
M  +7    -4    src/core-impl/collections/spotifycollection/SpotifyConfig.cpp
M  +5    -3    src/core-impl/collections/spotifycollection/SpotifyMeta.cpp
M  +1    -0    src/core-impl/collections/spotifycollection/SpotifyPlaylist.cpp
M  +2    -1    src/core-impl/collections/spotifycollection/SpotifyPlaylist.h
M  +1    -0    src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.cpp
 M  +4    -3    src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.h
M  +4    -4    src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp
M  +3    -3    src/core-impl/collections/spotifycollection/SpotifyQueryMaker.h
M  +5    -2    src/core-impl/collections/spotifycollection/SpotifySettings.cpp
M  +1    -0    src/core-impl/collections/spotifycollection/SpotifySettings.h

http://commits.kde.org/amarok/34f11a069bc0c914d7a4ce571d5ec4aaa3302d6d

diff --git a/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp index \
                5a9fc0d..e23870d 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
@@ -18,18 +18,20 @@
 #define DEBUG_PREFIX "SpotifyCollection"
 
 #include "SpotifyCollection.h"
+
 #include "SpotifyQueryMaker.h"
 #include "support/Controller.h"
 #include "support/TrackProxy.h"
 
-#include "core/collections/Collection.h"
+#include "core-impl/collections/support/CollectionManager.h"
 #include "core-impl/collections/support/MemoryCollection.h"
 #include "core-impl/collections/support/MemoryQueryMaker.h"
-#include "core-impl/collections/support/CollectionManager.h"
-#include "core/capabilities/ActionsCapability.h"
 #include "core-impl/meta/proxy/MetaProxy.h"
+#include "core/capabilities/ActionsCapability.h"
+#include "core/collections/Collection.h"
 
 #include <KIcon>
+
 #include <QTimer>
 
 namespace Collections
diff --git a/src/core-impl/collections/spotifycollection/SpotifyCollection.h \
b/src/core-impl/collections/spotifycollection/SpotifyCollection.h index \
                f429e81..7dd9357 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyCollection.h
+++ b/src/core-impl/collections/spotifycollection/SpotifyCollection.h
@@ -17,15 +17,17 @@
 #ifndef SPOTIFY_COLLECTION_H
 #define SPOTIFY_COLLECTION_H
 
-#include "core/collections/Collection.h"
-#include "core-impl/collections/support/MemoryCollection.h"
 #include "SpotifyMeta.h"
+#include "SpotifySettings.h"
 #include "support/Controller.h"
+
+#include "core-impl/collections/support/MemoryCollection.h"
+#include "core/collections/Collection.h"
 #include "core/support/Debug.h"
-#include "SpotifySettings.h"
+
+#include <QAction>
 #include <QObject>
 #include <QString>
-#include <QAction>
 
 namespace Collections
 {
diff --git a/src/core-impl/collections/spotifycollection/SpotifyConfig.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyConfig.cpp index \
                cfed529..3a4b81f 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyConfig.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyConfig.cpp
@@ -13,16 +13,19 @@
  * You should have received a copy of the GNU General Public License along with      \
                *
  * this program.  If not, see <http://www.gnu.org/licenses/>.                        \
                *
  ****************************************************************************************/
 +
 #include "SpotifyConfig.h"
+
+#include "App.h"
 #include "core/support/Debug.h"
 
-#include <sys/utsname.h>
-#include <KWallet/Wallet>
-#include <KMessageBox>
 #include <KConfig>
 #include <KConfigGroup>
+#include <KMessageBox>
 #include <KStandardDirs>
-#include "App.h"
+#include <KWallet/Wallet>
+
+#include <sys/utsname.h>
 
 const QString SpotifyConfig::m_resolverDownloadUrl = "http://ofan.me/";
 
diff --git a/src/core-impl/collections/spotifycollection/SpotifyMeta.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyMeta.cpp index b7d3878..ed4d852 \
                100644
--- a/src/core-impl/collections/spotifycollection/SpotifyMeta.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyMeta.cpp
@@ -14,14 +14,16 @@
  * You should have received a copy of the GNU General Public License along with      \
                *
  * this program.  If not, see <http://www.gnu.org/licenses/>.                        \
                *
  ****************************************************************************************/
 +
 #include "SpotifyMeta.h"
 
+#include "SpotifyCollection.h"
+
 #include "amarokconfig.h"
-#include "core/meta/Meta.h"
 #include "core-impl/meta/default/DefaultMetaTypes.h"
-#include "covermanager/CoverFetcher.h"
+#include "core/meta/Meta.h"
 #include "covermanager/CoverCache.h"
-#include "SpotifyCollection.h"
+#include "covermanager/CoverFetcher.h"
 
 #include <QDateTime>
 #include <QList>
diff --git a/src/core-impl/collections/spotifycollection/SpotifyPlaylist.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyPlaylist.cpp index \
                bb9521e..e41bbec 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyPlaylist.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyPlaylist.cpp
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License along with      \
                *
  * this program.  If not, see <http://www.gnu.org/licenses/>.                        \
                *
  ****************************************************************************************/
 +
 #include "SpotifyPlaylist.h"
 
 using Playlists;
diff --git a/src/core-impl/collections/spotifycollection/SpotifyPlaylist.h \
b/src/core-impl/collections/spotifycollection/SpotifyPlaylist.h index \
                4f978ac..f66ffa1 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyPlaylist.h
+++ b/src/core-impl/collections/spotifycollection/SpotifyPlaylist.h
@@ -16,9 +16,10 @@
 #ifndef SPOTIFYPLAYLIST_H
 #define SPOTIFYPLAYLIST_H
 
-#include "core/playlists/Playlist.h"
 #include "SpotifyCollection.h"
 
+#include "core/playlists/Playlist.h"
+
 class QObject;
 
 namespace Playlists
diff --git a/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.cpp index \
                d743e3f..d4958d1 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.cpp
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License along with      \
                *
  * this program.  If not, see <http://www.gnu.org/licenses/>.                        \
                *
  ****************************************************************************************/
 +
 #include "SpotifyPlaylistProvider.h"
 
 using Playlists;
diff --git a/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.h \
b/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.h index \
                4febeec..d1ec30b 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.h
+++ b/src/core-impl/collections/spotifycollection/SpotifyPlaylistProvider.h
@@ -16,10 +16,11 @@
 #ifndef SPOTIFYPLAYLISTPROVIDER_H
 #define SPOTIFYPLAYLISTPROVIDER_H
 
-#include "core-impl/playlists/UserPlaylistProvider.h"
-#include "SpotifyMeta.h"
 #include "SpotifyCollection.h"
-#include "./support/Controller.h"
+#include "SpotifyMeta.h"
+#include "support/Controller.h"
+
+#include "core-impl/playlists/UserPlaylistProvider.h"
 
 class QAction;
 
diff --git a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp index \
                13c1c91..6bdbbc8 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.cpp
@@ -14,20 +14,20 @@
  * You should have received a copy of the GNU General Public License along with      \
                *
  * this program.  If not, see <http://www.gnu.org/licenses/>.                        \
                *
  ****************************************************************************************/
 +
 #include "SpotifyQueryMaker.h"
 
-#include "SpotifyMeta.h"
 #include "SpotifyCollection.h"
-
+#include "SpotifyMeta.h"
 #include "support/Controller.h"
-#include "support/Query.h"
 #include "support/QMFunctionTypes.h"
+#include "support/Query.h"
 
+#include "core-impl/collections/support/MemoryQueryMaker.h"
 #include "core/collections/QueryMaker.h"
 #include "core/meta/Meta.h"
 #include "core/meta/support/MetaConstants.h"
 #include "core/support/Debug.h"
-#include "core-impl/collections/support/MemoryQueryMaker.h"
 
 #include <QObject>
 #include <QStack>
diff --git a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.h \
b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.h index \
                201ab63..b1d385c 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.h
+++ b/src/core-impl/collections/spotifycollection/SpotifyQueryMaker.h
@@ -17,15 +17,15 @@
 #ifndef SPOTIFY_QUERYMAKER_H
 #define SPOTIFY_QUERYMAKER_H
 
-#include "SpotifyMeta.h"
 #include "SpotifyCollection.h"
+#include "SpotifyMeta.h"
 #include "support/Controller.h"
-#include "support/Query.h"
 #include "support/QMFunctionTypes.h"
+#include "support/Query.h"
 
+#include "core/collections/QueryMaker.h"
 #include "core/meta/Meta.h"
 #include "core/meta/support/MetaConstants.h"
-#include "core/collections/QueryMaker.h"
 
 #include <QMap>
 
diff --git a/src/core-impl/collections/spotifycollection/SpotifySettings.cpp \
b/src/core-impl/collections/spotifycollection/SpotifySettings.cpp index \
                778a86c..6f99d1d 100644
--- a/src/core-impl/collections/spotifycollection/SpotifySettings.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifySettings.cpp
@@ -16,14 +16,17 @@
 #define DEBUG_PREFIX "SpotifySettings"
 
 #include "SpotifySettings.h"
+
+#include "ui_SpotifyConfigWidget.h"
+
 #include "core/support/Debug.h"
 #include "support/Controller.h"
-#include "ui_SpotifyConfigWidget.h"
 
 #include <KLocale>
 #include <KMessageBox>
-#include <QtGlobal>
+
 #include <QFile>
+#include <QtGlobal>
 
 SpotifySettings::SpotifySettings( QWidget* parent, const QVariantList& args )
 : KDialog( parent )
diff --git a/src/core-impl/collections/spotifycollection/SpotifySettings.h \
b/src/core-impl/collections/spotifycollection/SpotifySettings.h index \
                c1d868d..03ed114 100644
--- a/src/core-impl/collections/spotifycollection/SpotifySettings.h
+++ b/src/core-impl/collections/spotifycollection/SpotifySettings.h
@@ -17,6 +17,7 @@
 #define SPOTIFYSETTINGS_H_
 
 #include "SpotifyConfig.h"
+
 #include "network/NetworkAccessManagerProxy.h"
 
 #include <KDialog>


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