Rename to getConfigKeyColorPalette to avoid overloading

danferns · Jul 31, 2024 · 8fa1c92 · 8fa1c92
1 parent 23dc2ea
commit 8fa1c92
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/preferences/colorpalettesettings.cpp b/src/preferences/colorpalettesettings.cpp
@@ -173,7 +173,7 @@ ColorPalette ColorPaletteSettings::getKeyColorPalette(
             mixxx::PredefinedColorPalettes::kDefaultKeyColorPalette);
 }
 
-ColorPalette ColorPaletteSettings::getKeyColorPalette() const {
+ColorPalette ColorPaletteSettings::getConfigKeyColorPalette() const {
     QString name = m_pConfig->getValueString(kKeyColorPaletteConfigKey);
     return getKeyColorPalette(name);
 }

diff --git a/src/preferences/colorpalettesettings.h b/src/preferences/colorpalettesettings.h
@@ -19,7 +19,7 @@ class ColorPaletteSettings {
     void setTrackColorPalette(const ColorPalette& colorPalette);
 
     ColorPalette getKeyColorPalette(const QString& name) const;
-    ColorPalette getKeyColorPalette() const;
+    ColorPalette getConfigKeyColorPalette() const;
     void setKeyColorPalette(const ColorPalette& colorPalette);
 
     ColorPalette getColorPalette(

diff --git a/src/preferences/dialog/dlgprefcolors.cpp b/src/preferences/dialog/dlgprefcolors.cpp
@@ -144,7 +144,7 @@ void DlgPrefColors::slotUpdate() {
     slotHotcuePaletteIndexChanged(comboBoxHotcueColors->currentIndex());
 
     const ColorPalette keyPalette =
-            m_colorPaletteSettings.getKeyColorPalette();
+            m_colorPaletteSettings.getConfigKeyColorPalette();
     comboBoxKeyColors->setCurrentText(QCoreApplication::translate(
             "PredefinedColorPalettes", qPrintable(keyPalette.getName())));
 
@@ -247,7 +247,7 @@ void DlgPrefColors::slotApply() {
     if (!bKeyColorPaletteFound) {
         m_colorPaletteSettings.setKeyColorPalette(
                 m_colorPaletteSettings.getColorPalette(keyColorPaletteName,
-                        m_colorPaletteSettings.getKeyColorPalette()));
+                        m_colorPaletteSettings.getConfigKeyColorPalette()));
     }
 
     int hotcueColorIndex = comboBoxHotcueDefaultColor->currentIndex();

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
@@ -1572,7 +1572,7 @@ QWidget* LegacySkinParser::parseLibrary(const QDomElement& node) {
 
     ColorPaletteSettings colorPaletteSettings(m_pConfig);
     ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
-    BaseTrackTableModel::setKeyColorPalette(colorPaletteSettings.getKeyColorPalette());
+    BaseTrackTableModel::setKeyColorPalette(colorPaletteSettings.getConfigKeyColorPalette());
 
     const auto applyPlayedTrackColor =
             m_pConfig->getValue(