diff --git a/include/vrv/tie.h b/include/vrv/tie.h index db3f258f94..8b6686f2cd 100644 --- a/include/vrv/tie.h +++ b/include/vrv/tie.h @@ -24,10 +24,7 @@ class Note; /** * This class models the MEI 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 index 28f38059b7..aef7ee75ac 100644 --- a/src/arpeg.cpp +++ b/src/arpeg.cpp @@ -29,8 +29,7 @@ namespace vrv { static const ClassRegistrar 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 index 82eaf2f95a..7024457fdf 100644 --- 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 index 21050b3b8f..e2d9c20ade 100644 --- a/src/gliss.cpp +++ b/src/gliss.cpp @@ -27,11 +27,7 @@ namespace vrv { static const ClassRegistrar 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 index 5e9e6b5b55..5e7731286f 100644 --- 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 index 86cb54613d..bc8d19d255 100644 --- 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, int> MusicXmlInput::GetMeterSigGrpValues(const pugi: int maxUnit = 0; std::vector 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 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 index 95b35ee96f..d53f114ce5 100644 --- a/src/ornam.cpp +++ b/src/ornam.cpp @@ -30,11 +30,7 @@ namespace vrv { static const ClassRegistrar 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 index 116cf3fc4c..6627775701 100644 --- a/src/reh.cpp +++ b/src/reh.cpp @@ -28,8 +28,7 @@ namespace vrv { static const ClassRegistrar 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 index fda215b4bf..830e11835e 100644 --- a/src/slur.cpp +++ b/src/slur.cpp @@ -41,11 +41,7 @@ namespace vrv { static const ClassRegistrar 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 index 8fc6aa1aff..3469b28506 100644 --- 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);