Use UserSettingsPointer in preferences code.

40 files changed, 85 insertions, 85 deletions

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index db06452dad..2e743b6887 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -18,12 +18,12 @@
 #include "controllers/controller.h"
 #include "controllers/controllermanager.h"
 #include "controllers/defs_controllers.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "util/version.h"
 
 DlgPrefController::DlgPrefController(QWidget* parent, Controller* controller,
                                      ControllerManager* controllerManager,
-                                     ConfigObject<ConfigValue> *pConfig)
+                                     UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
           m_pConfig(pConfig),
           m_pControllerManager(controllerManager),
@@ -367,7 +367,7 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
     presetDirs.append(presetFileInfo.canonicalPath());
 
     ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
-            presetPath, ControllerManager::getPresetPaths(m_pConfig));
+        presetPath, ControllerManager::getPresetPaths(m_pConfig.data()));
 
     // Import the preset scripts to the user scripts folder.
     for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
@@ -731,7 +731,7 @@ void DlgPrefController::openScript() {
     foreach (QModelIndex index, selectedIndices) {
         selectedRows.insert(index.row());
     }
-    QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig);
+    QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig.data());
 
     foreach (int row, selectedRows) {
         QString scriptName = m_ui.m_pScriptsTableWidget->item(row, 0)->text();
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 5bb38049d1..720da2cdce 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -17,7 +17,7 @@
 #include "controllers/controllerpresetinfo.h"
 #include "controllers/dlgcontrollerlearning.h"
 #include "controllers/ui_dlgprefcontrollerdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
 
 // Forward declarations
@@ -29,7 +29,7 @@ class DlgPrefController : public DlgPreferencePage {
   public:
     DlgPrefController(QWidget *parent, Controller* controller,
                       ControllerManager* controllerManager,
-                      ConfigObject<ConfigValue> *pConfig);
+                      UserSettingsPointer pConfig);
     virtual ~DlgPrefController();
 
   public slots:
@@ -92,7 +92,7 @@ class DlgPrefController : public DlgPreferencePage {
     void disableDevice();
 
     Ui::DlgPrefControllerDlg m_ui;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     ControllerManager* m_pControllerManager;
     Controller* m_pController;
     DlgControllerLearning* m_pDlgControllerLearning;
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index e593e202c3..0d3a32c0dd 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -8,7 +8,7 @@
 #include "controllers/defs_controllers.h"
 
 DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
-                                       ConfigObject<ConfigValue>* pConfig,
+                                       UserSettingsPointer pConfig,
                                        ControllerManager* pControllerManager,
                                        QTreeWidgetItem* pControllerTreeItem)
         : DlgPreferencePage(pPreferences),
@@ -25,7 +25,7 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
     connect(btnOpenUserPresets, SIGNAL(clicked()),
             &m_buttonMapper, SLOT(map()));
 
-    m_buttonMapper.setMapping(btnOpenUserPresets, userPresetsPath(m_pConfig));
+    m_buttonMapper.setMapping(btnOpenUserPresets, userPresetsPath(m_pConfig.data()));
 
     // Connections
     connect(m_pControllerManager, SIGNAL(devicesChanged()),
diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
index 1e5cdf83a7..dcf22b33b8 100644
--- a/src/controllers/dlgprefcontrollers.h
+++ b/src/controllers/dlgprefcontrollers.h
@@ -4,7 +4,7 @@
 #include <QTreeWidgetItem>
 #include <QSignalMapper>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controllers/ui_dlgprefcontrollersdlg.h"
 #include "preferences/dlgpreferencepage.h"
 
@@ -16,7 +16,7 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
     Q_OBJECT
   public:
     DlgPrefControllers(DlgPreferences* pDlgPreferences,
-                       ConfigObject<ConfigValue>* pConfig,
+                       UserSettingsPointer pConfig,
                        ControllerManager* pControllerManager,
                        QTreeWidgetItem* pControllerTreeItem);
     virtual ~DlgPrefControllers();
@@ -38,7 +38,7 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
     void setupControllerWidgets();
 
     DlgPreferences* m_pDlgPreferences;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     ControllerManager* m_pControllerManager;
     QTreeWidgetItem* m_pControllerTreeItem;
     QList<DlgPrefController*> m_controllerWindows;
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
index 253ddfc01a..d72dff32ca 100644
--- a/src/mixxx.cpp
+++ b/src/mixxx.cpp
@@ -269,7 +269,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
 
 #ifdef __MODPLUG__
     // restore the configuration for the modplug library before trying to load a module
-    DlgPrefModplug* pModplugPrefs = new DlgPrefModplug(0, pConfig.data());
+    DlgPrefModplug* pModplugPrefs = new DlgPrefModplug(0, pConfig);
     pModplugPrefs->loadSettings();
     pModplugPrefs->applySettings();
     delete pModplugPrefs; // not needed anymore
@@ -331,7 +331,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
     // Initialize preference dialog
     m_pPrefDlg = new DlgPreferences(this, m_pSkinLoader, m_pSoundManager, m_pPlayerManager,
                                     m_pControllerManager, m_pVCManager, m_pEffectsManager,
-                                    pConfig.data(), m_pLibrary);
+                                    pConfig, m_pLibrary);
     m_pPrefDlg->setWindowIcon(QIcon(":/images/ic_mixxx_window.png"));
     m_pPrefDlg->setHidden(true);
 
diff --git a/src/preferences/dialog/dlgprefautodj.cpp b/src/preferences/dialog/dlgprefautodj.cpp
index 5d84ac1023..22c7c780ed 100644
--- a/src/preferences/dialog/dlgprefautodj.cpp
+++ b/src/preferences/dialog/dlgprefautodj.cpp
@@ -1,7 +1,7 @@
 #include "preferences/dialog/dlgprefautodj.h"
 
 DlgPrefAutoDJ::DlgPrefAutoDJ(QWidget* pParent,
-                             ConfigObject<ConfigValue>* pConfig)
+                             UserSettingsPointer pConfig)
         : DlgPreferencePage(pParent),
           m_pConfig(pConfig) {
     setupUi(this);
diff --git a/src/preferences/dialog/dlgprefautodj.h b/src/preferences/dialog/dlgprefautodj.h
index 13e5b19ea0..60a451ee1a 100644
--- a/src/preferences/dialog/dlgprefautodj.h
+++ b/src/preferences/dialog/dlgprefautodj.h
@@ -4,13 +4,13 @@
 #include <QWidget>
 
 #include "preferences/dialog/ui_dlgprefautodjdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
 
 class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
     Q_OBJECT
   public:
-    DlgPrefAutoDJ(QWidget* pParent, ConfigObject<ConfigValue> *pConfig);
+    DlgPrefAutoDJ(QWidget* pParent, UserSettingsPointer pConfig);
     virtual ~DlgPrefAutoDJ();
 
   public slots:
@@ -29,7 +29,7 @@ class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
     void slotEnableAutoDJRandomQueue(int);
 
   private:
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
 };
 
 #endif /* DLGPREFAUTODJ_H */
