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/controllers/defs_controllers.h b/src/controllers/defs_controllers.h
index 3877d67f20..906f07ac8c 100644
--- a/src/controllers/defs_controllers.h
+++ b/src/controllers/defs_controllers.h
@@ -6,22 +6,22 @@
  ***************************************************************************/
 
 #include <QDir>
-#include "configobject.h"
+#include "preferences/usersettings.h"
 
-inline QString resourcePresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString resourcePresetsPath(UserSettingsPointer pConfig) {
     QString presetsPath = pConfig->getResourcePath();
     QDir dir(presetsPath.append("/controllers/"));
     return dir.absolutePath().append("/");
 }
 
 // Prior to Mixxx 1.11.0 presets were stored in ${SETTINGS_PATH}/midi.
-inline QString legacyUserPresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString legacyUserPresetsPath(UserSettingsPointer pConfig) {
     QString presetsPath = pConfig->getSettingsPath();
     QDir dir(presetsPath.append("/midi/"));
     return dir.absolutePath().append("/");
 }
 
-inline QString userPresetsPath(ConfigObject<ConfigValue>* pConfig) {
+inline QString userPresetsPath(UserSettingsPointer pConfig) {
     QString presetsPath = pConfig->getSettingsPath();
     QDir dir(presetsPath.append("/controllers/"));
     return dir.absolutePath().append("/");