formatting

rism-digital · Dec 14, 2024 · 494f4a0 · 494f4a0
1 parent 3be2310
commit 494f4a0
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 43 deletions.
diff --git a/include/vrv/tie.h b/include/vrv/tie.h
@@ -24,10 +24,7 @@ class Note;
 /**
  * This class models the MEI <tie> element.
  */
-class Tie : public ControlElement,
-            public TimeSpanningInterface,
-            public AttCurvature,
-            public AttLineRendBase {
+class Tie : public ControlElement, public TimeSpanningInterface, public AttCurvature, public AttLineRendBase {
 public:
     /**
      * @name Constructors, destructors, and other standard methods

diff --git a/src/arpeg.cpp b/src/arpeg.cpp
@@ -29,8 +29,7 @@ namespace vrv {
 
 static const ClassRegistrar<Arpeg> s_factory("arpeg", ARPEG);
 
-Arpeg::Arpeg()
-    : ControlElement(ARPEG, "arpeg-"), PlistInterface(), TimePointInterface(), AttArpegLog(), AttArpegVis()
+Arpeg::Arpeg() : ControlElement(ARPEG, "arpeg-"), PlistInterface(), TimePointInterface(), AttArpegLog(), AttArpegVis()
 {
     this->RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());

diff --git a/src/controlelement.cpp b/src/controlelement.cpp
@@ -28,7 +28,12 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 ControlElement::ControlElement()
-    : FloatingObject(CONTROL_ELEMENT, "ce"), AltSymInterface(), LinkingInterface(), AttColor(), AttLabelled(), AttTyped()
+    : FloatingObject(CONTROL_ELEMENT, "ce")
+    , AltSymInterface()
+    , LinkingInterface()
+    , AttColor()
+    , AttLabelled()
+    , AttTyped()
 {
     this->RegisterInterface(AltSymInterface::GetAttClasses(), AltSymInterface::IsInterface());
     this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());

diff --git a/src/gliss.cpp b/src/gliss.cpp
@@ -27,11 +27,7 @@ namespace vrv {
 static const ClassRegistrar<Gliss> s_factory("gliss", GLISS);
 
 Gliss::Gliss()
-    : ControlElement(GLISS, "gliss-")
-    , TimeSpanningInterface()
-    , AttLineRend()
-    , AttLineRendBase()
-    , AttNNumberLike()
+    : ControlElement(GLISS, "gliss-"), TimeSpanningInterface(), AttLineRend(), AttLineRendBase(), AttNNumberLike()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_LINEREND);

diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
@@ -2939,7 +2939,7 @@ void HumdrumInput::createDigitalSource(pugi::xml_node sourceDesc)
     pugi::xml_node bibl = source.append_child("bibl");
     bibl.append_copy(m_simpleTitle);
     for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
-         ++childIt) {
+        ++childIt) {
         bibl.append_copy(*childIt);
     }
 
@@ -3691,7 +3691,7 @@ void HumdrumInput::createPrintedSource(pugi::xml_node sourceDesc)
 
     bibl.append_copy(m_simpleTitle);
     for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
-         ++childIt) {
+        ++childIt) {
         bibl.append_copy(*childIt);
     }
 

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
@@ -3493,7 +3493,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             m_trillStack.push_back({ trill, openTrill });
         }
         for (pugi::xml_node xmlAccidMark = xmlTrill.node().next_sibling("accidental-mark"); xmlAccidMark;
-             xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
+            xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
             if (HasAttributeWithValue(xmlAccidMark, "placement", "below")) {
                 trill->SetAccidlower(ConvertAccidentalToAccid(xmlAccidMark.text().as_string()));
             }
@@ -3531,7 +3531,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         turn->SetPlace(turn->AttPlacementRelStaff::StrToStaffrel(xmlTurn.node().attribute("placement").as_string()));
         turn->SetForm(turnLog_FORM_upper);
         for (pugi::xml_node xmlAccidMark = xmlTurn.node().next_sibling("accidental-mark"); xmlAccidMark;
-             xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
+            xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
             if (HasAttributeWithValue(xmlAccidMark, "placement", "above")) {
                 turn->SetAccidupper(ConvertAccidentalToAccid(xmlAccidMark.text().as_string()));
             }
@@ -4692,7 +4692,7 @@ std::pair<std::vector<int>, int> MusicXmlInput::GetMeterSigGrpValues(const pugi:
     int maxUnit = 0;
     std::vector<int> meterCounts;
     for (auto iter1 = beats.begin(), iter2 = beat_type.begin(); (iter1 != beats.end()) && (iter2 != beat_type.end());
-         ++iter1, ++iter2) {
+        ++iter1, ++iter2) {
         // Process current beat/beat-type combination and add it to the meterSigGrp
         MeterSig *meterSig = new MeterSig();
         data_METERCOUNT_pair count = meterSig->AttMeterSigLog::StrToMetercountPair(iter1->node().text().as_string());
@@ -4740,8 +4740,8 @@ std::string MusicXmlInput::GetOrnamentGlyphNumber(int attributes) const
     static std::map<int, std::string> precomposedNames = {
         { APPR_Above | FORM_Inverted, "U+E5C6" }, { APPR_Below | FORM_Inverted, "U+E5B5" },
         { APPR_Above | FORM_Normal, "U+E5C7" }, { APPR_Below | FORM_Normal, "U+E5B8" },
-        { FORM_Inverted | DEP_Above, "U+E5BB" }, { FORM_Inverted | DEP_Below, "U+E5C8" }
-        // these values need to be matched with proper SMuFL codes first
+        { FORM_Inverted | DEP_Above, "U+E5BB" },
+        { FORM_Inverted | DEP_Below, "U+E5C8" } // these values need to be matched with proper SMuFL codes first
         /*, { FORM_Normal | DEP_Above, "U+????" },
         { FORM_Normal | DEP_Below, "U+????" }, { APPR_Above | FORM_Normal | DEP_Above, "U+????" },
         { APPR_Above | FORM_Normal | DEP_Above, "U+????" }, { APPR_Above | FORM_Normal | DEP_Below, "U+????" },

diff --git a/src/ornam.cpp b/src/ornam.cpp
@@ -30,11 +30,7 @@ namespace vrv {
 static const ClassRegistrar<Ornam> s_factory("ornam", ORNAM);
 
 Ornam::Ornam()
-    : ControlElement(ORNAM, "ornam-")
-    , TextListInterface()
-    , TextDirInterface()
-    , TimePointInterface()
-    , AttOrnamentAccid()
+    : ControlElement(ORNAM, "ornam-"), TextListInterface(), TextDirInterface(), TimePointInterface(), AttOrnamentAccid()
 {
     this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());

diff --git a/src/reh.cpp b/src/reh.cpp
@@ -28,8 +28,7 @@ namespace vrv {
 
 static const ClassRegistrar<Reh> s_factory("reh", REH);
 
-Reh::Reh()
-    : ControlElement(REH, "reh-"), TextDirInterface(), TimePointInterface(), AttLang(), AttVerticalGroup()
+Reh::Reh() : ControlElement(REH, "reh-"), TextDirInterface(), TimePointInterface(), AttLang(), AttVerticalGroup()
 {
     this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());

diff --git a/src/slur.cpp b/src/slur.cpp
@@ -41,11 +41,7 @@ namespace vrv {
 static const ClassRegistrar<Slur> s_factory("slur", SLUR);
 
 Slur::Slur()
-    : ControlElement(SLUR, "slur-")
-    , TimeSpanningInterface()
-    , AttCurvature()
-    , AttLayerIdent()
-    , AttLineRendBase()
+    : ControlElement(SLUR, "slur-"), TimeSpanningInterface(), AttCurvature(), AttLayerIdent(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_CURVATURE);
@@ -56,11 +52,7 @@ Slur::Slur()
 }
 
 Slur::Slur(ClassId classId)
-    : ControlElement(classId, "slur-")
-    , TimeSpanningInterface()
-    , AttCurvature()
-    , AttLayerIdent()
-    , AttLineRendBase()
+    : ControlElement(classId, "slur-"), TimeSpanningInterface(), AttCurvature(), AttLayerIdent(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_CURVATURE);
@@ -71,11 +63,7 @@ Slur::Slur(ClassId classId)
 }
 
 Slur::Slur(ClassId classId, const std::string &classIdStr)
-    : ControlElement(classId, classIdStr)
-    , TimeSpanningInterface()
-    , AttCurvature()
-    , AttLayerIdent()
-    , AttLineRendBase()
+    : ControlElement(classId, classIdStr), TimeSpanningInterface(), AttCurvature(), AttLayerIdent(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_CURVATURE);

diff --git a/src/tie.cpp b/src/tie.cpp
@@ -43,8 +43,7 @@ Tie::Tie() : ControlElement(TIE, "tie-"), TimeSpanningInterface(), AttCurvature(
     this->Reset();
 }
 
-Tie::Tie(ClassId classId)
-    : ControlElement(classId, "tie-"), TimeSpanningInterface(), AttCurvature(), AttLineRendBase()
+Tie::Tie(ClassId classId) : ControlElement(classId, "tie-"), TimeSpanningInterface(), AttCurvature(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_CURVATURE);