diff --git a/src/preferences/dialog/dlgprefbeats.cpp b/src/preferences/dialog/dlgprefbeats.cpp
index bc5cbe282d..06f53c3f30 100644
--- a/src/preferences/dialog/dlgprefbeats.cpp
+++ b/src/preferences/dialog/dlgprefbeats.cpp
@@ -16,7 +16,7 @@ using Vamp::HostExt::PluginLoader;
 using Vamp::HostExt::PluginWrapper;
 using Vamp::HostExt::PluginInputDomainAdapter;
 
-DlgPrefBeats::DlgPrefBeats(QWidget *parent, ConfigObject<ConfigValue> *_config)
+DlgPrefBeats::DlgPrefBeats(QWidget *parent, UserSettingsPointer _config)
         : DlgPreferencePage(parent),
           m_pconfig(_config),
           m_minBpm(0),
diff --git a/src/preferences/dialog/dlgprefbeats.h b/src/preferences/dialog/dlgprefbeats.h
index 166eb3b329..9b84ae7cc0 100644
--- a/src/preferences/dialog/dlgprefbeats.h
+++ b/src/preferences/dialog/dlgprefbeats.h
@@ -10,14 +10,14 @@
 #include <QList>
 
 #include "analyzer/vamp/vamppluginloader.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefbeatsdlg.h"
 
 class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     Q_OBJECT
   public:
