6 files changed, 12 insertions, 12 deletions
diff --git a/src/library/dao/analysisdao.cpp b/src/library/dao/analysisdao.cpp
index 88d71dd574..73c795b6bc 100644
--- a/src/library/dao/analysisdao.cpp
+++ b/src/library/dao/analysisdao.cpp
@@ -16,7 +16,7 @@ const QString AnalysisDao::s_analysisTableName = "track_analysis";
 // CPU time so I think we should stick with the default. rryan 4/3/2012
 const int kCompressionLevel = -1;
 
-AnalysisDao::AnalysisDao(QSqlDatabase& database, ConfigObject<ConfigValue>* pConfig)
+AnalysisDao::AnalysisDao(QSqlDatabase& database, UserSettingsPointer pConfig)
         : m_pConfig(pConfig),
           m_db(database) {
     QDir storagePath = getAnalysisStoragePath();
diff --git a/src/library/dao/analysisdao.h b/src/library/dao/analysisdao.h
index ab366c833d..05065d3a5c 100644
--- a/src/library/dao/analysisdao.h
+++ b/src/library/dao/analysisdao.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/dao/dao.h"
 #include "trackinfoobject.h"
 
@@ -31,7 +31,7 @@ class AnalysisDao : public DAO {
         QByteArray data;
     };
 
-    AnalysisDao(QSqlDatabase& database, ConfigObject<ConfigValue>* pConfig);
+    AnalysisDao(QSqlDatabase& database, UserSettingsPointer pConfig);
     virtual ~AnalysisDao();
 
     virtual void initialize();
@@ -62,7 +62,7 @@ class AnalysisDao : public DAO {
     bool deleteFile(const QString& filename) const;
     QList<AnalysisInfo> loadAnalysesFromQuery(TrackId trackId, QSqlQuery* query);
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     QSqlDatabase m_db;
 };
 
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index a430e3d732..2b48251d02 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -16,7 +16,7 @@ static const int kLeastPreferredPercent = 15;
 AutoDJCratesDAO::AutoDJCratesDAO(QSqlDatabase& a_rDatabase,
                                  TrackDAO& a_rTrackDAO, CrateDAO& a_rCrateDAO,
                                  PlaylistDAO &a_rPlaylistDAO,
-                                 ConfigObject<ConfigValue>* a_pConfig)
+                                 UserSettingsPointer a_pConfig)
         : m_rDatabase(a_rDatabase),
           m_rTrackDAO(a_rTrackDAO),
           m_rCrateDAO(a_rCrateDAO),
diff --git a/src/library/dao/autodjcratesdao.h b/src/library/dao/autodjcratesdao.h
index 7374c9bdf0..498c6060b8 100644
--- a/src/library/dao/autodjcratesdao.h
+++ b/src/library/dao/autodjcratesdao.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/dao/dao.h"
 #include "trackinfoobject.h"
 #include "util/class.h"
@@ -28,7 +28,7 @@ class AutoDJCratesDAO : public QObject, public virtual DAO {
 
     AutoDJCratesDAO(QSqlDatabase& a_rDatabase, TrackDAO& a_rTrackDAO,
                     CrateDAO& a_rCrateDAO, PlaylistDAO &a_rPlaylistDAO,
-                    ConfigObject<ConfigValue>* a_pConfig);
+                    UserSettingsPointer a_pConfig);
     virtual ~AutoDJCratesDAO();
 
     // A pure virtual method from the subclass.
@@ -127,7 +127,7 @@ class AutoDJCratesDAO : public QObject, public virtual DAO {
     PlaylistDAO& m_rPlaylistDAO;
 
     // The source of our configuration.
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
 
     // The ID of every set-log playlist.
     QList<int> m_lstSetLogPlaylistIds;
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index f705a3bb9b..8d94800579 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -72,7 +72,7 @@ TrackDAO::TrackDAO(QSqlDatabase& database,
                    CrateDAO& crateDao,
                    AnalysisDao& analysisDao,
                    LibraryHashDAO& libraryHashDao,
-                   ConfigObject<ConfigValue> * pConfig)
+                   UserSettingsPointer pConfig)
         : m_database(database),
           m_cueDao(cueDao),
           m_playlistDao(playlistDao),
diff --git a/src/library/dao/trackdao.h b/src/library/dao/trackdao.h
index 3b749886e2..d5961852d3 100644
--- a/src/library/dao/trackdao.h
+++ b/src/library/dao/trackdao.h
@@ -12,7 +12,7 @@
 #include <QCache>
 #include <QString>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/dao/dao.h"
 #include "trackinfoobject.h"
 #include "util/class.h"
@@ -104,7 +104,7 @@ class TrackDAO : public QObject, public virtual DAO {
     TrackDAO(QSqlDatabase& database, CueDAO& cueDao,
              PlaylistDAO& playlistDao, CrateDAO& crateDao,
              AnalysisDao& analysisDao, LibraryHashDAO& libraryHashDao,
-             ConfigObject<ConfigValue>* pConfig = NULL);
+             UserSettingsPointer pConfig);
     virtual ~TrackDAO();
 
     void finish();
@@ -209,7 +209,7 @@ class TrackDAO : public QObject, public virtual DAO {
     CrateDAO& m_crateDao;
     AnalysisDao& m_analysisDao;
     LibraryHashDAO& m_libraryHashDao;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     // Mutex that protects m_sTracks.
     static QMutex m_sTracksMutex;
     // Weak pointer cache of active tracks.