diff options
author | RJ Ryan <rryan@mixxx.org> | 2016-01-24 22:57:41 -0800 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2016-01-24 22:57:41 -0800 |
commit | 83e58a40a109acda194078ad8e53d07de68799bd (patch) | |
tree | 1a42d622c056aee939aa618abfbcdd0969ed5a23 /src/engine/enginemaster.cpp | |
parent | 479c9e15159299667f2f7d16d65a8565f656a376 (diff) |
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.
Diffstat (limited to 'src/engine/enginemaster.cpp')
-rw-r--r-- | src/engine/enginemaster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp index d0381be74c..767133e4e5 100644 --- a/src/engine/enginemaster.cpp +++ b/src/engine/enginemaster.cpp @@ -4,7 +4,7 @@ #include <QList> #include <QPair> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlaudiotaperpot.h" #include "controlaudiotaperpot.h" #include "controlpotmeter.h" @@ -29,7 +29,7 @@ #include "util/timer.h" #include "util/trace.h" -EngineMaster::EngineMaster(ConfigObject<ConfigValue>* _config, +EngineMaster::EngineMaster(UserSettingsPointer _config, const char* group, EffectsManager* pEffectsManager, bool bEnableSidechain, |