diff options
Diffstat (limited to 'src/controllers/controllermanager.h')
| -rw-r--r-- | src/controllers/controllermanager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h index e1b4d061ab..32c35c1166 100644 --- a/src/controllers/controllermanager.h +++ b/src/controllers/controllermanager.h @@ -8,7 +8,7 @@ #ifndef CONTROLLERMANAGER_H #define CONTROLLERMANAGER_H -#include "configobject.h" +#include "preferences/usersettings.h" #include "controllers/controllerenumerator.h" #include "controllers/controllerpreset.h" #include "controllers/controllerpresetinfo.h" @@ -25,7 +25,7 @@ bool controllerCompare(Controller *a,Controller *b); class ControllerManager : public QObject { Q_OBJECT public: - ControllerManager(ConfigObject<ConfigValue> * pConfig); + ControllerManager(UserSettingsPointer pConfig); virtual ~ControllerManager(); QList<Controller*> getControllers() const; @@ -37,7 +37,7 @@ class ControllerManager : public QObject { void setUpDevices() { emit(requestSetUpDevices()); }; void savePresets(bool onlyActive=false) { emit(requestSave(onlyActive)); }; - static QList<QString> getPresetPaths(ConfigObject<ConfigValue>* pConfig); + static QList<QString> getPresetPaths(UserSettingsPointer pConfig); // If pathOrFilename is an absolute path, returns it. If it is a relative // path and it is contained within any of the directories in presetPaths, @@ -82,7 +82,7 @@ class ControllerManager : public QObject { } private: - ConfigObject<ConfigValue> *m_pConfig; + UserSettingsPointer m_pConfig; ControllerLearningEventFilter* m_pControllerLearningEventFilter; QTimer m_pollTimer; mutable QMutex m_mutex; |