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

fix compiler warnings
musescore · Mar 19, 2020 · 3d49d5c · 3d49d5c
2 parents 9c2e6f7 + 1a33984
commit 3d49d5c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/avsomr/CMakeLists.txt b/avsomr/CMakeLists.txt
@@ -72,13 +72,13 @@ if (NOT MSVC)
    set_target_properties (
       avsomr
       PROPERTIES
-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
+         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
       )
 else (NOT MSVC)
    set_target_properties (
       avsomr
       PROPERTIES
-         COMPILE_FLAGS "${PCH_INCLUDE}"    # TODO: Add disabling of unused private field warning?
+         COMPILE_FLAGS "${PCH_INCLUDE}"
       )
 endif (NOT MSVC)   
 

diff --git a/avsomr/ret.cpp b/avsomr/ret.cpp
@@ -122,6 +122,9 @@ QString Ret::text(Code c)
             case LocalInstaling:    return QObject::tr("Local OMR engine installing…");
             case LocalFailedExec:   return QObject::tr("Failed executing local OMR engine");
             case LocalAlreadyBuilding: return QObject::tr("Local OMR engine already building…");
+
+            case AvsOmrFirst:
+            case AvsOmrLast: break;
             }
       return QString();
       }
@@ -152,6 +155,9 @@ QString Ret::supportHint(Code c)
             case LocalInstaling:    return PleaseTryAgain;
             case LocalFailedExec:   return PleaseTryAgain;
             case LocalAlreadyBuilding: return PleaseTryAgain;
+
+            case AvsOmrFirst:
+            case AvsOmrLast: break;
             }
       return QString();
       }
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1680,7 +1680,6 @@ void Score::deleteItem(Element* el)
                   {
                   Chord* chord = toChord(el);
                   removeChordRest(chord, false);
-                  Segment* seg = chord->segment();
 
                   // replace with rest
                   if (chord->noteType() == NoteType::NORMAL) {

diff --git a/thirdparty/google_analytics/CMakeLists.txt b/thirdparty/google_analytics/CMakeLists.txt
@@ -27,6 +27,6 @@ target_link_libraries(google_analytics Qt5::Core Qt5::Network)
 
 if (MSVC)
   set_target_properties( google_analytics PROPERTIES
-    COMPILE_FLAGS "/wd4458"
+    COMPILE_FLAGS "/wd4458 /wd4127"
   )
 endif (MSVC)