-    DlgPrefBeats(QWidget *parent, ConfigObject<ConfigValue> *_config);
+    DlgPrefBeats(QWidget *parent, UserSettingsPointer _config);
     virtual ~DlgPrefBeats();
 
   public slots:
@@ -41,7 +41,7 @@ class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     void loadSettings();
 
     // Pointer to config object
-    ConfigObject<ConfigValue>* m_pconfig;
+    UserSettingsPointer m_pconfig;
     QList<QString> m_listName;
     QList<QString> m_listLibrary, m_listIdentifier;
     QString m_selectedAnalyzer;
diff --git a/src/preferences/dialog/dlgprefcontrols.cpp b/src/preferences/dialog/dlgprefcontrols.cpp
index 502f616e55..29a1e3a2ff 100644
--- a/src/preferences/dialog/dlgprefcontrols.cpp
+++ b/src/preferences/dialog/dlgprefcontrols.cpp
@@ -25,7 +25,7 @@
 
 #include "mixer/basetrackplayer.h"
 #include "preferences/dialog/dlgprefcontrols.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobject.h"
 #include "controlobjectslave.h"
 #include "widget/wnumberpos.h"
@@ -41,7 +41,7 @@
 DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxMainWindow * mixxx,
                                  SkinLoader* pSkinLoader,
                                  PlayerManager* pPlayerManager,
-                                 ConfigObject<ConfigValue> * pConfig)
+                                 UserSettingsPointer  pConfig)
         :  DlgPreferencePage(parent),
            m_pConfig(pConfig),
            m_mixxx(mixxx),
diff --git a/src/preferences/dialog/dlgprefcontrols.h b/src/preferences/dialog/dlgprefcontrols.h
index 80a181bc45..71fa193526 100644
--- a/src/preferences/dialog/dlgprefcontrols.h
+++ b/src/preferences/dialog/dlgprefcontrols.h
@@ -21,7 +21,7 @@
 #include <QWidget>
 
 #include "preferences/dialog/ui_dlgprefcontrolsdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
 
 class ControlObjectSlave;
@@ -40,7 +40,7 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
   public:
     DlgPrefControls(QWidget *parent, MixxxMainWindow *mixxx,
                     SkinLoader* pSkinLoader, PlayerManager* pPlayerManager,
-                    ConfigObject<ConfigValue> *pConfig);
+                    UserSettingsPointer pConfig);
     virtual ~DlgPrefControls();
 
   public slots:
@@ -87,7 +87,7 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     // returns zero.
     int cueDefaultIndexByData(int userData) const;
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     ControlObject* m_pControlTrackTimeDisplay;
     ControlObjectSlave* m_pNumDecks;
     ControlObjectSlave* m_pNumSamplers;
diff --git a/src/preferences/dialog/dlgprefcrossfader.cpp b/src/preferences/dialog/dlgprefcrossfader.cpp
index 4c4bbed584..33069905be 100644
--- a/src/preferences/dialog/dlgprefcrossfader.cpp
+++ b/src/preferences/dialog/dlgprefcrossfader.cpp
@@ -7,7 +7,7 @@
 #include "util/rescaler.h"
 
 DlgPrefCrossfader::DlgPrefCrossfader(
-        QWidget* parent, ConfigObject<ConfigValue>* config)
+        QWidget* parent, UserSettingsPointer config)
         : DlgPreferencePage(parent),
           m_config(config),
           m_pxfScene(NULL),
diff --git a/src/preferences/dialog/dlgprefcrossfader.h b/src/preferences/dialog/dlgprefcrossfader.h
index 28d2e25641..edb67f9f58 100644
--- a/src/preferences/dialog/dlgprefcrossfader.h
+++ b/src/preferences/dialog/dlgprefcrossfader.h
@@ -4,7 +4,7 @@
 #include <QWidget>
 
 #include "preferences/dialog/ui_dlgprefcrossfaderdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobjectslave.h"
 #include "preferences/dlgpreferencepage.h"
 
