diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-09-17 23:01:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 23:01:28 +0200 |
| commit | df1e1795876b3e3bd9ab754553913ff542e76f2b (patch) | |
| tree | c18e1fb514ee0f52862d2af3b40e324b7886ff94 /src/controllers | |
| parent | 23bb0f202acf80ab5282aebcb485c318d09caec9 (diff) | |
| parent | 8fe2d54d307e7fdc1c98e0be7b09f30931ae4bd4 (diff) | |
Merge pull request #4293 from Be-ing/qfileinfo_qt6
explicitly convert QStrings to QFileInfos
Diffstat (limited to 'src/controllers')
| -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 8816f2c74c..d6db5c0422 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -519,7 +519,7 @@ void DlgPrefController::slotApply() { QString mappingPath = mappingPathFromIndex(m_ui.comboBoxMapping->currentIndex()); m_pMapping = LegacyControllerMappingFileHandler::loadMapping( - mappingPath, QDir(resourceMappingsPath(m_pConfig))); + QFileInfo(mappingPath), QDir(resourceMappingsPath(m_pConfig))); // Load the resulting mapping (which has been mutated by the input/output // table models). The controller clones the mapping so we aren't touching @@ -581,7 +581,7 @@ void DlgPrefController::slotMappingSelected(int chosenIndex) { std::shared_ptr<LegacyControllerMapping> pMapping = LegacyControllerMappingFileHandler::loadMapping( - mappingPath, QDir(resourceMappingsPath(m_pConfig))); + QFileInfo(mappingPath), QDir(resourceMappingsPath(m_pConfig))); if (pMapping) { DEBUG_ASSERT(!pMapping->isDirty()); |