summaryrefslogtreecommitdiffstats
path: root/src/controllers/dlgprefcontroller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/controllers/dlgprefcontroller.cpp')
-rw-r--r--src/controllers/dlgprefcontroller.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index db06452dad..2e743b6887 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -18,12 +18,12 @@
#include "controllers/controller.h"
#include "controllers/controllermanager.h"
#include "controllers/defs_controllers.h"
-#include "configobject.h"
+#include "preferences/usersettings.h"
#include "util/version.h"
DlgPrefController::DlgPrefController(QWidget* parent, Controller* controller,
ControllerManager* controllerManager,
- ConfigObject<ConfigValue> *pConfig)
+ UserSettingsPointer pConfig)
: DlgPreferencePage(parent),
m_pConfig(pConfig),
m_pControllerManager(controllerManager),
@@ -367,7 +367,7 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) {
presetDirs.append(presetFileInfo.canonicalPath());
ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset(
- presetPath, ControllerManager::getPresetPaths(m_pConfig));
+ presetPath, ControllerManager::getPresetPaths(m_pConfig.data()));
// Import the preset scripts to the user scripts folder.
for (QList<ControllerPreset::ScriptFileInfo>::iterator it =
@@ -731,7 +731,7 @@ void DlgPrefController::openScript() {
foreach (QModelIndex index, selectedIndices) {
selectedRows.insert(index.row());
}
- QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig);
+ QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig.data());
foreach (int row, selectedRows) {
QString scriptName = m_ui.m_pScriptsTableWidget->item(row, 0)->text();