Merge pull request #30751 from cbjeukendrup/sp_literal

Introduce `_sp` literal

Author: cbjeukendrup

src/engraving/dom/ambitus.cpp

@@ -40,7 +40,6 @@
 using namespace mu;
 using namespace mu::engraving;
 
-const Spatium Ambitus::LINEWIDTH_DEFAULT = Spatium(0.12);
 //---------------------------------------------------------
 //   Ambitus
 //---------------------------------------------------------
@@ -446,7 +445,7 @@ PropertyValue Ambitus::propertyDefault(Pid id) const
     case Pid::GHOST:
         return HASLINE_DEFAULT;
     case Pid::LINE_WIDTH:
-        return Spatium(LINEWIDTH_DEFAULT);
+        return LINEWIDTH_DEFAULT;
     case Pid::TPC1:
         return estimateRanges().topTpc;
     case Pid::FBPARENTHESIS1:

src/engraving/dom/ambitus.h

@@ -48,7 +48,7 @@ class Ambitus final : public EngravingItem
     static constexpr NoteHeadType NOTEHEADTYPE_DEFAULT = NoteHeadType::HEAD_AUTO;
     static constexpr DirectionH DIRECTION_DEFAULT = DirectionH::AUTO;
     static constexpr bool HASLINE_DEFAULT = true;
-    static const Spatium LINEWIDTH_DEFAULT;
+    static constexpr Spatium LINEWIDTH_DEFAULT = 0.12_sp;
     static constexpr double LINEOFFSET_DEFAULT = 0.8;               // the distance between notehead and line
 
     Ambitus* clone() const override { return new Ambitus(*this); }

src/engraving/dom/box.cpp

@@ -250,12 +250,12 @@ PropertyValue Box::propertyDefault(Pid id) const
     switch (id) {
     case Pid::BOX_HEIGHT:
     case Pid::BOX_WIDTH:
-        return Spatium(0.0);
+        return 0.0_sp;
 
     case Pid::TOP_GAP:
-        return isHBox() ? Spatium(0.0) : style().styleS(Sid::systemFrameDistance);
+        return isHBox() ? 0.0_sp : style().styleS(Sid::systemFrameDistance);
     case Pid::BOTTOM_GAP:
-        return isHBox() ? Spatium(0.0) : style().styleS(Sid::frameSystemDistance);
+        return isHBox() ? 0.0_sp : style().styleS(Sid::frameSystemDistance);
 
     case Pid::LEFT_MARGIN:
     case Pid::RIGHT_MARGIN:
@@ -597,7 +597,7 @@ PropertyValue HBox::propertyDefault(Pid id) const
     case Pid::CREATE_SYSTEM_HEADER:
         return true;
     case Pid::BOX_WIDTH:
-        return Spatium(5.0);
+        return 5.0_sp;
     default:
         return Box::propertyDefault(id);
     }
@@ -624,12 +624,12 @@ VBox::VBox(System* parent)
 
 double VBox::minHeight() const
 {
-    return absoluteFromSpatium(Spatium(10));
+    return absoluteFromSpatium(10_sp);
 }
 
 double VBox::maxHeight() const
 {
-    return absoluteFromSpatium(Spatium(30));
+    return absoluteFromSpatium(30_sp);
 }
 
 PropertyValue VBox::getProperty(Pid propertyId) const
