Merge pull request #22701 from Jojo-Schmitz/compiler-warnings

Fix MSVC compiler warnings
musescore · May 17, 2024 · 2e494cf · 2e494cf
2 parents b98074f + 63e01f1
commit 2e494cf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/buildscripts/ci/withoutqt/setup.sh b/buildscripts/ci/withoutqt/setup.sh
@@ -108,7 +108,7 @@ sudo apt-get install -y --no-install-recommends \
 
 # COMPILER
 
-gcc_version="11"
+gcc_version="10"
 sudo apt-get install -y --no-install-recommends "g++-${gcc_version}"
 sudo update-alternatives \
   --install /usr/bin/gcc gcc "/usr/bin/gcc-${gcc_version}" 40 \

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 autobotOptions = options.autobot;
+        if (!autobotOptions.testCaseNameOrFile.isEmpty()) {
+            QMetaObject::invokeMethod(qApp, [this, autobotOptions]() {
+                    processAutobot(autobotOptions);
                 }, 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
@@ -1457,24 +1457,17 @@ MeasureBeat PlaybackController::currentBeat() const
 
 msecs_t PlaybackController::beatToMilliseconds(int measureIndex, int beatIndex) const
 {
-    if (!notationPlayback()) {
-        return 0;
-    }
-
-    int tick = notationPlayback()->beatToTick(measureIndex, beatIndex);
-    return tickToMsecs(tick);
+    return notationPlayback() ? tickToMsecs(notationPlayback()->beatToTick(measureIndex, beatIndex)) : 0;
 }
 
 double PlaybackController::tempoMultiplier() const
 {
-    INotationPlaybackPtr playback = notationPlayback();
-    return playback ? playback->tempoMultiplier() : 1.0;
+    return notationPlayback() ? notationPlayback()->tempoMultiplier() : 1.0;
 }
 
 void PlaybackController::setTempoMultiplier(double multiplier)
 {
-    INotationPlaybackPtr playback = notationPlayback();
-    if (!playback) {
+    if (!notationPlayback()) {
         return;
     }
 
@@ -1485,7 +1478,7 @@ void PlaybackController::setTempoMultiplier(double multiplier)
         pause();
     }
 
-    playback->setTempoMultiplier(multiplier);
+    notationPlayback()->setTempoMultiplier(multiplier);
     seek(tick);
     updateLoop();