From 185af4c5d1ebd66cfc347570d9dc4752969d3acf Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Wed, 18 Sep 2024 17:35:25 +0200 Subject: [PATCH] Remove extraneous ; in headers [skip-ci] --- include/vrv/beam.h | 2 +- include/vrv/boundingbox.h | 4 ++-- include/vrv/devicecontext.h | 10 +++++----- include/vrv/devicecontextbase.h | 2 +- include/vrv/docselection.h | 2 +- include/vrv/floatingobject.h | 4 ++-- include/vrv/functorinterface.h | 4 ++-- include/vrv/interface.h | 4 ++-- include/vrv/iobase.h | 2 +- include/vrv/options.h | 4 ++-- include/vrv/resources.h | 4 ++-- include/vrv/textelement.h | 2 +- include/vrv/transposition.h | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/vrv/beam.h b/include/vrv/beam.h index 6f6b56482c0..5ae37892360 100644 --- a/include/vrv/beam.h +++ b/include/vrv/beam.h @@ -225,7 +225,7 @@ class BeamSegment { class BeamSpanSegment : public BeamSegment { public: BeamSpanSegment(); - virtual ~BeamSpanSegment(){}; + virtual ~BeamSpanSegment() {} /** * Set/get methods for member variables diff --git a/include/vrv/boundingbox.h b/include/vrv/boundingbox.h index 20a437657c5..228661c94db 100644 --- a/include/vrv/boundingbox.h +++ b/include/vrv/boundingbox.h @@ -37,7 +37,7 @@ class BoundingBox { */ ///@{ BoundingBox(); - virtual ~BoundingBox(){}; + virtual ~BoundingBox() {} virtual ClassId GetClassId() const = 0; bool Is(ClassId classId) const { return (this->GetClassId() == classId); } bool Is(const std::vector &classIds) const; @@ -342,7 +342,7 @@ class SegmentedLine { */ ///@{ SegmentedLine(int start, int end); - virtual ~SegmentedLine(){}; + virtual ~SegmentedLine() {} ///@} /** diff --git a/include/vrv/devicecontext.h b/include/vrv/devicecontext.h index 2ea67fa582e..bf13577346e 100644 --- a/include/vrv/devicecontext.h +++ b/include/vrv/devicecontext.h @@ -92,7 +92,7 @@ class DeviceContext { m_pushBack = false; m_viewBoxFactor = (double)DEFINITION_FACTOR; } - virtual ~DeviceContext(){}; + virtual ~DeviceContext() {} ClassId GetClassId() const { return m_classId; } bool Is(ClassId classId) const { return (m_classId == classId); } ///@} @@ -262,14 +262,14 @@ class DeviceContext { * For example, the method can be used for grouping shapes in in SVG */ ///@{ - virtual void StartCustomGraphic(const std::string &name, std::string gClass = "", std::string gId = ""){}; - virtual void EndCustomGraphic(){}; + virtual void StartCustomGraphic(const std::string &name, std::string gClass = "", std::string gId = "") {} + virtual void EndCustomGraphic() {} ///@} /** * Method for changing the color of a custom graphic */ - virtual void SetCustomGraphicColor(const std::string &color){}; + virtual void SetCustomGraphicColor(const std::string &color) {} /** * @name Methods for re-starting and ending a graphic for objects drawn in separate steps @@ -312,7 +312,7 @@ class DeviceContext { * @name Method for adding description element */ ///@{ - virtual void AddDescription(const std::string &text){}; + virtual void AddDescription(const std::string &text) {} ///@} /** diff --git a/include/vrv/devicecontextbase.h b/include/vrv/devicecontextbase.h index faa51c6d05d..69eb4816678 100644 --- a/include/vrv/devicecontextbase.h +++ b/include/vrv/devicecontextbase.h @@ -144,7 +144,7 @@ class FontInfo { m_widthToHeightRatio = 1.0; m_smuflFont = SMUFL_NONE; } - virtual ~FontInfo(){}; + virtual ~FontInfo() {} // accessors and modifiers for the font elements int GetPointSize() const { return m_pointSize; } diff --git a/include/vrv/docselection.h b/include/vrv/docselection.h index 5bd30339161..28d8a2d2f68 100644 --- a/include/vrv/docselection.h +++ b/include/vrv/docselection.h @@ -29,7 +29,7 @@ class DocSelection { */ ///@{ DocSelection(); - virtual ~DocSelection(){}; + virtual ~DocSelection() {} ///@} /** diff --git a/include/vrv/floatingobject.h b/include/vrv/floatingobject.h index f6cd1f450a3..9f1aa2a307a 100644 --- a/include/vrv/floatingobject.h +++ b/include/vrv/floatingobject.h @@ -167,7 +167,7 @@ class FloatingPositioner : public BoundingBox { public: // constructors and destructors FloatingPositioner(FloatingObject *object, StaffAlignment *alignment, char spanningType); - virtual ~FloatingPositioner(){}; + virtual ~FloatingPositioner() {} ClassId GetClassId() const override { return FLOATING_POSITIONER; } virtual void ResetPositioner(); @@ -485,7 +485,7 @@ class CurveSpannedElement { m_discarded = false; m_isBelow = true; } - virtual ~CurveSpannedElement(){}; + virtual ~CurveSpannedElement() {} Point m_rotatedPoints[4]; const BoundingBox *m_boundingBox; diff --git a/include/vrv/functorinterface.h b/include/vrv/functorinterface.h index 38424282880..498eb4947c8 100644 --- a/include/vrv/functorinterface.h +++ b/include/vrv/functorinterface.h @@ -156,7 +156,7 @@ class FunctorInterface { * @name Constructors, destructors */ ///@{ - FunctorInterface(){}; + FunctorInterface() {} virtual ~FunctorInterface() = default; ///@} @@ -513,7 +513,7 @@ class ConstFunctorInterface { * @name Constructors, destructors */ ///@{ - ConstFunctorInterface(){}; + ConstFunctorInterface() {} virtual ~ConstFunctorInterface() = default; ///@} diff --git a/include/vrv/interface.h b/include/vrv/interface.h index 7b389b85424..ab3f7f7b612 100644 --- a/include/vrv/interface.h +++ b/include/vrv/interface.h @@ -37,8 +37,8 @@ class Interface { * Reset method reset all attribute classes */ ///@{ - Interface(){}; - virtual ~Interface(){}; + Interface() {} + virtual ~Interface() {} ///@} /** diff --git a/include/vrv/iobase.h b/include/vrv/iobase.h index e5cfc903acc..86a06e28b04 100644 --- a/include/vrv/iobase.h +++ b/include/vrv/iobase.h @@ -33,7 +33,7 @@ class Output { // constructors and destructors Output(Doc *doc, std::string filename); Output(Doc *doc); - Output(){}; + Output() {} virtual ~Output(); /** diff --git a/include/vrv/options.h b/include/vrv/options.h index 0e9160240a7..e5989d79738 100644 --- a/include/vrv/options.h +++ b/include/vrv/options.h @@ -417,8 +417,8 @@ class OptionIntMap : public Option { class OptionStaffrel : public Option { public: // constructors and destructors - OptionStaffrel(){}; - virtual ~OptionStaffrel(){}; + OptionStaffrel() {} + virtual ~OptionStaffrel() {} void CopyTo(Option *option) override; // Alternate type style cannot have a restricted list of possible values void Init(data_STAFFREL defaultValue); diff --git a/include/vrv/resources.h b/include/vrv/resources.h index 7988fb1faf4..636e0c8a41f 100644 --- a/include/vrv/resources.h +++ b/include/vrv/resources.h @@ -136,8 +136,8 @@ class Resources { class LoadedFont { public: - LoadedFont(const std::string &name, bool isFallback) : m_name(name), m_isFallback(isFallback){}; - ~LoadedFont(){}; + LoadedFont(const std::string &name, bool isFallback) : m_name(name), m_isFallback(isFallback) {} + ~LoadedFont() {} const std::string GetName() const { return m_name; }; const GlyphTable &GetGlyphTable() const { return m_glyphTable; }; GlyphTable &GetGlyphTableForModification() { return m_glyphTable; }; diff --git a/include/vrv/textelement.h b/include/vrv/textelement.h index 2c334275484..d5805347be0 100644 --- a/include/vrv/textelement.h +++ b/include/vrv/textelement.h @@ -105,7 +105,7 @@ class TextDrawingParams { m_enclose = TEXTRENDITION_NONE; m_textEnclose = ENCLOSURE_NONE; } - virtual ~TextDrawingParams(){}; + virtual ~TextDrawingParams() {} int m_x; int m_y; diff --git a/include/vrv/transposition.h b/include/vrv/transposition.h index 9359ab0e5f0..0f9598dc6ab 100644 --- a/include/vrv/transposition.h +++ b/include/vrv/transposition.h @@ -43,7 +43,7 @@ class TransPitch { // octave number of pitch: 4 = middle-C octave int m_oct; - TransPitch(){}; + TransPitch() {} TransPitch(int aPname, int anAccid, int anOct); TransPitch(data_PITCHNAME pname, data_ACCIDENTAL_GESTURAL accidG, data_ACCIDENTAL_WRITTEN accidW, int oct); TransPitch(const TransPitch &pitch);