Merge pull request #12201 from daschuer/nonConstErase

Introduce wrapper for non const iterators for erase and insert
mixxxdj · Oct 22, 2023 · c4204d2 · c4204d2
2 parents 920fa8a + cb30cc9
commit c4204d2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
@@ -56,7 +56,7 @@ constexpr int kFrequencyLowerLimit = 16;
 constexpr int kXfaderGridHLines = 3;
 constexpr int kXfaderGridVLines = 5;
 
-bool isMixingEQ(EffectManifest* pManifest) {
+bool isMixingEQ(const EffectManifest* pManifest) {
     return pManifest->isMixingEQ();
 }
 
@@ -1175,11 +1175,11 @@ const QList<EffectManifestPointer> DlgPrefMixer::getDeckEqManifests() const {
             allManifests.end(),
             [](const auto& pManifest) { return isMixingEQ(pManifest.data()); });
     if (m_eqEffectsOnly) {
-        constErase(&allManifests, nonEqsStartIt, allManifests.end());
+        erase(&allManifests, nonEqsStartIt, allManifests.end());
     } else {
         // Add a null item between EQs and non-EQs. The combobox fill function
         // will use this to insert a separator.
-        constInsert(&allManifests, nonEqsStartIt, EffectManifestPointer());
+        insert(&allManifests, nonEqsStartIt, EffectManifestPointer());
     }
     return allManifests;
 }

diff --git a/src/util/make_const_iterator.h b/src/util/make_const_iterator.h
@@ -34,6 +34,16 @@ typename C::const_iterator constErase(C* pContainer, I begin, I end) {
 #endif
 }
 
+template<typename C, typename I>
+typename C::iterator erase(C* pContainer, I begin, I end) {
+#if defined(QT_VERSION) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return pContainer->erase(make_const_iterator(*pContainer, begin),
+            make_const_iterator(*pContainer, end));
+#else
+    return pContainer->erase(begin, end);
+#endif
+}
+
 template<typename C, typename I>
 typename C::const_iterator constErase(C* pContainer, I it) {
 #if defined(QT_VERSION) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -43,6 +53,15 @@ typename C::const_iterator constErase(C* pContainer, I it) {
 #endif
 }
 
+template<typename C, typename I>
+typename C::iterator erase(C* pContainer, I it) {
+#if defined(QT_VERSION) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return pContainer->erase(make_const_iterator(*pContainer, it));
+#else
+    return pContainer->erase(it);
+#endif
+}
+
 template<typename C, typename I, class T>
 typename C::const_iterator constInsert(C* pContainer, I before, T t) {
 #if defined(QT_VERSION) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -52,3 +71,12 @@ typename C::const_iterator constInsert(C* pContainer, I before, T t) {
             pContainer->insert(make_iterator(pContainer, before), t));
 #endif
 }
+
+template<typename C, typename I, class T>
+typename C::iterator insert(C* pContainer, I before, T t) {
+#if defined(QT_VERSION) && QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return pContainer->insert(make_const_iterator(*pContainer, before), std::move(t));
+#else
+    return pContainer->insert(before, t);
+#endif
+}