From 7c6fe71f1fc3cf1f7c3719f96c56f3c72dd46815 Mon Sep 17 00:00:00 2001 From: Maurizio Gavioli Date: Sun, 20 Jan 2013 19:03:20 +0100 Subject: [PATCH] Align the code reading an XML profile to the new XML reader --- libmscore/bend.cpp | 1 + libmscore/tremolobar.cpp | 1 + mscore/palette.cpp | 2 +- mscore/profile.cpp | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libmscore/bend.cpp b/libmscore/bend.cpp index b92a028785c80..e42e48541f994 100644 --- 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 index 6f9d0d0c509a3..d574eecd57c22 100644 --- 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 index 5f25703a022dc..8c25a2306db7b 100644 --- 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 index 9e3dc67ffbee0..7993bca2df75f 100644 --- 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")