Fix MSVC compiler warnings

reg.: declaration hides class member (C4458)
musescore · May 16, 2024 · 3953a68 · 3953a68
1 parent 48abfb8
commit 3953a68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/app/internal/consoleapp.cpp b/src/app/internal/consoleapp.cpp
@@ -127,10 +127,10 @@ void ConsoleApp::perform()
         // ====================================================
         // Process Autobot
         // ====================================================
-        CmdOptions::Autobot autobot = options.autobot;
-        if (!autobot.testCaseNameOrFile.isEmpty()) {
-            QMetaObject::invokeMethod(qApp, [this, autobot]() {
-                    processAutobot(autobot);
+        CmdOptions::Autobot ab = options.autobot;
+        if (!ab.testCaseNameOrFile.isEmpty()) {
+            QMetaObject::invokeMethod(qApp, [this, ab]() {
+                    processAutobot(ab);
                 }, Qt::QueuedConnection);
         } else {
             // ====================================================

diff --git a/src/notation/view/widgets/measureproperties.cpp b/src/notation/view/widgets/measureproperties.cpp
@@ -93,8 +93,8 @@ void MeasurePropertiesDialog::initMeasure()
         return;
     }
 
-    INotationInteraction::HitElementContext context = m_notation->interaction()->hitElementContext();
-    mu::engraving::Measure* measure = mu::engraving::toMeasure(context.element);
+    INotationInteraction::HitElementContext ctx = m_notation->interaction()->hitElementContext();
+    mu::engraving::Measure* measure = mu::engraving::toMeasure(ctx.element);
 
     if (!measure) {
         INotationSelectionPtr selection = m_notation->interaction()->selection();

diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -1467,14 +1467,14 @@ msecs_t PlaybackController::beatToMilliseconds(int measureIndex, int beatIndex)
 
 double PlaybackController::tempoMultiplier() const
 {
-    INotationPlaybackPtr playback = notationPlayback();
-    return playback ? playback->tempoMultiplier() : 1.0;
+    INotationPlaybackPtr pb = notationPlayback();
+    return pb ? pb->tempoMultiplier() : 1.0;
 }
 
 void PlaybackController::setTempoMultiplier(double multiplier)
 {
-    INotationPlaybackPtr playback = notationPlayback();
-    if (!playback) {
+    INotationPlaybackPtr pb = notationPlayback();
+    if (!pb) {
         return;
     }
 
@@ -1485,7 +1485,7 @@ void PlaybackController::setTempoMultiplier(double multiplier)
         pause();
     }
 
-    playback->setTempoMultiplier(multiplier);
+    pb->setTempoMultiplier(multiplier);
     seek(tick);
     updateLoop();