Merge pull request #55 from monich/build-fix

Fix build break
nemomobile · Sep 18, 2014 · dac2b70 · dac2b70
2 parents 8a5539a + e3f4568
commit dac2b70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/mts/platform/storage/fsstorageplugin/storagetracker.cpp b/mts/platform/storage/fsstorageplugin/storagetracker.cpp
@@ -41,11 +41,6 @@
 #include <QSparqlQuery>
 #include <QSparqlResult>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <buteosyncfw5/SyncDBusConnection.h>
-#else
-#include <buteosyncfw/SyncDBusConnection.h>
-#endif
 // Local headers
 #include "storagetracker.h"
 #include "trace.h"
@@ -109,7 +104,7 @@ static const QString MINER_DEST("org.freedesktop.Tracker1.Miner.Files");
 static const QString MINER_PATH("/org/freedesktop/Tracker1/Miner/Files");
 static const QString MINER_IF("org.freedesktop.Tracker1.Miner");
 
-StorageTracker::StorageTracker() : m_minerInterface(MINER_DEST, MINER_PATH, MINER_IF, Buteo::SyncDBusConnection::sessionBus())
+StorageTracker::StorageTracker() : m_minerInterface(MINER_DEST, MINER_PATH, MINER_IF, QDBusConnection::sessionBus())
 {
     populateFunctionMap();
 }

diff --git a/mts/platform/storage/fsstorageplugin/thumbnailer.cpp b/mts/platform/storage/fsstorageplugin/thumbnailer.cpp
@@ -33,11 +33,6 @@
 #include <QCryptographicHash>
 #include <QDir>
 #include <QFile>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <buteosyncfw5/SyncDBusConnection.h>
-#else
-#include <buteosyncfw/SyncDBusConnection.h>
-#endif
 #include "thumbnailer.h"
 #include "trace.h"
 
@@ -53,7 +48,7 @@ static const QString THUMB_DIR = "/.thumbnails";
 
 
 Thumbnailer::Thumbnailer() :
-    ThumbnailerProxy(THUMBNAILER_SERVICE, THUMBNAILER_GENERIC_PATH, Buteo::SyncDBusConnection::sessionBus()), MAX_REQ_MAP_SIZE(2000),
+    ThumbnailerProxy(THUMBNAILER_SERVICE, THUMBNAILER_GENERIC_PATH, QDBusConnection::sessionBus()), MAX_REQ_MAP_SIZE(2000),
     m_scheduler("foreground"), m_flavor("normal")
 {
     QString thumbBaseDir = QDir::homePath() + THUMB_DIR;