Merge pull request #176 from mgavioli/Fix_profile_XML_read

Align the code reading an XML profile to the new XML reader
musescore · Jan 20, 2013 · be89586 · be89586
2 parents 4d34280 + 7c6fe71
commit be89586
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/libmscore/bend.cpp b/libmscore/bend.cpp
@@ -271,6 +271,7 @@ void Bend::read(XmlReader& e)
                   pv.pitch   = e.intAttribute("pitch");
                   pv.vibrato = e.intAttribute("vibrato");
                   _points.append(pv);
+                  e.readNext();
                   }
             else
                   e.unknown();

diff --git a/libmscore/tremolobar.cpp b/libmscore/tremolobar.cpp
@@ -133,6 +133,7 @@ void TremoloBar::read(XmlReader& e)
                   pv.pitch   = e.intAttribute("pitch");
                   pv.vibrato = e.intAttribute("vibrato");
                   _points.append(pv);
+                  e.readNext();
                   }
             else
                   e.unknown();

diff --git a/mscore/palette.cpp b/mscore/palette.cpp
@@ -1025,7 +1025,7 @@ void Palette::write(const QString& p)
 
 void Palette::read(XmlReader& e)
       {
-      QString name = e.attribute("name");
+//      QString name = e.attribute("name");
       while (e.readNextStartElement()) {
             const QStringRef& t(e.name());
             if (t == "gridWidth")

diff --git a/mscore/profile.cpp b/mscore/profile.cpp
@@ -303,6 +303,7 @@ void Profile::read()
                               if (rootfile.isEmpty())
                                     rootfile = e.attribute("full-path");
                               e.readNext();
+                              e.readNext();
                               }
                         else if (tag == "file")
                               images.append(e.readElementText());
@@ -328,8 +329,8 @@ void Profile::read()
 
       while (e.readNextStartElement()) {
             if (e.name() == "museScore") {
-                  QString version = e.attribute("version");
-                  QStringList sl = version.split('.');
+//                  QString version = e.attribute("version");
+//                  QStringList sl = version.split('.');
                   // _mscVersion = sl[0].toInt() * 100 + sl[1].toInt();
                   while (e.readNextStartElement()) {
                         if (e.name() == "Profile")