6 files changed, 11 insertions, 11 deletions
diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp
index 93f278e1b4..a77f1feed1 100644
--- a/src/library/autodj/autodjfeature.cpp
+++ b/src/library/autodj/autodjfeature.cpp
@@ -26,7 +26,7 @@ const QString AutoDJFeature::m_sAutoDJViewName = QString("Auto DJ");
 static const int kMaxRetrieveAttempts = 3;
 
 AutoDJFeature::AutoDJFeature(Library* pLibrary,
-                             ConfigObject<ConfigValue>* pConfig,
+                             UserSettingsPointer pConfig,
                              PlayerManagerInterface* pPlayerManager,
                              TrackCollection* pTrackCollection)
         : LibraryFeature(pLibrary),
diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
index 48d4d0a6e6..5b3c137cf8 100644
--- a/src/library/autodj/autodjfeature.h
+++ b/src/library/autodj/autodjfeature.h
@@ -17,7 +17,7 @@
 #include <QSignalMapper>
 
 #include "library/libraryfeature.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/treeitemmodel.h"
 
 #ifdef __AUTODJCRATES__
@@ -34,7 +34,7 @@ class AutoDJFeature : public LibraryFeature {
     Q_OBJECT
   public:
     AutoDJFeature(Library* pLibrary,
-                  ConfigObject<ConfigValue>* pConfig,
+                  UserSettingsPointer pConfig,
                   PlayerManagerInterface* pPlayerManager,
                   TrackCollection* pTrackCollection);
     virtual ~AutoDJFeature();
@@ -59,7 +59,7 @@ class AutoDJFeature : public LibraryFeature {
 #endif // __AUTODJCRATES__
 
   private:
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     Library* m_pLibrary;
     TrackCollection* m_pTrackCollection;
     CrateDAO& m_crateDao;
diff --git a/src/library/autodj/autodjprocessor.cpp b/src/library/autodj/autodjprocessor.cpp
index f9db164af0..5a435e2296 100644
--- a/src/library/autodj/autodjprocessor.cpp
+++ b/src/library/autodj/autodjprocessor.cpp
@@ -63,7 +63,7 @@ TrackPointer DeckAttributes::getLoadedTrack() const {
 }
 
 AutoDJProcessor::AutoDJProcessor(QObject* pParent,
-                                 ConfigObject<ConfigValue>* pConfig,
+                                 UserSettingsPointer pConfig,
                                  PlayerManagerInterface* pPlayerManager,
                                  int iAutoDJPlaylistId,
                                  TrackCollection* pTrackCollection)
diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h
index a7c4b72bac..f4eac0d456 100644
--- a/src/library/autodj/autodjprocessor.h
+++ b/src/library/autodj/autodjprocessor.h
@@ -5,7 +5,7 @@
 #include <QString>
 #include <QModelIndexList>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "controlobjectslave.h"
 #include "engine/enginechannel.h"
 #include "library/playlisttablemodel.h"
@@ -113,7 +113,7 @@ class AutoDJProcessor : public QObject {
     };
 
     AutoDJProcessor(QObject* pParent,
-                    ConfigObject<ConfigValue>* pConfig,
+                    UserSettingsPointer pConfig,
                     PlayerManagerInterface* pPlayerManager,
                     int iAutoDJPlaylistId,
                     TrackCollection* pCollection);
@@ -190,7 +190,7 @@ class AutoDJProcessor : public QObject {
     // present.
     bool removeTrackFromTopOfQueue(TrackPointer pTrack);
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     PlayerManagerInterface* m_pPlayerManager;
     PlaylistTableModel* m_pAutoDJTableModel;
 
diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp
index 156341d509..939f71088b 100644
--- a/src/library/autodj/dlgautodj.cpp
+++ b/src/library/autodj/dlgautodj.cpp
@@ -8,7 +8,7 @@
 #include "util/time.h"
 
 DlgAutoDJ::DlgAutoDJ(QWidget* parent,
-                     ConfigObject<ConfigValue>* pConfig,
+                     UserSettingsPointer pConfig,
                      Library* pLibrary,
                      AutoDJProcessor* pProcessor,
                      TrackCollection* pTrackCollection,
diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h
index 3031ad673d..ec3c046b21 100644
--- a/src/library/autodj/dlgautodj.h
+++ b/src/library/autodj/dlgautodj.h
@@ -5,7 +5,7 @@
 #include <QString>
 
 #include "library/autodj/ui_dlgautodj.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "trackinfoobject.h"
 #include "library/libraryview.h"
 #include "library/library.h"
@@ -19,7 +19,7 @@ class WTrackTableView;
 class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     Q_OBJECT
   public:
-    DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
+    DlgAutoDJ(QWidget* parent, UserSettingsPointer pConfig,
               Library* pLibrary,
               AutoDJProcessor* pProcessor, TrackCollection* pTrackCollection,
               MixxxKeyboard* pKeyboard);