Use constants instead of macros

mixxxdj · Oct 10, 2023 · 1549eda · 1549eda
1 parent 4b6e4be
commit 1549eda
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
@@ -254,7 +254,7 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
     }
 
     const SyncLockAlgorithm picker = static_cast<SyncLockAlgorithm>(
-            m_pConfig->getValue<int>(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+            m_pConfig->getValue<int>(ConfigKey(kBpmConfigGroup, kSyncLockAlorithmConfigKey),
                     PREFER_SOFT_LEADER));
     switch (picker) {
     case PREFER_SOFT_LEADER:

diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
@@ -2,15 +2,17 @@
 
 #include <gtest/gtest_prod.h>
 
+#include <QStrring>
+
 #include "audio/types.h"
 #include "engine/sync/syncable.h"
 #include "preferences/usersettings.h"
 
 class InternalClock;
 class EngineChannel;
 
-#define BPM_CONFIG_GROUP "[BPM]"
-#define SYNC_LOCK_ALGORITHM_CONFIG_KEY "sync_lock_algorithm"
+const QString kBpmConfigGroup = QStringLiteral("[BPM]");
+const QString kSyncLockAlgorithmConfigKey = QStringLiteral("sync_lock_algorithm");
 
 /// EngineSync is the heart of the Mixxx Sync Lock engine.  It knows which objects
 /// (Decks, Internal Clock, etc) are participating in Sync and what their statuses

diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
@@ -466,7 +466,7 @@ void DlgPrefDeck::slotUpdate() {
 
     const EngineSync::SyncLockAlgorithm syncLockAlgorithm =
             static_cast<EngineSync::SyncLockAlgorithm>(m_pConfig->getValue<int>(
-                    ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+                    ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                     EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
     if (syncLockAlgorithm == EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER) {
         radioButtonSoftLeader->setChecked(true);
@@ -741,10 +741,10 @@ void DlgPrefDeck::slotApply() {
                    ConfigValue(configSPAutoReset));
 
     if (radioButtonSoftLeader->isChecked()) {
-        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+        m_pConfig->setValue(ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                 static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
     } else {
-        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+        m_pConfig->setValue(ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                 static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_LOCK_BPM));
     }