@@ -12,7 +12,7 @@
 class DlgPrefCrossfader : public DlgPreferencePage, public Ui::DlgPrefCrossfaderDlg  {
     Q_OBJECT
   public:
-    DlgPrefCrossfader(QWidget* parent, ConfigObject<ConfigValue>* _config);
+    DlgPrefCrossfader(QWidget* parent, UserSettingsPointer _config);
     virtual ~DlgPrefCrossfader();
 
   public slots:
@@ -31,7 +31,7 @@ class DlgPrefCrossfader : public DlgPreferencePage, public Ui::DlgPrefCrossfader
     void drawXfaderDisplay();
 
     // Pointer to config object
-    ConfigObject<ConfigValue>* m_config;
+    UserSettingsPointer m_config;
 
     QGraphicsScene* m_pxfScene;
 
diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index 75b0db9fde..dafdc783a9 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -3,7 +3,7 @@
 #include "effects/effectsmanager.h"
 
 DlgPrefEffects::DlgPrefEffects(QWidget* pParent,
-                               ConfigObject<ConfigValue>* pConfig,
+                               UserSettingsPointer pConfig,
                                EffectsManager* pEffectsManager)
         : DlgPreferencePage(pParent),
           m_pConfig(pConfig),
diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h
index 846c6db787..f142079052 100644
--- a/src/preferences/dialog/dlgprefeffects.h
+++ b/src/preferences/dialog/dlgprefeffects.h
@@ -1,7 +1,7 @@
 #ifndef DLGPREFEFFECTS_H
 #define DLGPREFEFFECTS_H
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dialog/ui_dlgprefeffectsdlg.h"
 #include "preferences/dlgpreferencepage.h"
 
@@ -11,7 +11,7 @@ class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg {
     Q_OBJECT
   public:
     DlgPrefEffects(QWidget* pParent,
-                   ConfigObject<ConfigValue>* pConfig,
+                   UserSettingsPointer pConfig,
                    EffectsManager* pEffectsManager);
     virtual ~DlgPrefEffects() {}
 
@@ -27,7 +27,7 @@ class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg {
     void addEffectToList(const QString& id);
     void clear();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     EffectsManager* m_pEffectsManager;
 };
 
diff --git a/src/preferences/dialog/dlgprefeq.cpp b/src/preferences/dialog/dlgprefeq.cpp
index c77a77c88f..6fd2ddf169 100644
--- a/src/preferences/dialog/dlgprefeq.cpp
+++ b/src/preferences/dialog/dlgprefeq.cpp
@@ -39,7 +39,7 @@ const int kFrequencyUpperLimit = 20050;
 const int kFrequencyLowerLimit = 16;
 
 DlgPrefEQ::DlgPrefEQ(QWidget* pParent, EffectsManager* pEffectsManager,
-                     ConfigObject<ConfigValue>* pConfig)
+                     UserSettingsPointer pConfig)
         : DlgPreferencePage(pParent),
           m_COLoFreq(kConfigKey, "LoEQFrequency"),
           m_COHiFreq(kConfigKey, "HiEQFrequency"),
diff --git a/src/preferences/dialog/dlgprefeq.h b/src/preferences/dialog/dlgprefeq.h
index 73892d7ca3..b6c970556c 100644
--- a/src/preferences/dialog/dlgprefeq.h
+++ b/src/preferences/dialog/dlgprefeq.h
@@ -22,7 +22,7 @@
 #include <QComboBox>
 
 #include "preferences/dialog/ui_dlgprefeqdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobjectslave.h"
 #include "preferences/dlgpreferencepage.h"
 #include "effects/effectsmanager.h"
@@ -35,7 +35,7 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg  {
     Q_OBJECT
   public:
     DlgPrefEQ(QWidget *parent, EffectsManager* pEffectsManager,
-              ConfigObject<ConfigValue>* _config);
+              UserSettingsPointer _config);
     virtual ~DlgPrefEQ();
 
     QString getEQEffectGroupForDeck(int deck) const;
@@ -80,7 +80,7 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg  {
 
     ControlObjectSlave m_COLoFreq;
     ControlObjectSlave m_COHiFreq;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     double m_lowEqFreq, m_highEqFreq;
 
     // Members needed for changing the effects loaded on the EQ Effect Rack
diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp
index 42e59a4f25..657df3e17b 100644
--- a/src/preferences/dialog/dlgpreferences.cpp
+++ b/src/preferences/dialog/dlgpreferences.cpp
@@ -60,7 +60,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader,
                                SoundManager * soundman, PlayerManager* pPlayerManager,
                                ControllerManager * controllers, VinylControlManager *pVCManager,
                                EffectsManager* pEffectsManager,
-                               ConfigObject<ConfigValue>* pConfig, Library *pLibrary)
+                               UserSettingsPointer pConfig, Library *pLibrary)
         : m_pConfig(pConfig),
           m_pageSizeHint(QSize(0, 0)),
           m_preferencesUpdated(ConfigKey("[Preferences]", "updated"), false) {
diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h
index 017c380d58..1118146715 100644
--- a/src/preferences/dialog/dlgpreferences.h
+++ b/src/preferences/dialog/dlgpreferences.h
@@ -24,7 +24,7 @@
 #include <QStringList>
 
 #include "preferences/dialog/ui_dlgpreferencesdlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlpushbutton.h"
 #include "preferences/dlgpreferencepage.h"
 
@@ -63,7 +63,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
     DlgPreferences(MixxxMainWindow* mixxx, SkinLoader* pSkinLoader, SoundManager* soundman,
                    PlayerManager* pPlayerManager, ControllerManager* controllers,
                    VinylControlManager* pVCManager, EffectsManager* pEffectsManager,
-                   ConfigObject<ConfigValue>* pConfig, Library *pLibrary);
+                   UserSettingsPointer pConfig, Library *pLibrary);
     virtual ~DlgPreferences();
 
     void addPageWidget(DlgPreferencePage* pWidget);
