4 files changed, 7 insertions, 7 deletions
diff --git a/src/effects/effectchainmanager.cpp b/src/effects/effectchainmanager.cpp
index 1af0d91460..f37bf759dc 100644
--- a/src/effects/effectchainmanager.cpp
+++ b/src/effects/effectchainmanager.cpp
@@ -8,7 +8,7 @@
 #include "effects/effectsmanager.h"
 #include "util/xml.h"
 
-EffectChainManager::EffectChainManager(ConfigObject<ConfigValue>* pConfig,
+EffectChainManager::EffectChainManager(UserSettingsPointer pConfig,
                                        EffectsManager* pEffectsManager)
         : QObject(pEffectsManager),
           m_pConfig(pConfig),
diff --git a/src/effects/effectchainmanager.h b/src/effects/effectchainmanager.h
index 4010c21a87..0e648aee13 100644
--- a/src/effects/effectchainmanager.h
+++ b/src/effects/effectchainmanager.h
@@ -5,7 +5,7 @@
 #include <QList>
 #include <QHash>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "effects/effectchain.h"
 #include "effects/effectrack.h"
 #include "engine/channelhandle.h"
@@ -19,7 +19,7 @@ class EffectsManager;
 class EffectChainManager : public QObject {
     Q_OBJECT
   public:
-    EffectChainManager(ConfigObject<ConfigValue>* pConfig,
+    EffectChainManager(UserSettingsPointer pConfig,
                        EffectsManager* pEffectsManager);
     virtual ~EffectChainManager();
 
@@ -57,7 +57,7 @@ class EffectChainManager : public QObject {
         return "EffectChainManager";
     }
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     EffectsManager* m_pEffectsManager;
     QList<StandardEffectRackPointer> m_standardEffectRacks;
     QList<EqualizerRackPointer> m_equalizerEffectRacks;
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index d0a7ab6ac3..9682e2bfca 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -12,7 +12,7 @@
 const char* kEqualizerRackName = "[EqualizerChain]";
 const char* kQuickEffectRackName = "[QuickEffectChain]";
 
-EffectsManager::EffectsManager(QObject* pParent, ConfigObject<ConfigValue>* pConfig)
+EffectsManager::EffectsManager(QObject* pParent, UserSettingsPointer pConfig)
         : QObject(pParent),
           m_pEffectChainManager(new EffectChainManager(pConfig, this)),
           m_nextRequestId(0),
diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h
index f9ac3dc997..ba401d9670 100644
--- a/src/effects/effectsmanager.h
+++ b/src/effects/effectsmanager.h
@@ -8,7 +8,7 @@
 #include <QScopedPointer>
 #include <QPair>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlpotmeter.h"
 #include "controlpushbutton.h"
 #include "effects/effect.h"
@@ -29,7 +29,7 @@ class EffectsManager : public QObject {
   public:
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
 
-    EffectsManager(QObject* pParent, ConfigObject<ConfigValue>* pConfig);
+    EffectsManager(QObject* pParent, UserSettingsPointer pConfig);
     virtual ~EffectsManager();
 
     EngineEffectsManager* getEngineEffectsManager() {