Fix code style, compiler warnings and unit tests

Jojo-Schmitz · Dec 9, 2021 · b7b0fac · b7b0fac
1 parent 552263e
commit b7b0fac
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 25 deletions.
diff --git a/src/engraving/layout/layoutsystem.cpp b/src/engraving/layout/layoutsystem.cpp
@@ -188,7 +188,7 @@ System* LayoutSystem::collectSystem(const LayoutOptions& options, LayoutContext&
                 ctx.curMeasure->setParent(oldSystem);
             }
             // If the last appended measure caused a re-layout of the previous measures, now that we are
-            // removing it we need to re-layout the previous measures again. 
+            // removing it we need to re-layout the previous measures again.
             if (changeMinSysTicks) {
                 minTicks = prevMinTicks; // If the last measure caused it to change, now we need to restore it!
                 for (MeasureBase* mb : system->measures()) {
@@ -421,7 +421,6 @@ System* LayoutSystem::collectSystem(const LayoutOptions& options, LayoutContext&
             }
             mb->setPos(pos);
             Measure* m = toMeasure(mb);
-            qreal stretch = m->basicStretch();
             qreal weight = m->stretchWeight(); // Updated stretching formula
             ww += rest * weight;
             m->stretchMeasure(ww);

diff --git a/src/engraving/libmscore/measure.cpp b/src/engraving/libmscore/measure.cpp
@@ -3152,17 +3152,13 @@ void Measure::stretchMeasure(qreal targetWidth)
 {
     bbox().setWidth(targetWidth);
 
-    Fraction minTick = computeTicks();
-
     //---------------------------------------------------
     //    compute stretch
     //---------------------------------------------------
 
     std::multimap<qreal, Segment*> springs;
 
-    //Fraction minTicks = computeTicks();
     Fraction minTicks = minSysTicks(); // The stretching must be done according to the shortest note *of the system*!
-    qreal minNoteSpace = (score()->noteHeadWidth() + score()->styleMM(Sid::minNoteDistance));
 
     Segment* seg = first();
     while (seg && (!seg->enabled() || seg->allElementsInvisible())) {

diff --git a/src/engraving/utests/beam_data/Beam-A.mscx b/src/engraving/utests/beam_data/Beam-A.mscx
@@ -712,8 +712,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>32</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>

diff --git a/src/engraving/utests/beam_data/Beam-B.mscx b/src/engraving/utests/beam_data/Beam-B.mscx
@@ -297,8 +297,8 @@
             </Chord>
           <Beam>
             <StemDirection>up</StemDirection>
-            <l1>-6</l1>
-            <l2>-8</l2>
+            <l1>0</l1>
+            <l2>-6</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -1123,8 +1123,8 @@
             </Chord>
           <Beam>
             <StemDirection>down</StemDirection>
-            <l1>38</l1>
-            <l2>40</l2>
+            <l1>32</l1>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>

diff --git a/src/engraving/utests/beam_data/Beam-C.mscx b/src/engraving/utests/beam_data/Beam-C.mscx
@@ -255,8 +255,8 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-6</l1>
-            <l2>-8</l2>
+            <l1>0</l1>
+            <l2>-6</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>

diff --git a/src/engraving/utests/beam_data/Beam-D.mscx b/src/engraving/utests/beam_data/Beam-D.mscx
@@ -814,7 +814,7 @@
         <voice>
           <Beam>
             <StemDirection>down</StemDirection>
-            <l1>44</l1>
+            <l1>42</l1>
             <l2>48</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/beam_data/Beam-E.mscx b/src/engraving/utests/beam_data/Beam-E.mscx
@@ -990,7 +990,7 @@
         <voice>
           <Beam>
             <StemDirection>down</StemDirection>
-            <l1>52</l1>
+            <l1>46</l1>
             <l2>48</l2>
             </Beam>
           <Chord>
@@ -1010,7 +1010,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>52</l1>
-            <l2>48</l2>
+            <l2>46</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -1030,7 +1030,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>52</l1>
-            <l2>48</l2>
+            <l2>46</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>

diff --git a/src/engraving/utests/beam_data/Beam-F.mscx b/src/engraving/utests/beam_data/Beam-F.mscx
@@ -992,7 +992,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>48</l1>
-            <l2>44</l2>
+            <l2>42</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -1011,7 +1011,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>48</l1>
-            <l2>44</l2>
+            <l2>42</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -1031,7 +1031,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>48</l1>
-            <l2>44</l2>
+            <l2>42</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>

diff --git a/src/engraving/utests/beam_data/Beam-G.mscx b/src/engraving/utests/beam_data/Beam-G.mscx
@@ -902,7 +902,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>44</l1>
-            <l2>40</l2>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>
@@ -922,7 +922,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>44</l1>
-            <l2>40</l2>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -941,7 +941,7 @@
           <Beam>
             <StemDirection>down</StemDirection>
             <l1>44</l1>
-            <l2>40</l2>
+            <l2>38</l2>
             </Beam>
           <Chord>
             <BeamMode>begin</BeamMode>

diff --git a/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx b/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-lyrics-ref.mscx
@@ -287,7 +287,7 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>24</l1>
+            <l1>30</l1>
             <l2>32</l2>
             </Beam>
           <Chord>