Fix (MSVC) compiler warnings

about local variables colliding with global ones
RomanPudashkin · Dec 10, 2021 · 4a1219b · 4a1219b
1 parent 4af1c6e
commit 4a1219b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -2253,8 +2253,8 @@ static const MusicXmlClefInfo findClefInfoByType(const ClefType& v)
     });
 
     IF_ASSERT_FAILED(it != CLEF_INFOS.cend()) {
-        static MusicXmlClefInfo dummy;
-        return dummy;
+        static MusicXmlClefInfo dummy_;
+        return dummy_;
     }
     return *it;
 }

diff --git a/src/notation/view/widgets/tupletdialog.cpp b/src/notation/view/widgets/tupletdialog.cpp
@@ -127,8 +127,8 @@ void TupletDialog::apply()
     options.numberType = numberType();
     options.bracketType = bracketType();
 
-    ActionData data = ActionData::make_arg1<TupletOptions>(options);
-    dispatcher()->dispatch("custom-tuplet", data);
+    ActionData data_ = ActionData::make_arg1<TupletOptions>(options);
+    dispatcher()->dispatch("custom-tuplet", data_);
 }
 
 void TupletDialog::bboxClicked(QAbstractButton* button)