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/controllers/dlgprefcontroller.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/controllers/dlgprefcontroller.cpp')
-rw-r--r-- | src/controllers/dlgprefcontroller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 2e743b6887..eabe3f1be3 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -367,7 +367,7 @@ void DlgPrefController::slotLoadPreset(int chosenIndex) { presetDirs.append(presetFileInfo.canonicalPath()); ControllerPresetPointer pPreset = ControllerPresetFileHandler::loadPreset( - presetPath, ControllerManager::getPresetPaths(m_pConfig.data())); + presetPath, ControllerManager::getPresetPaths(m_pConfig)); // 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.data()); + QList<QString> scriptPaths = ControllerManager::getPresetPaths(m_pConfig); foreach (int row, selectedRows) { QString scriptName = m_ui.m_pScriptsTableWidget->item(row, 0)->text(); |