11 files changed, 21 insertions, 21 deletions
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index d5de10a9a7..8797a870ae 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -17,7 +17,7 @@
 #include "track/beatutils.h"
 #include "trackinfoobject.h"
 
-AnalyzerBeats::AnalyzerBeats(ConfigObject<ConfigValue>* pConfig)
+AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig)
         : m_pConfig(pConfig),
           m_pVamp(NULL),
           m_bPreferencesReanalyzeOldBpm(false),
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
index 4d1cdc2bd4..84251ff4a8 100644
--- a/src/analyzer/analyzerbeats.h
+++ b/src/analyzer/analyzerbeats.h
@@ -12,11 +12,11 @@
 
 #include "analyzer/analyzer.h"
 #include "analyzer/vamp/vampanalyzer.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 
 class AnalyzerBeats: public Analyzer {
   public:
-    AnalyzerBeats(ConfigObject<ConfigValue>* pConfig);
+    AnalyzerBeats(UserSettingsPointer pConfig);
     virtual ~AnalyzerBeats();
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
@@ -30,7 +30,7 @@ class AnalyzerBeats: public Analyzer {
         QString pluginId, bool bPreferencesFastAnalysis);
     QVector<double> correctedBeats(QVector<double> rawbeats);
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     VampAnalyzer* m_pVamp;
     QString m_pluginId;
     bool m_bPreferencesReanalyzeOldBpm;
diff --git a/src/analyzer/analyzergain.cpp b/src/analyzer/analyzergain.cpp
index eeff90f4b3..91e53256bc 100644
--- a/src/analyzer/analyzergain.cpp
+++ b/src/analyzer/analyzergain.cpp
@@ -6,7 +6,7 @@
 #include "util/math.h"
 #include "util/sample.h"
 
-AnalyzerGain::AnalyzerGain(ConfigObject<ConfigValue> *_config) {
+AnalyzerGain::AnalyzerGain(UserSettingsPointer _config) {
     m_pConfigReplayGain = _config;
     m_bStepControl = false;
     m_pLeftTempBuffer = NULL;
diff --git a/src/analyzer/analyzergain.h b/src/analyzer/analyzergain.h
index 9aaad2c7f1..68a0c11347 100644
--- a/src/analyzer/analyzergain.h
+++ b/src/analyzer/analyzergain.h
@@ -9,13 +9,13 @@
 #define ANALYZER_ANALYZERGAIN_H
 
 #include "analyzer/analyzer.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 
 class ReplayGain;
 
 class AnalyzerGain : public Analyzer {
   public:
-    AnalyzerGain(ConfigObject<ConfigValue> *_config);
+    AnalyzerGain(UserSettingsPointer _config);
     virtual ~AnalyzerGain();
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
@@ -26,7 +26,7 @@ class AnalyzerGain : public Analyzer {
 
   private:
     bool m_bStepControl;
-    ConfigObject<ConfigValue> *m_pConfigReplayGain;
+    UserSettingsPointer m_pConfigReplayGain;
     CSAMPLE* m_pLeftTempBuffer;
     CSAMPLE* m_pRightTempBuffer;
     ReplayGain* m_pReplayGain;
diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
index 4dd65cc989..4079a87e3b 100644
--- a/src/analyzer/analyzerkey.cpp
+++ b/src/analyzer/analyzerkey.cpp
@@ -10,7 +10,7 @@
 using mixxx::track::io::key::ChromaticKey;
 using mixxx::track::io::key::ChromaticKey_IsValid;
 
-AnalyzerKey::AnalyzerKey(ConfigObject<ConfigValue>* pConfig)
+AnalyzerKey::AnalyzerKey(UserSettingsPointer pConfig)
         : m_pConfig(pConfig),
           m_pVamp(NULL),
           m_iSampleRate(0),
diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
index fe1ac17982..2db0148a44 100644
--- a/src/analyzer/analyzerkey.h
+++ b/src/analyzer/analyzerkey.h
@@ -6,12 +6,12 @@
 
 #include "analyzer/analyzer.h"
 #include "analyzer/vamp/vampanalyzer.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "trackinfoobject.h"
 
 class AnalyzerKey : public Analyzer {
   public:
-    AnalyzerKey(ConfigObject<ConfigValue>* pConfig);
+    AnalyzerKey(UserSettingsPointer pConfig);
     virtual ~AnalyzerKey();
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
@@ -24,7 +24,7 @@ class AnalyzerKey : public Analyzer {
     static QHash<QString, QString> getExtraVersionInfo(
         QString pluginId, bool bPreferencesFastAnalysis);
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     VampAnalyzer* m_pVamp;
     QString m_pluginId;
     int m_iSampleRate;
diff --git a/src/analyzer/analyzerqueue.cpp b/src/analyzer/analyzerqueue.cpp
index 8652272370..e2bca62bf3 100644
--- a/src/analyzer/analyzerqueue.cpp
+++ b/src/analyzer/analyzerqueue.cpp
@@ -435,7 +435,7 @@ void AnalyzerQueue::queueAnalyseTrack(TrackPointer tio) {
 
 // static
 AnalyzerQueue* AnalyzerQueue::createDefaultAnalyzerQueue(
-        ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection) {
+        UserSettingsPointer pConfig, TrackCollection* pTrackCollection) {
     AnalyzerQueue* ret = new AnalyzerQueue(pTrackCollection);
 
     ret->addAnalyzer(new AnalyzerWaveform(pConfig));
@@ -452,7 +452,7 @@ AnalyzerQueue* AnalyzerQueue::createDefaultAnalyzerQueue(
 
 // static
 AnalyzerQueue* AnalyzerQueue::createAnalysisFeatureAnalyzerQueue(
-        ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection) {
+        UserSettingsPointer pConfig, TrackCollection* pTrackCollection) {
     AnalyzerQueue* ret = new AnalyzerQueue(pTrackCollection);
 
     ret->addAnalyzer(new AnalyzerGain(pConfig));
diff --git a/src/analyzer/analyzerqueue.h b/src/analyzer/analyzerqueue.h
index f278fe3a45..deaee41372 100644
--- a/src/analyzer/analyzerqueue.h
+++ b/src/analyzer/analyzerqueue.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "analyzer/analyzer.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "sources/audiosource.h"
 #include "trackinfoobject.h"
 #include "util/samplebuffer.h"
@@ -28,9 +28,9 @@ class AnalyzerQueue : public QThread {
     void queueAnalyseTrack(TrackPointer tio);
 
     static AnalyzerQueue* createDefaultAnalyzerQueue(
-            ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection);
+            UserSettingsPointer pConfig, TrackCollection* pTrackCollection);
     static AnalyzerQueue* createAnalysisFeatureAnalyzerQueue(
-            ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection);
+            UserSettingsPointer pConfig, TrackCollection* pTrackCollection);
 
   public slots:
     void slotAnalyseTrack(TrackPointer tio);
diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp
index 87c820887c..4c1f123f42 100644
--- a/src/analyzer/analyzerwaveform.cpp
+++ b/src/analyzer/analyzerwaveform.cpp
@@ -10,7 +10,7 @@
 #include "trackinfoobject.h"
 #include "waveform/waveformfactory.h"
 
-AnalyzerWaveform::AnalyzerWaveform(ConfigObject<ConfigValue>* pConfig) :
+AnalyzerWaveform::AnalyzerWaveform(UserSettingsPointer pConfig) :
         m_skipProcessing(false),
         m_waveformData(nullptr),
         m_waveformSummaryData(nullptr),
diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index b22141f957..dee6f5c256 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -8,7 +8,7 @@
 #include <limits>
 
 #include "analyzer/analyzer.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "util/math.h"
 #include "util/memory.h"
 #include "waveform/waveform.h"
@@ -140,7 +140,7 @@ struct WaveformStride {
 
 class AnalyzerWaveform : public Analyzer {
   public:
-    AnalyzerWaveform(ConfigObject<ConfigValue>* pConfig);
+    AnalyzerWaveform(UserSettingsPointer pConfig);
     virtual ~AnalyzerWaveform();
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
diff --git a/src/analyzer/vamp/vampanalyzer.h b/src/analyzer/vamp/vampanalyzer.h
index 09f1bcb72d..0daf4332b3 100644
--- a/src/analyzer/vamp/vampanalyzer.h
+++ b/src/analyzer/vamp/vampanalyzer.h
@@ -14,7 +14,7 @@
 #include <vamp-hostsdk/vamp-hostsdk.h>
 
 #include "analyzer/vamp/vamppluginloader.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "util/sample.h"
 
 class VampAnalyzer {