Use UserSettings (typedef) instead of ConfigObject.

This will allow us to experiment with different implementations for
structured user preferences. It will also reduce repeated typing of
template arguments and better represent the purpose of the object.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h
index 0ce9a23f39..05eef14fb6 100644
--- a/src/library/trackcollection.h
+++ b/src/library/trackcollection.h
@@ -23,7 +23,7 @@
 #include <QSharedPointer>
 #include <QSqlDatabase>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/basetrackcache.h"
 #include "library/dao/trackdao.h"
 #include "library/dao/cratedao.h"
@@ -52,7 +52,7 @@ class TrackCollection : public QObject {
   public:
     static const int kRequiredSchemaVersion;
 
-    TrackCollection(ConfigObject<ConfigValue>* pConfig);
+    TrackCollection(UserSettingsPointer pConfig);
     virtual ~TrackCollection();
     bool checkForTables();
 
@@ -67,7 +67,7 @@ class TrackCollection : public QObject {
     void setTrackSource(QSharedPointer<BaseTrackCache> trackSource);
     void cancelLibraryScan();
 
-    ConfigObject<ConfigValue>* getConfig() {
+    UserSettingsPointer getConfig() {
         return m_pConfig;
     }
 
@@ -94,7 +94,7 @@ class TrackCollection : public QObject {
 #endif // __SQLITE3__
 
   private:
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     QSqlDatabase m_db;
     QSharedPointer<BaseTrackCache> m_defaultTrackSource;
     PlaylistDAO m_playlistDao;