Move ScanManager into libtomahawk. It's core functionality, non-GUI, and

this lets things in libtomahawk call scan functions easily

src/CMakeLists.txt

@@ -37,9 +37,7 @@ ENDIF()
 SET( tomahawkSources ${tomahawkSources}
      web/Api_v1.cpp
 
-     MusicScanner.cpp
      ShortcutHandler.cpp
-     ScanManager.cpp
      UbuntuUnityHack.cpp
      TomahawkApp.cpp
      main.cpp

src/SettingsDialog.cpp

@@ -34,13 +34,11 @@
 #include "TomahawkApp.h"
 #include "TomahawkSettings.h"
 #include "accounts/DelegateConfigWrapper.h"
-#include "MusicScanner.h"
 #include "Pipeline.h"
 #include "Resolver.h"
 #include "ExternalResolverGui.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/GuiHelpers.h"
-#include "ScanManager.h"
 #include "SettingsListDelegate.h"
 #include "accounts/AccountDelegate.h"
 #include "database/Database.h"

src/TomahawkApp.cpp

@@ -50,11 +50,10 @@
 #include "web/Api_v1.h"
 #include "SourceList.h"
 #include "ShortcutHandler.h"
-#include "ScanManager.h"
+#include "libtomahawk/filemetadata/ScanManager.h"
 #include "TomahawkSettings.h"
 #include "GlobalActionManager.h"
 #include "database/LocalCollection.h"
-#include "MusicScanner.h"
 #include "Pipeline.h"
 #include "DropJob.h"
 #include "EchonestCatalogSynchronizer.h"

src/TomahawkWindow.cpp

@@ -67,7 +67,7 @@
 #include "TomahawkSettings.h"
 #include "SourceList.h"
 #include "TomahawkTrayIcon.h"
-#include "ScanManager.h"
+#include "libtomahawk/filemetadata/ScanManager.h"
 #include "TomahawkApp.h"
 #include "LoadXSPFDialog.h"
 

src/libtomahawk/CMakeLists.txt

@@ -261,6 +261,9 @@ set( libSources
     infosystem/InfoSystemCache.cpp
     infosystem/InfoSystemWorker.cpp
 
+    filemetadata/MusicScanner.cpp
+    filemetadata/ScanManager.cpp
+
     network/BufferIoDevice.cpp
     network/MsgProcessor.cpp
     network/StreamConnection.cpp

src/libtomahawk/filemetadata/ScanManager.h

@@ -21,6 +21,7 @@
 #define SCANMANAGER_H
 
 #include "Typedefs.h"
+#include "DllMacro.h"
 
 #include <QtCore/QHash>
 #include <QtCore/QMap>
@@ -34,7 +35,7 @@ class QThread;
 class QFileSystemWatcher;
 class QTimer;
 
-class ScanManager : public QObject
+class DLLEXPORT ScanManager : public QObject
 {
 Q_OBJECT