[4.7.7] Fix compiler warnings

src/engraving/editing/edit.cpp

@@ -2827,7 +2827,6 @@ void Score::deleteItem(EngravingItem* el)
         el = chord;
     }
     // fall through
-
     case ElementType::CHORD:
     {
         Chord* chord = toChord(el);
@@ -3147,6 +3146,7 @@ void Score::deleteItem(EngravingItem* el)
         }
     }
     break;
+
     case ElementType::REHEARSAL_MARK:
     case ElementType::TEMPO_TEXT:
     {
@@ -3180,6 +3180,7 @@ void Score::deleteItem(EngravingItem* el)
 
         break;
     }
+
     case ElementType::OTTAVA_SEGMENT:
     case ElementType::HAIRPIN_SEGMENT:
     case ElementType::TRILL_SEGMENT:
@@ -3251,10 +3252,12 @@ void Score::deleteItem(EngravingItem* el)
             undoRemoveElement(el);
         }
         break;
+
     case ElementType::PLAY_COUNT_TEXT: {
         PlayCountText* pct = toPlayCountText(el);
         pct->barline()->undoChangeProperty(Pid::PLAY_COUNT_TEXT_SETTING, AutoCustomHide::HIDE);
     } break;
+
     case ElementType::INSTRUMENT_CHANGE:
     {
         InstrumentChange* ic = static_cast<InstrumentChange*>(el);
@@ -3335,6 +3338,7 @@ void Score::deleteItem(EngravingItem* el)
         EditSystemLocks::undoRemoveSystemLock(this, systemLock);
     }
     break;
+
     case ElementType::PARENTHESIS: {
         Parenthesis* paren = toParenthesis(el);
         // Use EditChord::removeChordParentheses when parent is a chord, fall through for all others
@@ -3353,7 +3357,7 @@ void Score::deleteItem(EngravingItem* el)
             break;
         }
     }
-
+    // fall through
     default:
         undoRemoveElement(el);
         break;

src/engraving/rendering/score/tdraw.cpp

@@ -1742,10 +1742,10 @@ void TDraw::draw(const TextFragment& textFragment, const TextBase* item, muse::d
 {
 #ifndef Q_OS_MACOS
     drawTextWorkaround(textFragment, item, painter);
-    return;
-#endif
+#else
     painter->setFont(textFragment.font(item));
     painter->drawText(textFragment.pos, textFragment.text);
+#endif
 }
 
 void TDraw::drawTextWorkaround(const TextFragment& textFragment, const TextBase* item, muse::draw::Painter* painter)

src/framework/midi/midievent.h

@@ -440,7 +440,7 @@ struct Event {
 
         switch (messageType()) {
         case MessageType::ChannelVoice10: return m_data[0] & 0x7F;
-        case MessageType::ChannelVoice20: return scaleDown(m_data[1] >> 16, 16, 7);
+        case MessageType::ChannelVoice20: return static_cast<uint8_t>(scaleDown(m_data[1] >> 16, 16, 7));
         default: assert(false);
         }
         return 0;
@@ -471,7 +471,7 @@ struct Event {
         assertOpcode({ Opcode::NoteOn, Opcode::NoteOff });
 
         switch (messageType()) {
-        case MessageType::ChannelVoice10: return scaleUp(m_data[0] & 0x7F, 7, 16);
+        case MessageType::ChannelVoice10: return static_cast<uint16_t>(scaleUp(m_data[0] & 0x7F, 7, 16));
         case MessageType::ChannelVoice20: return static_cast<uint16_t>(m_data[1] >> 16);
         default: assert(false);
         }
@@ -592,9 +592,11 @@ struct Event {
     {
         uint32_t val = data();
         if (messageType() == MessageType::ChannelVoice20) {
-            return scaleDown(val, 32, 7);
+            val = scaleDown(val, 32, 7);
+        } else if (messageType() == MessageType::ChannelVoice10 && opcode() == Opcode::PitchBend) {
+            val = scaleDown(val, 14, 7);
         }
-        return val;
+        return val & 0x7F;
     }
 
     uint32_t data14() const
@@ -836,7 +838,7 @@ struct Event {
             //D2.3
             case Opcode::AssignableController:
             case Opcode::RegisteredController: {
-                std::vector<std::pair<uint8_t, uint8_t> > controlChanges = {
+                std::vector<std::pair<uint8_t, uint32_t> > controlChanges = {
                     { (opcode() == Opcode::RegisteredController ? 101 : 99), bank() },
                     { (opcode() == Opcode::RegisteredController ? 100 : 98), index() },
                     { 6,  data() >> 25 }, // first 7 bits

src/importexport/mei/internal/meiimporter.h

@@ -60,7 +60,7 @@ class UIDRegister;
 struct ControlElementPosition {
     engraving::Measure* measure = nullptr;
     engraving::Fraction tick;
-    int track = 0;
+    engraving::track_idx_t track = 0;
     engraving::ChordRest* chordRest = nullptr;
 };
 

src/importexport/musicxml/internal/import/importmusicxmlpass2.cpp

@@ -2957,9 +2957,9 @@ void MusicXmlParserPass2::measure(const String& partId, const Fraction time)
         delete inferredFingering;
     }
 
-    for (auto& harmony : delayedHarmony) {
-        HarmonyDesc harmonyDesc = harmony.second;
-        Fraction tick = Fraction::fromTicks(harmony.first);
+    for (auto& delHarmony : delayedHarmony) {
+        HarmonyDesc harmonyDesc = delHarmony.second;
+        Fraction tick = Fraction::fromTicks(delHarmony.first);
         if (FretDiagram* fd = harmonyDesc.m_fretDiagram) {
             fd->setTrack(harmonyDesc.m_track);
             Segment* s = measure->getSegment(SegmentType::ChordRest, tick);

src/musesounds/internal/musesamplercheckstatusservice.cpp

@@ -103,7 +103,7 @@ Promise<RetVal<bool> > MuseSamplerCheckStatusService::checkForUpdate()
             return resolve(RetVal<bool>::make_ret(progress.ret));
         }
 
-        progress.val.finished().onReceive(this, [this, receivedData, localVersion, resolve](const ProgressResult& res) {
+        progress.val.finished().onReceive(this, [receivedData, localVersion, resolve](const ProgressResult& res) {
             RetVal<bool> result = RetVal<bool>::make_ok(false);
 
             if (res.ret) {