Fix some Qt 5.15 deprecation warnings

musescore · Oct 3, 2020 · 1d3d029 · 1d3d029
1 parent 005adac
commit 1d3d029
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -157,7 +157,7 @@ void Staff::swapBracket(int oldIdx, int newIdx)
     fillBrackets(idx);
     _brackets[oldIdx]->setColumn(newIdx);
     _brackets[newIdx]->setColumn(oldIdx);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
     _brackets.swapItemsAt(oldIdx, newIdx);
 #else
     _brackets.swap(oldIdx, newIdx);
@@ -179,7 +179,7 @@ void Staff::changeBracketColumn(int oldColumn, int newColumn)
         int newIdx = i + step;
         _brackets[oldIdx]->setColumn(newIdx);
         _brackets[newIdx]->setColumn(oldIdx);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
         _brackets.swapItemsAt(oldIdx, newIdx);
 #else
         _brackets.swap(oldIdx, newIdx);

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -2067,7 +2067,7 @@ void RemoveExcerpt::redo(EditData*)
 
 void SwapExcerpt::flip(EditData*)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
     score->excerpts().swapItemsAt(pos1, pos2);
 #else
     score->excerpts().swap(pos1, pos2);

diff --git a/mu4/instruments/view/instrumentlistmodel.cpp b/mu4/instruments/view/instrumentlistmodel.cpp
@@ -204,7 +204,11 @@ void InstrumentListModel::unselectInstrument(const QString& id)
 
 void InstrumentListModel::swapSelectedInstruments(int firstIndex, int secondIndex)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+    m_selectedInstruments.swapItemsAt(firstIndex, secondIndex);
+#else
     m_selectedInstruments.swap(firstIndex, secondIndex);
+#endif
     emit selectedInstrumentsChanged();
 }
 

diff --git a/mu4/plugins/view/pluginsmodel.cpp b/mu4/plugins/view/pluginsmodel.cpp
@@ -176,7 +176,11 @@ QStringList PluginsModel::categories() const
         result << plugin.category;
     }
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) // ??
+    return result.values();
+#else
     return result.toList();
+#endif
 }
 
 void PluginsModel::updatePlugin(const PluginInfo& plugin)

diff --git a/mu4/userscores/view/templatesmodel.cpp b/mu4/userscores/view/templatesmodel.cpp
@@ -31,7 +31,11 @@ void TemplatesModel::load()
 
 QStringList TemplatesModel::categoriesTitles() const
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) // ??
+    return m_visibleCategoriesTitles.values();
+#else
     return m_visibleCategoriesTitles.toList();
+#endif
 }
 
 QString TemplatesModel::currentTemplatePath() const

diff --git a/thirdparty/soloud/src/core/soloud_bus.cpp b/thirdparty/soloud/src/core/soloud_bus.cpp
@@ -41,8 +41,8 @@ namespace SoLoud
 
 	unsigned int BusInstance::getAudio(float *aBuffer, unsigned int aSamplesToRead, unsigned int aBufferSize)
 	{
-		int handle = mParent->mChannelHandle;
-		if (handle == 0) 
+		int _handle = mParent->mChannelHandle;
+		if (_handle == 0)
 		{
 			// Avoid reuse of scratch data if this bus hasn't played anything yet
 			unsigned int i;
@@ -58,7 +58,7 @@ namespace SoLoud
 			mScratch.init(mScratchSize * MAX_CHANNELS);
 		}
 
-		s->mixBus_internal(aBuffer, aSamplesToRead, aBufferSize, mScratch.mData, handle, mSamplerate, mChannels);
+		s->mixBus_internal(aBuffer, aSamplesToRead, aBufferSize, mScratch.mData, _handle, mSamplerate, mChannels);
 
 		int i;
 		if (mParent->mFlags & AudioSource::VISUALIZATION_DATA)