Move spotify account to libtomahawk

src/CMakeLists.txt

@@ -72,10 +72,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      accounts/lastfm/LastFmConfig.cpp
      accounts/lastfm/LastFmInfoPlugin.cpp
 
-     accounts/spotify/SpotifyAccount.cpp
-     accounts/spotify/SpotifyAccountConfig.cpp
-     accounts/spotify/SpotifyPlaylistUpdater.cpp
-
      TomahawkTrayIcon.cpp
      AudioControls.cpp
      SettingsDialog.cpp
@@ -97,7 +93,6 @@ SET( tomahawkUI ${tomahawkUI}
      ProxyDialog.ui
 
      accounts/lastfm/LastFmConfig.ui
-     accounts/spotify/SpotifyAccountConfig.ui
 
      AudioControls.ui
      LoadXSPFDialog.ui

src/libtomahawk/CMakeLists.txt

@@ -184,6 +184,11 @@ set( libSources
     accounts/DelegateConfigWrapper.cpp
     accounts/AccountFactoryWrapper.cpp
     accounts/AccountFactoryWrapperDelegate.cpp
+
+    accounts/spotify/SpotifyAccount.cpp
+    accounts/spotify/SpotifyAccountConfig.cpp
+    accounts/spotify/SpotifyPlaylistUpdater.cpp
+
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
     sip/SipInfo.cpp
@@ -306,6 +311,7 @@ set( libUI ${libUI}
     context/ContextWidget.ui
     infobar/InfoBar.ui
     accounts/AccountFactoryWrapper.ui
+    accounts/spotify/SpotifyAccountConfig.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..

src/libtomahawk/accounts/spotify/SpotifyAccount.h

@@ -26,6 +26,7 @@
 #include "Playlist.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/SmartPointerList.h"
+#include "DllMacro.h"
 
 class QAction;
 class SpotifyPlaylistUpdater;
@@ -51,7 +52,7 @@ struct SpotifyPlaylistInfo {
 };
 
 
-class SpotifyAccountFactory : public AccountFactory
+class DLLEXPORT SpotifyAccountFactory : public AccountFactory
 {
     Q_OBJECT
 public:
@@ -69,7 +70,7 @@ public:
 
 };
 
-class SpotifyAccount : public CustomAtticaAccount
+class DLLEXPORT SpotifyAccount : public CustomAtticaAccount
 {
     Q_OBJECT
 public:
@@ -159,6 +160,6 @@ private:
 }
 }
 
-Q_DECLARE_METATYPE( Tomahawk::Accounts::SpotifyPlaylistInfo* );
+Q_DECLARE_METATYPE( Tomahawk::Accounts::SpotifyPlaylistInfo* )
 
 #endif // SpotifyAccount_H

src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h

@@ -21,6 +21,7 @@
 
 #include "playlist/PlaylistUpdaterInterface.h"
 #include "utils/Closure.h"
+#include "DllMacro.h"
 
 #include <QQueue>
 #include <QVariant>
@@ -31,7 +32,7 @@ namespace Accounts {
 }
 }
 
-class SpotifyPlaylistUpdater : public Tomahawk::PlaylistUpdaterInterface
+class DLLEXPORT SpotifyPlaylistUpdater : public Tomahawk::PlaylistUpdaterInterface
 {
     Q_OBJECT
 
@@ -106,7 +107,7 @@ private:
 };
 
 
-class SpotifyUpdaterFactory : public Tomahawk::PlaylistUpdaterFactory
+class DLLEXPORT SpotifyUpdaterFactory : public Tomahawk::PlaylistUpdaterFactory
 {
 public:
     SpotifyUpdaterFactory()  {}