Merge pull request #29747 from rettinghaus/warning

Unify fallthroughs

Author: cbjeukendrup

src/engraving/api/v1/cursor.cpp

@@ -363,7 +363,8 @@ void Cursor::add(EngravingItem* wrapped)
             s->setParent(curElement);
             m_score->undoAddElement(s);
         }
-    } // FALLTHROUGH
+        [[fallthrough]];
+    }
     case ElementType::FINGERING:
     case ElementType::BEND:
     case ElementType::NOTEHEAD: {

src/engraving/dom/harmony.cpp

@@ -1527,6 +1527,7 @@ bool Harmony::setProperty(Pid pid, const PropertyValue& v)
             }
             score()->rebuildFretBox();
         }
+        break;
     }
     default:
         return TextBase::setProperty(pid, v);

src/engraving/dom/page.cpp

@@ -394,12 +394,12 @@ TextBlock Page::replaceTextMacros(const TextBlock& tb) const
                     if (!m_no) {
                         break;
                     }
-                // FALLTHROUGH
+                    [[fallthrough]];
                 case 'N': // on page 1 only if there are multiple pages
                     if ((score()->npages() + score()->pageNumberOffset()) <= 1) {
                         break;
                     }
-                // FALLTHROUGH
+                    [[fallthrough]];
                 case 'P': // on all pages
                 {
                     int no = static_cast<int>(m_no) + 1 + score()->pageNumberOffset();
@@ -426,7 +426,7 @@ TextBlock Page::replaceTextMacros(const TextBlock& tb) const
                     if (!m_no) {
                         break;
                     }
-                // FALLTHROUGH
+                    [[fallthrough]];
                 case 'I':
                     newFragments.back().text += score()->metaTag(u"partName");
                     break;
@@ -471,7 +471,7 @@ TextBlock Page::replaceTextMacros(const TextBlock& tb) const
                     if (m_no) {
                         break;
                     }
-                // FALLTHROUGH
+                    [[fallthrough]];
                 case 'c':
                 {
                     const String copyrightString = score()->metaTag(u"copyright");

src/engraving/dom/pitchspelling.cpp

@@ -747,11 +747,11 @@ void Score::spellNotelist(std::vector<Note*>& notes)
             case 3:
                 k = end - start - 3;
                 changeAllTpcs(notes[end - 3], tab[(notes[end - 3]->pitch() % 12) * 2 + ((opt & (1 << k)) >> k)]);
-            // FALLTHROUGH
+                [[fallthrough]];
             case 2:
                 k = end - start - 2;
                 changeAllTpcs(notes[end - 2], tab[(notes[end - 2]->pitch() % 12) * 2 + ((opt & (1 << k)) >> k)]);
-            // FALLTHROUGH
+                [[fallthrough]];
             case 1:
                 k = end - start - 1;
                 changeAllTpcs(notes[end - 1], tab[(notes[end - 1]->pitch() % 12) * 2 + ((opt & (1 << k)) >> k)]);

src/engraving/dom/realizedharmony.cpp

@@ -124,7 +124,7 @@ const RealizedHarmony::PitchMap RealizedHarmony::generateNotes(int rootTpc, int
         if (!m_harmony->parsedForm()->understandable()) {
             break;
         }
-    // FALLTHROUGH
+        [[fallthrough]];
     case Voicing::CLOSE:        //Voices notes in close position in the first octave above middle C
     {
         notes.insert({ rootPitch + DEFAULT_OCTAVE * PITCH_DELTA_OCTAVE, rootTpc });
@@ -439,7 +439,7 @@ RealizedHarmony::PitchMap RealizedHarmony::getIntervals(int rootTpc, bool litera
             ret.insert({ 9 + RANK_MULT * RANK_ADD, tpcInterval(rootTpc, 13, 0) });               //maj13
             omit |= 1 << 13;
         }
-    // FALLTHROUGH
+        [[fallthrough]];
     case 11:
         if (!(omit & (1 << 11))) {
             if (quality == "minor") {
@@ -449,13 +449,13 @@ RealizedHarmony::PitchMap RealizedHarmony::getIntervals(int rootTpc, bool litera
             }
             omit |= 1 << 11;
         }
-    // FALLTHROUGH
+        [[fallthrough]];
     case 9:
         if (!(omit & (1 << 9))) {
             ret.insert({ 2 + RANK_MULT * RANK_9TH, tpcInterval(rootTpc, 9, 0) });               //maj9
             omit |= 1 << 9;
         }
-    // FALLTHROUGH
+        [[fallthrough]];
     case 7:
         if (!(omit & (1 << 7))) {
             if (quality == "major") {