code cleanups

Jojo-Schmitz · Apr 13, 2016 · 492709f · 492709f
1 parent 3d8749f
commit 492709f
Show file tree

Hide file tree

Showing 66 changed files with 371 additions and 394 deletions.
diff --git a/libmscore/accidental.cpp b/libmscore/accidental.cpp
@@ -493,7 +493,7 @@ bool Accidental::setProperty(P_ID propertyId, const QVariant& v)
 //   accessibleInfo
 //---------------------------------------------------------
 
-QString Accidental::accessibleInfo()
+QString Accidental::accessibleInfo() const
       {
       return QString("%1: %2").arg(Element::accessibleInfo()).arg(qApp->translate("accidental", Accidental::subtypeUserName()));
       }

diff --git a/libmscore/accidental.h b/libmscore/accidental.h
@@ -195,7 +195,7 @@ class Accidental : public Element {
       static AccidentalType value2subtype(AccidentalVal);
       static AccidentalType name2subtype(const QString&);
 
-      QString accessibleInfo() override;
+      QString accessibleInfo() const override;
       };
 
 }     // namespace Ms

diff --git a/libmscore/ambitus.cpp b/libmscore/ambitus.cpp
@@ -709,7 +709,8 @@ Element* Ambitus::prevElement()
 //---------------------------------------------------------
 //   accessibleInfo
 //---------------------------------------------------------
-QString Ambitus::accessibleInfo()
+
+QString Ambitus::accessibleInfo() const
       {
       return tr("%1; Top pitch: %2%3; Bottom pitch: %4%5").arg(Element::accessibleInfo())\
                                                           .arg(tpc2name(topTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false))\
@@ -722,7 +723,7 @@ QString Ambitus::accessibleInfo()
 //   screenReaderInfo
 //---------------------------------------------------------
 
-QString Ambitus::screenReaderInfo()
+QString Ambitus::screenReaderInfo() const
       {
       return tr("%1; Top pitch: %2%3; Bottom pitch: %4%5").arg(Element::screenReaderInfo())\
                                                           .arg(tpc2name(topTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, true))\

diff --git a/libmscore/ambitus.h b/libmscore/ambitus.h
@@ -87,8 +87,8 @@ class Ambitus : public Element {
       virtual void      scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
       virtual void      setTrack(int val) override;
       virtual void      write(Xml&) const override;
-      virtual QString   accessibleInfo() override;
-      virtual QString   screenReaderInfo() override;
+      virtual QString   accessibleInfo() const override;
+      virtual QString   screenReaderInfo() const override;
 
       // properties
       QVariant getProperty(P_ID ) const;

diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp
@@ -723,7 +723,7 @@ qreal Articulation::mag() const
 //   accessibleInfo
 //---------------------------------------------------------
 
-QString Articulation::accessibleInfo()
+QString Articulation::accessibleInfo() const
       {
       return QString("%1: %2").arg(Element::accessibleInfo()).arg(subtypeUserName());
       }

diff --git a/libmscore/articulation.h b/libmscore/articulation.h
@@ -143,7 +143,7 @@ class Articulation : public Element {
 
       bool playArticulation() const { return _playArticulation;}
       void setPlayArticulation(bool val) { _playArticulation = val; }
-    
+
       QString channelName() const           { return _channelName; }
       void setChannelName(const QString& s) { _channelName = s;    }
 
@@ -155,7 +155,7 @@ class Articulation : public Element {
                                 _articulationType == ArticulationType::Longfermata ||
                                 _articulationType == ArticulationType::Verylongfermata; }
 
-      QString accessibleInfo() override;
+      QString accessibleInfo() const override;
       };
 
 }     // namespace Ms