@@ -654,7 +654,7 @@ PropertyValue VBox::propertyDefault(Pid id) const
 {
     switch (id) {
     case Pid::BOX_HEIGHT:
-        return Spatium(10.0);
+        return 10.0_sp;
     default:
         return Box::propertyDefault(id);
     }
@@ -892,7 +892,7 @@ PropertyValue FBox::propertyDefault(Pid propertyId) const
         return 1.0;
     case Pid::FRET_FRAME_COLUMN_GAP:
     case Pid::FRET_FRAME_ROW_GAP:
-        return Spatium(3.0);
+        return 3.0_sp;
     case Pid::FRET_FRAME_CHORDS_PER_ROW:
         return 8;
     case Pid::FRET_FRAME_H_ALIGN:
@@ -1057,7 +1057,7 @@ PropertyValue TBox::propertyDefault(Pid id) const
 {
     switch (id) {
     case Pid::BOX_HEIGHT:
-        return Spatium(1);
+        return 1_sp;
     default:
         return VBox::propertyDefault(id);
     }

src/engraving/dom/chord.cpp

@@ -981,7 +981,7 @@ void Chord::setBeamExtension(double extension)
 {
     if (m_stem) {
         double baseLength = m_stem->absoluteFromSpatium(m_stem->baseLength());
-        m_stem->setBaseLength(std::max(Spatium::fromMM(baseLength + extension, spatium()), Spatium(0.0)));
+        m_stem->setBaseLength(std::max(Spatium::fromMM(baseLength + extension, spatium()), 0.0_sp));
         m_defaultStemLength = std::max(m_defaultStemLength + extension, m_stem->absoluteFromSpatium(m_stem->baseLength()));
     }
 }

src/engraving/dom/engravingitem.cpp

@@ -89,7 +89,7 @@ EngravingItem::EngravingItem(const ElementType& type, EngravingObject* parent, E
     m_flags         = f;
     m_color         = configuration()->defaultColor();
     m_z             = -1;
-    m_minDistance   = Spatium(0.0);
+    m_minDistance   = 0.0_sp;
 }
 
 EngravingItem::EngravingItem(const EngravingItem& e, bool link)
@@ -1531,7 +1531,7 @@ PropertyValue EngravingItem::propertyDefault(Pid pid) const
         if (v.isValid()) {
             return v;
         }
-        return Spatium(0.0);
+        return 0.0_sp;
     }
     case Pid::AUTOPLACE:
         return true;

src/engraving/dom/hairpin.cpp

@@ -730,7 +730,7 @@ PropertyValue Hairpin::propertyDefault(Pid id) const
 
     case Pid::BEGIN_HOOK_HEIGHT:
     case Pid::END_HOOK_HEIGHT:
-        return Spatium(1.9);
+        return 1.9_sp;
 
     case Pid::LINE_VISIBLE:
         return true;

src/engraving/dom/laissezvib.cpp

@@ -55,7 +55,7 @@ PropertyValue LaissezVib::propertyDefault(Pid propertyId) const
 {
     switch (propertyId) {
     case Pid::MIN_LENGTH:
-        return Spatium(2.0);
+        return 2.0_sp;
     default:
         return Tie::propertyDefault(propertyId);
     }

src/engraving/dom/laissezvib.h

@@ -80,6 +80,6 @@ class LaissezVib : public Tie
     LaissezVibSegment* segmentAt(int n) { return toLaissezVibSegment(Spanner::segmentAt(n)); }
     const LaissezVibSegment* segmentAt(int n) const { return toLaissezVibSegment(Spanner::segmentAt(n)); }
 private:
-    Spatium m_minLength = Spatium(2.0);
+    Spatium m_minLength = 2.0_sp;
 };
 }

src/engraving/dom/line.cpp

@@ -828,7 +828,7 @@ RectF LineSegment::drag(EditData& ed)
 Spatium LineSegment::lineWidth() const
 {
     if (!line()) {
-        return Spatium(0.0);
+        return 0.0_sp;
     }
 
     return line()->lineWidth();
@@ -883,7 +883,7 @@ SLine::SLine(const ElementType& type, EngravingItem* parent, ElementFlags f)
 {
     setTrack(0);
     m_lineColor = configuration()->defaultColor();
-    m_lineWidth = Spatium(0.15);
+    m_lineWidth = 0.15_sp;
 }
 
 SLine::SLine(const SLine& s)
@@ -1046,7 +1046,7 @@ PropertyValue SLine::propertyDefault(Pid pid) const
         if (propertyFlags(pid) != PropertyFlags::NOSTYLE) {
             return Spanner::propertyDefault(pid);
         }
-        return Spatium(0.15);
+        return 0.15_sp;
     case Pid::LINE_STYLE:
         if (propertyFlags(pid) != PropertyFlags::NOSTYLE) {
             return Spanner::propertyDefault(pid);

src/engraving/dom/measurerepeat.h

@@ -92,7 +92,7 @@ class MeasureRepeat final : public Rest
     Sid getPropertyStyle(Pid) const override;
 
     int m_numMeasures = 0;
-    Spatium m_numberPos = Spatium(0.0);
+    Spatium m_numberPos = 0.0_sp;
 };
 } // namespace mu::engraving
 #endif