Move Last.fm account to libtomahawk

src/CMakeLists.txt

@@ -68,10 +68,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      sourcetree/items/GroupItem.cpp
      sourcetree/items/HistoryItem.cpp
 
-     accounts/lastfm/LastFmAccount.cpp
-     accounts/lastfm/LastFmConfig.cpp
-     accounts/lastfm/LastFmInfoPlugin.cpp
-
      TomahawkTrayIcon.cpp
      AudioControls.cpp
      SettingsDialog.cpp
@@ -92,8 +88,6 @@ SET( tomahawkUI ${tomahawkUI}
      StackedSettingsDialog.ui
      ProxyDialog.ui
 
-     accounts/lastfm/LastFmConfig.ui
-
      AudioControls.ui
      LoadXSPFDialog.ui
      SocialWidget.ui

src/libtomahawk/CMakeLists.txt

@@ -189,6 +189,10 @@ set( libSources
     accounts/spotify/SpotifyAccountConfig.cpp
     accounts/spotify/SpotifyPlaylistUpdater.cpp
 
+    accounts/lastfm/LastFmAccount.cpp
+    accounts/lastfm/LastFmConfig.cpp
+    accounts/lastfm/LastFmInfoPlugin.cpp
+
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
     sip/SipInfo.cpp
@@ -312,6 +316,7 @@ set( libUI ${libUI}
     infobar/InfoBar.ui
     accounts/AccountFactoryWrapper.ui
     accounts/spotify/SpotifyAccountConfig.ui
+    accounts/lastfm/LastFmConfig.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..

src/libtomahawk/accounts/lastfm/LastFmAccount.h

@@ -21,6 +21,7 @@
 
 #include "accounts/Account.h"
 #include "AtticaManager.h"
+#include "DllMacro.h"
 
 #include <attica/content.h>
 
@@ -37,7 +38,7 @@ namespace Accounts {
 
 class LastFmConfig;
 
-class LastFmAccountFactory : public AccountFactory
+class DLLEXPORT LastFmAccountFactory : public AccountFactory
 {
     Q_OBJECT
 public:
@@ -57,11 +58,11 @@ private:
 };
 
 /**
- * 3.Last.Fm account is special. It is both an attica resolver *and* a InfoPlugin. We always want the infoplugin,
+ * Last.Fm account is special. It is both an attica resolver *and* a InfoPlugin. We always want the infoplugin,
  * but the user can install the attica resolver on-demand. So we take care of both there.
  *
  */
-class LastFmAccount : public CustomAtticaAccount
+class DLLEXPORT LastFmAccount : public CustomAtticaAccount
 {
     Q_OBJECT
 public:

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h

@@ -22,6 +22,7 @@
 
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
+#include "DllMacro.h"
 
 #include <lastfm/Track>
 #include <lastfm/Audioscrobbler>
@@ -42,7 +43,7 @@ namespace Accounts
 namespace InfoSystem
 {
 
-class LastFmInfoPlugin : public InfoPlugin
+class DLLEXPORT LastFmInfoPlugin : public InfoPlugin
 {
     Q_OBJECT