Merge pull request #3180 from Jojo-Schmitz/warnings

fix warnings introduced by dd97f24
musescore · May 24, 2017 · bddc8e4 · bddc8e4
2 parents 186fc69 + 113de44
commit bddc8e4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -359,7 +359,7 @@ void Harmony::read(XmlReader& e)
             // but we no longer support user-applied formatting for chord symbols anyhow
             // with any luck, the resulting text will be parseable now, so give it a shot
             createLayout();
-            QString s = plainText(true);
+            QString s = plainText();
             if (!s.isEmpty()) {
                   setHarmony(s);
                   return;
@@ -1009,7 +1009,7 @@ const ChordDescription* Harmony::generateDescription()
 void Harmony::textChanged()
       {
 //      Text::createLayout();
-      setHarmony(plainText(true));
+      setHarmony(plainText());
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -284,7 +284,7 @@ void Lyrics::layout1()
       bool hasNumber     = false; // _verseNumber;
       qreal centerAdjust = 0.0;
       qreal leftAdjust   = 0.0;
-      QString s          = plainText(true);
+      QString s          = plainText();
 
       // find:
       // 1) string of numbers and non-word characters at start of syllable

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -2201,18 +2201,16 @@ void Text::setXmlText(const QString& s)
 //    return plain text with symbols
 //---------------------------------------------------------
 
-QString Text::plainText(bool noSym) const
+QString Text::plainText() const
       {
       QString s;
 
       if (layoutInvalid)
             ((Text*)(this))->createLayout();  // ugh!
 
       for (const TextBlock& block : _layout) {
-            for (const TextFragment& f : block.fragments()) {
-                  const CharFormat& format = f.format;
+            for (const TextFragment& f : block.fragments())
                   s += f.text;
-                  }
             if (block.eol())
                   s += QChar::LineFeed;
             }
@@ -2437,7 +2435,7 @@ QString Text::accessibleInfo() const
                   rez = Element::accessibleInfo();
                   break;
             }
-      QString s = plainText(true).simplified();
+      QString s = plainText().simplified();
       if (s.length() > 20) {
             s.truncate(20);
             s += "...";

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -276,7 +276,7 @@ class Text : public Element {
       void setPlainText(const QString&);
       void setXmlText(const QString&);
       QString xmlText() const;
-      QString plainText(bool noSym = false) const;
+      QString plainText() const;
 
       void insertText(EditData&, const QString&);
 

diff --git a/mscore/file.cpp b/mscore/file.cpp
@@ -389,7 +389,7 @@ bool MuseScore::saveFile(MasterScore* score)
             QString fn = score->masterScore()->fileInfo()->fileName();
             Text* t = score->getText(SubStyle::TITLE);
             if (t)
-                  fn = t->plainText(true);
+                  fn = t->plainText();
             QString name = createDefaultFileName(fn);
             QString f1 = tr("MuseScore File") + " (*.mscz)";
             QString f2 = tr("Uncompressed MuseScore File") + " (*.mscx)";