fix Qt 5.9 build

Be-ing · Dec 1, 2020 · 3a519c2 · 3a519c2
1 parent de38b7d
commit 3a519c2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
@@ -44,7 +44,7 @@ EffectChain::EffectChain(const QString& group,
             ConfigKey(m_group, "num_presetsavailable"));
     m_pControlNumPresetsAvailable->set(m_pChainPresetManager->numPresets());
     m_pControlNumPresetsAvailable->setReadOnly();
-    connect(m_pChainPresetManager.get(),
+    connect(m_pChainPresetManager.data(),
             &EffectChainPresetManager::effectChainPresetListUpdated,
             this,
             &EffectChain::slotPresetListUpdated);

diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
@@ -211,13 +211,13 @@ void EffectsManager::saveEffectsXml() {
 
     QHash<QString, EffectChainPresetPointer> quickEffectChainPresets;
     for (auto it = m_quickEffectChains.begin(); it != m_quickEffectChains.end(); it++) {
-        auto pPreset = EffectChainPresetPointer(new EffectChainPreset(it.value().get()));
+        auto pPreset = EffectChainPresetPointer::create(it.value().data());
         quickEffectChainPresets.insert(it.key(), pPreset);
     }
 
     QList<EffectChainPresetPointer> standardEffectChainPresets;
     for (const auto& pChainSlot : std::as_const(m_standardEffectChains)) {
-        auto pPreset = EffectChainPresetPointer::create(pChainSlot.get());
+        auto pPreset = EffectChainPresetPointer::create(pChainSlot.data());
         standardEffectChainPresets.append(pPreset);
     }
 

diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
@@ -326,7 +326,7 @@ void EffectChainPresetManager::setQuickEffectPresetOrder(
 }
 
 void EffectChainPresetManager::savePreset(EffectChainPointer pChainSlot) {
-    EffectChainPresetPointer pPreset(new EffectChainPreset(pChainSlot.get()));
+    auto pPreset = EffectChainPresetPointer::create(pChainSlot.data());
     savePreset(pPreset);
 }
 

diff --git a/src/effects/specialeffectchains.cpp b/src/effects/specialeffectchains.cpp
@@ -113,12 +113,12 @@ QuickEffectChain::QuickEffectChain(const QString& group,
         addEffectSlot(formatEffectSlotGroup(group, i));
         m_effectSlots.at(i)->setEnabled(true);
     }
-    disconnect(m_pChainPresetManager.get(),
+    disconnect(m_pChainPresetManager.data(),
             &EffectChainPresetManager::effectChainPresetListUpdated,
             this,
             &QuickEffectChain::slotPresetListUpdated);
     m_pControlNumPresetsAvailable->forceSet(m_pChainPresetManager->numQuickEffectPresets());
-    connect(m_pChainPresetManager.get(),
+    connect(m_pChainPresetManager.data(),
             &EffectChainPresetManager::quickEffectChainPresetListUpdated,
             this,
             &QuickEffectChain::slotPresetListUpdated);

diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp
@@ -17,7 +17,7 @@ WEffectChainPresetButton::WEffectChainPresetButton(QWidget* parent, EffectsManag
             &QPushButton::pressed,
             this,
             &QPushButton::showMenu);
-    connect(m_pChainPresetManager.get(),
+    connect(m_pChainPresetManager.data(),
             &EffectChainPresetManager::effectChainPresetListUpdated,
             this,
             &WEffectChainPresetButton::populateMenu);
@@ -28,11 +28,11 @@ void WEffectChainPresetButton::setup(const QDomNode& node, const SkinContext& co
     m_pChain = EffectWidgetUtils::getEffectChainFromNode(
             node, context, m_pEffectsManager);
     for (const auto& pEffectSlot : m_pChain->getEffectSlots()) {
-        connect(pEffectSlot.get(),
+        connect(pEffectSlot.data(),
                 &EffectSlot::effectChanged,
                 this,
                 &WEffectChainPresetButton::populateMenu);
-        connect(pEffectSlot.get(),
+        connect(pEffectSlot.data(),
                 &EffectSlot::parametersChanged,
                 this,
                 &WEffectChainPresetButton::populateMenu);

diff --git a/src/widget/weffectchainpresetselector.cpp b/src/widget/weffectchainpresetselector.cpp
@@ -28,12 +28,12 @@ void WEffectChainPresetSelector::setup(const QDomNode& node, const SkinContext&
     }
 
     auto chainPresetListUpdateSignal = &EffectChainPresetManager::effectChainPresetListUpdated;
-    auto pQuickEffectChain = dynamic_cast<QuickEffectChain*>(m_pChain.get());
+    auto pQuickEffectChain = dynamic_cast<QuickEffectChain*>(m_pChain.data());
     if (pQuickEffectChain) {
         chainPresetListUpdateSignal = &EffectChainPresetManager::quickEffectChainPresetListUpdated;
         m_bQuickEffectChain = true;
     }
-    connect(m_pChainPresetManager.get(),
+    connect(m_pChainPresetManager.data(),
             chainPresetListUpdateSignal,
             this,
             &WEffectChainPresetSelector::populate);