AnalyzerPlugin: Use class instead of simple struct

A first step towards merging #3439.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/preferences/dialog/dlgprefbeats.cpp b/src/preferences/dialog/dlgprefbeats.cpp
index 74f9817520..59445b83fc 100644
--- a/src/preferences/dialog/dlgprefbeats.cpp
+++ b/src/preferences/dialog/dlgprefbeats.cpp
@@ -17,7 +17,7 @@ DlgPrefBeats::DlgPrefBeats(QWidget* parent, UserSettingsPointer pConfig)
 
     m_availablePlugins = AnalyzerBeats::availablePlugins();
     for (const auto& info : qAsConst(m_availablePlugins)) {
-        comboBoxBeatPlugin->addItem(info.name, info.id);
+        comboBoxBeatPlugin->addItem(info.name(), info.id());
     }
 
     loadSettings();
@@ -68,7 +68,7 @@ void DlgPrefBeats::loadSettings() {
 
 void DlgPrefBeats::slotResetToDefaults() {
     if (m_availablePlugins.size() > 0) {
-        m_selectedAnalyzerId = m_availablePlugins[0].id;
+        m_selectedAnalyzerId = m_availablePlugins[0].id();
     }
     m_bAnalyzerEnabled = m_bpmSettings.getBpmDetectionEnabledDefault();
     m_bFixedTempoEnabled = m_bpmSettings.getFixedTempoAssumptionDefault();
@@ -82,7 +82,7 @@ void DlgPrefBeats::pluginSelected(int i) {
     if (i == -1) {
         return;
     }
-    m_selectedAnalyzerId = m_availablePlugins[i].id;
+    m_selectedAnalyzerId = m_availablePlugins[i].id();
     slotUpdate();
 }
 
@@ -113,10 +113,10 @@ void DlgPrefBeats::slotUpdate() {
         bool found = false;
         for (int i = 0; i < m_availablePlugins.size(); ++i) {
             const auto& info = m_availablePlugins.at(i);
-            if (info.id == m_selectedAnalyzerId) {
+            if (info.id() == m_selectedAnalyzerId) {
                 found = true;
                 comboBoxBeatPlugin->setCurrentIndex(i);
-                if (!m_availablePlugins[i].constantTempoSupported) {
+                if (!m_availablePlugins[i].isConstantTempoSupported()) {
                     checkBoxFixedTempo->setEnabled(false);
                 }
                 break;
@@ -124,7 +124,7 @@ void DlgPrefBeats::slotUpdate() {
         }
         if (!found) {
             comboBoxBeatPlugin->setCurrentIndex(0);
-            m_selectedAnalyzerId = m_availablePlugins[0].id;
+            m_selectedAnalyzerId = m_availablePlugins[0].id();
         }
     }
 
diff --git a/src/preferences/dialog/dlgprefkey.cpp b/src/preferences/dialog/dlgprefkey.cpp
index 02bd789e66..78e8240a5c 100644
--- a/src/preferences/dialog/dlgprefkey.cpp
+++ b/src/preferences/dialog/dlgprefkey.cpp
@@ -45,7 +45,7 @@ DlgPrefKey::DlgPrefKey(QWidget* parent, UserSettingsPointer pConfig)
 
     m_availablePlugins = AnalyzerKey::availablePlugins();
     for (const auto& info : qAsConst(m_availablePlugins)) {
-        plugincombo->addItem(info.name, info.id);
+        plugincombo->addItem(info.name(), info.id());
     }
 
     m_pKeyNotation = new ControlProxy(ConfigKey("[Library]", "key_notation"), this);
@@ -142,7 +142,7 @@ void DlgPrefKey::slotResetToDefaults() {
     m_bFastAnalysisEnabled = m_keySettings.getFastAnalysisDefault();
     m_bReanalyzeEnabled = m_keySettings.getReanalyzeWhenSettingsChangeDefault();
     if (m_availablePlugins.size() > 0) {
-        m_selectedAnalyzerId = m_availablePlugins[0].id;
+        m_selectedAnalyzerId = m_availablePlugins[0].id();
     }
 
     KeyUtils::KeyNotation notation_type;
@@ -169,7 +169,7 @@ void DlgPrefKey::pluginSelected(int i) {
     if (i == -1) {
         return;
     }
-    m_selectedAnalyzerId = m_availablePlugins[i].id;
+    m_selectedAnalyzerId = m_availablePlugins[i].id();
     slotUpdate();
 }
 
@@ -252,7 +252,7 @@ void DlgPrefKey::slotUpdate() {
         bool found = false;
         for (int i = 0; i < m_availablePlugins.size(); ++i) {
             const auto& info = m_availablePlugins.at(i);
-            if (info.id == m_selectedAnalyzerId) {
+            if (info.id() == m_selectedAnalyzerId) {
                 plugincombo->setCurrentIndex(i);
                 found = true;
                 break;
@@ -260,7 +260,7 @@ void DlgPrefKey::slotUpdate() {
         }
         if (!found) {
             plugincombo->setCurrentIndex(0);
-            m_selectedAnalyzerId = m_availablePlugins[0].id;
+            m_selectedAnalyzerId = m_availablePlugins[0].id();
         }
     }
 }