7 files changed, 10 insertions, 10 deletions
diff --git a/src/engine/sync/basesyncablelistener.cpp b/src/engine/sync/basesyncablelistener.cpp
index d799f39dc1..6261aed23d 100644
--- a/src/engine/sync/basesyncablelistener.cpp
+++ b/src/engine/sync/basesyncablelistener.cpp
@@ -6,7 +6,7 @@
 
 static const char* kInternalClockGroup = "[InternalClock]";
 
-BaseSyncableListener::BaseSyncableListener(ConfigObject<ConfigValue>* pConfig)
+BaseSyncableListener::BaseSyncableListener(UserSettingsPointer pConfig)
         : m_pConfig(pConfig),
           m_pInternalClock(new InternalClock(kInternalClockGroup, this)),
           m_pMasterSyncable(NULL) {
diff --git a/src/engine/sync/basesyncablelistener.h b/src/engine/sync/basesyncablelistener.h
index 8eb8519d21..24d3a1a32f 100644
--- a/src/engine/sync/basesyncablelistener.h
+++ b/src/engine/sync/basesyncablelistener.h
@@ -2,14 +2,14 @@
 #define BASESYNCABLELISTENER_H
 
 #include "engine/sync/syncable.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 
 class InternalClock;
 class EngineChannel;
 
 class BaseSyncableListener : public SyncableListener {
   public:
-    BaseSyncableListener(ConfigObject<ConfigValue>* pConfig);
+    BaseSyncableListener(UserSettingsPointer pConfig);
     virtual ~BaseSyncableListener();
 
     void addSyncableDeck(Syncable* pSyncable);
@@ -85,7 +85,7 @@ class BaseSyncableListener : public SyncableListener {
     // Check if there is only one playing syncable deck, and notify it if so.
     void checkUniquePlayingSyncable();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     // The InternalClock syncable.
     InternalClock* m_pInternalClock;
     // The current Syncable that is the master.
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 779747c2e0..ce918ae9ee 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -25,7 +25,7 @@
 #include "engine/sync/internalclock.h"
 #include "util/assert.h"
 
-EngineSync::EngineSync(ConfigObject<ConfigValue>* pConfig)
+EngineSync::EngineSync(UserSettingsPointer pConfig)
         : BaseSyncableListener(pConfig) {
 }
 
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index 27d82b2d1d..289ff557b4 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -19,13 +19,13 @@
 #ifndef ENGINESYNC_H
 #define ENGINESYNC_H
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "engine/sync/syncable.h"
 #include "engine/sync/basesyncablelistener.h"
 
 class EngineSync : public BaseSyncableListener {
   public:
-    explicit EngineSync(ConfigObject<ConfigValue>* pConfig);
+    explicit EngineSync(UserSettingsPointer pConfig);
     virtual ~EngineSync();
 
     // Used by Syncables to tell EngineSync it wants to be enabled in a
diff --git a/src/engine/sync/internalclock.cpp b/src/engine/sync/internalclock.cpp
index 6287fc793a..3726ffd2a5 100644
--- a/src/engine/sync/internalclock.cpp
+++ b/src/engine/sync/internalclock.cpp
@@ -6,7 +6,7 @@
 #include "controlobject.h"
 #include "controllinpotmeter.h"
 #include "controlpushbutton.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 
 InternalClock::InternalClock(const char* pGroup, SyncableListener* pEngineSync)
         : m_group(pGroup),
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 42a0ce71fd..52fa7644ce 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -16,7 +16,7 @@ const double SyncControl::kBpmUnity = 1.0;
 const double SyncControl::kBpmHalve = 0.5;
 const double SyncControl::kBpmDouble = 2.0;
 
-SyncControl::SyncControl(const QString& group, ConfigObject<ConfigValue>* pConfig,
+SyncControl::SyncControl(const QString& group, UserSettingsPointer pConfig,
                          EngineChannel* pChannel, SyncableListener* pEngineSync)
         : EngineControl(group, pConfig),
           m_sGroup(group),
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index 9a59eb9fac..36be28acef 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -20,7 +20,7 @@ class SyncControl : public EngineControl, public Syncable {
     static const double kBpmUnity;
     static const double kBpmHalve;
     static const double kBpmDouble;
-    SyncControl(const QString& group, ConfigObject<ConfigValue>* pConfig,
+    SyncControl(const QString& group, UserSettingsPointer pConfig,
                 EngineChannel* pChannel, SyncableListener* pEngineSync);
     virtual ~SyncControl();