@@ -99,7 +99,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
     QRect getDefaultGeometry();
 
     QStringList m_geometry;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     DlgPrefSound* m_wsound;
     DlgPrefLibrary* m_wlibrary;
     DlgPrefControllers *m_wcontrollers;
diff --git a/src/preferences/dialog/dlgprefkey.cpp b/src/preferences/dialog/dlgprefkey.cpp
index 72e2938b0d..0a34f3c8fe 100644
--- a/src/preferences/dialog/dlgprefkey.cpp
+++ b/src/preferences/dialog/dlgprefkey.cpp
@@ -32,7 +32,7 @@ using Vamp::HostExt::PluginLoader;
 using Vamp::HostExt::PluginWrapper;
 using Vamp::HostExt::PluginInputDomainAdapter;
 
-DlgPrefKey::DlgPrefKey(QWidget* parent, ConfigObject<ConfigValue>* _config)
+DlgPrefKey::DlgPrefKey(QWidget* parent, UserSettingsPointer _config)
         : DlgPreferencePage(parent),
           Ui::DlgPrefKeyDlg(),
           m_pConfig(_config),
diff --git a/src/preferences/dialog/dlgprefkey.h b/src/preferences/dialog/dlgprefkey.h
index 76f6f0037f..756114d93f 100644
--- a/src/preferences/dialog/dlgprefkey.h
+++ b/src/preferences/dialog/dlgprefkey.h
@@ -6,14 +6,14 @@
 #include <QMap>
 
 #include "preferences/dialog/ui_dlgprefkeydlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "track/keyutils.h"
 #include "preferences/dlgpreferencepage.h"
 
 class DlgPrefKey : public DlgPreferencePage, Ui::DlgPrefKeyDlg {
     Q_OBJECT
   public:
-    DlgPrefKey(QWidget *parent, ConfigObject<ConfigValue> *_config);
+    DlgPrefKey(QWidget *parent, UserSettingsPointer _config);
     virtual ~DlgPrefKey();
 
   public slots:
@@ -38,7 +38,7 @@ class DlgPrefKey : public DlgPreferencePage, Ui::DlgPrefKeyDlg {
     void populate();
     void loadSettings();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     QMap<mixxx::track::io::key::ChromaticKey, QLineEdit*> m_keyLineEdits;
     QList<QString> m_listName;
     QList<QString> m_listLibrary, m_listIdentifier;
diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp
index 3e227181d8..eedaa4402b 100644
--- a/src/preferences/dialog/dlgpreflibrary.cpp
+++ b/src/preferences/dialog/dlgpreflibrary.cpp
@@ -30,7 +30,7 @@
 #define MIXXX_ADDONS_URL "http://www.mixxx.org/wiki/doku.php/add-ons"
 
 DlgPrefLibrary::DlgPrefLibrary(QWidget * parent,
-                               ConfigObject<ConfigValue> * config, Library *pLibrary)
+                               UserSettingsPointer  config, Library *pLibrary)
         : DlgPreferencePage(parent),
           m_dirListModel(),
           m_pconfig(config),
diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h
index 3040369c8a..339a203cf0 100644
--- a/src/preferences/dialog/dlgpreflibrary.h
+++ b/src/preferences/dialog/dlgpreflibrary.h
@@ -23,7 +23,7 @@
 #include <QFont>
 
 #include "preferences/dialog/ui_dlgpreflibrarydlg.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/library.h"
 #include "preferences/dlgpreferencepage.h"
 
@@ -40,7 +40,7 @@ class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg  {
         ADD_TRACK_TOP     // Add track to Auto-DJ Queue (top).
     };
 
-    DlgPrefLibrary(QWidget *parent, ConfigObject<ConfigValue> *config,
+    DlgPrefLibrary(QWidget *parent, UserSettingsPointer config,
                    Library *pLibrary);
     virtual ~DlgPrefLibrary();
 
@@ -77,7 +77,7 @@ class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg  {
     void setLibraryFont(const QFont& font);
 
     QStandardItemModel m_dirListModel;
-    ConfigObject<ConfigValue>* m_pconfig;
+    UserSettingsPointer m_pconfig;
     Library* m_pLibrary;
     bool m_baddedDirectory;
     QFont m_originalTrackTableFont;
diff --git a/src/preferences/dialog/dlgprefmodplug.cpp b/src/preferences/dialog/dlgprefmodplug.cpp
index dcfc1a4154..bb2534ff37 100644
--- a/src/preferences/dialog/dlgprefmodplug.cpp
+++ b/src/preferences/dialog/dlgprefmodplug.cpp
@@ -4,13 +4,13 @@
 #include "preferences/dialog/dlgprefmodplug.h"
 #include "preferences/dialog/ui_dlgprefmodplugdlg.h"
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "sources/soundsourcemodplug.h"
 
 #define kConfigKey "[Modplug]"
 
 DlgPrefModplug::DlgPrefModplug(QWidget *parent,
-                               ConfigObject<ConfigValue> *_config)
+                               UserSettingsPointer _config)
         : DlgPreferencePage(parent),
           m_pUi(new Ui::DlgPrefModplug),
           m_pConfig(_config) {
diff --git a/src/preferences/dialog/dlgprefmodplug.h b/src/preferences/dialog/dlgprefmodplug.h
index 79eeb50c1d..a66ec132ad 100644
--- a/src/preferences/dialog/dlgprefmodplug.h
+++ b/src/preferences/dialog/dlgprefmodplug.h
@@ -5,7 +5,7 @@
 #define DLGPREFMODPLUG_H
 
 #include <QDialog>
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
 
 namespace Ui {
@@ -16,7 +16,7 @@ class DlgPrefModplug : public DlgPreferencePage {
     Q_OBJECT
 
   public:
-    explicit DlgPrefModplug(QWidget* parent, ConfigObject<ConfigValue>* _config);
+    explicit DlgPrefModplug(QWidget* parent, UserSettingsPointer _config);
     virtual ~DlgPrefModplug();
 
   public slots:
@@ -31,7 +31,7 @@ class DlgPrefModplug : public DlgPreferencePage {
 
   private:
     Ui::DlgPrefModplug* m_pUi;