LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace XmlStreamReader by QXmlStreamReader

Browse source
This commit is contained in:
ws 2016-03-05 10:29:38 +01:00
parent 2f4f4a5c2d
commit a96c0abf5b
10 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -571,8 +571,10 @@ ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH})
subdirs(
mscore awl bww2mxml share midi audiofile fluid mstyle libmscore synthesizer
effects thirdparty/rtf2html thirdparty/diff thirdparty/beatroot
thirdparty/xmlstream thirdparty/qzip thirdparty/kQOAuth
thirdparty/qzip thirdparty/kQOAuth
)
# thirdparty/xmlstream
if (APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
#with xcode, we need to have all the targets in the same project
add_subdirectory(mtest)

2
all.h
View file

@ -40,7 +40,7 @@
#include <QAbstractMessageHandler>
#include <QXmlSchema>
#include <QXmlSchemaValidator>
// #include <QXmlStreamReader>
#include <QXmlStreamReader>
#include <QPointF>
#include <QVariant>

2
libmscore/cmd.cpp
View file

@ -101,6 +101,8 @@ void CmdState::reset()
void CmdState::setTick(int t)
{
if (_updateMode == UpdateMode::LayoutAll)
return;
if (_startTick == -1 || t < _startTick)
_startTick = t;
if (_endTick == -1 || t > _endTick)

2
libmscore/scorefile.cpp
View file

@ -1176,7 +1176,7 @@ bool Score::read(XmlReader& e)
else
e.unknown();
}
if (e.error() != XmlStreamReader::NoError) {
if (e.error() != QXmlStreamReader::NoError) {
qDebug("%s: xml read error at line %lld col %lld: %s",
qPrintable(e.getDocName()), e.lineNumber(), e.columnNumber(),
e.name().toUtf8().data());

2
libmscore/staff.cpp
View file

@ -135,7 +135,7 @@ BracketType Staff::innerBracket() const
for (int i = 0; i < score()->nstaves(); ++i) {
Staff* staff = score()->staff(i);
for (int k = 0; k < staff->brackets().size(); ++k) {
const BracketItem& bi = staff->brackets()[k];
const BracketItem& bi = staff->brackets().at(k);
if (bi._bracket != BracketType::NO_BRACKET) {
if (i < staffIdx && ((i + bi._bracketSpan) > staffIdx) && k < level) {
t = bi._bracket;

2
libmscore/text.cpp
View file

@ -3092,7 +3092,7 @@ bool Text::validateText(QString& s)
XmlReader xml(ss);
while (xml.readNextStartElement())
; // qDebug(" token %d <%s>", int(xml.tokenType()), qPrintable(xml.name().toString()));
if (xml.error() == XmlStreamReader::NoError) {
if (xml.error() == QXmlStreamReader::NoError) {
s = d;
return true;
}

42
libmscore/xml.cpp
View file

@ -85,14 +85,14 @@ bool XmlReader::hasAttribute(const char* s) const
QPointF XmlReader::readPoint()
{
Q_ASSERT(tokenType() == XmlStreamReader::StartElement);
Q_ASSERT(tokenType() == QXmlStreamReader::StartElement);
#ifndef NDEBUG
if (!attributes().hasAttribute("x")) {
XmlStreamAttributes map = attributes();
QXmlStreamAttributes map = attributes();
qDebug("XmlReader::readPoint: x attribute missing: %s (%d)",
name().toUtf8().data(), map.size());
for (int i = 0; i < map.size(); ++i) {
const XmlStreamAttribute& a = map.at(i);
const QXmlStreamAttribute& a = map.at(i);
qDebug(" attr <%s> <%s>", a.name().toUtf8().data(), a.value().toUtf8().data());
}
unknown();
@ -114,7 +114,7 @@ QPointF XmlReader::readPoint()
QColor XmlReader::readColor()
{
Q_ASSERT(tokenType() == XmlStreamReader::StartElement);
Q_ASSERT(tokenType() == QXmlStreamReader::StartElement);
QColor c;
c.setRed(intAttribute("r"));
c.setGreen(intAttribute("g"));
@ -130,7 +130,7 @@ QColor XmlReader::readColor()
QSizeF XmlReader::readSize()
{
Q_ASSERT(tokenType() == XmlStreamReader::StartElement);
Q_ASSERT(tokenType() == QXmlStreamReader::StartElement);
QSizeF p;
p.setWidth(doubleAttribute("w", 0.0));
p.setHeight(doubleAttribute("h", 0.0));
@ -144,7 +144,7 @@ QSizeF XmlReader::readSize()
QRectF XmlReader::readRect()
{
Q_ASSERT(tokenType() == XmlStreamReader::StartElement);
Q_ASSERT(tokenType() == QXmlStreamReader::StartElement);
QRectF p;
p.setX(doubleAttribute("x", 0.0));
p.setY(doubleAttribute("y", 0.0));
@ -160,7 +160,7 @@ QRectF XmlReader::readRect()
Fraction XmlReader::readFraction()
{
Q_ASSERT(tokenType() == XmlStreamReader::StartElement);
Q_ASSERT(tokenType() == QXmlStreamReader::StartElement);
int z = attribute("z", "0").toInt();
int n = attribute("n", "0").toInt();
skipCurrentElement();
@ -174,7 +174,7 @@ Fraction XmlReader::readFraction()
void XmlReader::unknown()
{
if (XmlStreamReader::error())
if (QXmlStreamReader::error())
qDebug("StreamReaderError: %s", qPrintable(errorString()));
qDebug("%s: xml read error at line %lld col %lld: %s",
qPrintable(docName), lineNumber(), columnNumber(),
@ -221,8 +221,8 @@ double XmlReader::readDouble(double min, double max)
bool XmlReader::readBool()
{
bool val;
XmlStreamReader::TokenType tt = readNext();
if (tt == XmlStreamReader::Characters) {
QXmlStreamReader::TokenType tt = readNext();
if (tt == QXmlStreamReader::Characters) {
val = text().toInt() != 0;
readNext();
}
@ -649,25 +649,25 @@ void Xml::dump(int len, const unsigned char* p)
void XmlReader::htmlToString(int level, QString* s)
{
*s += QString("<%1").arg(name().toString());
for (const XmlStreamAttribute& a : attributes())
for (const QXmlStreamAttribute& a : attributes())
*s += QString(" %1=\"%2\"").arg(a.name().toString()).arg(a.value().toString());
*s += ">";
++level;
for (;;) {
XmlStreamReader::TokenType t = readNext();
QXmlStreamReader::TokenType t = readNext();
switch(t) {
case XmlStreamReader::StartElement:
case QXmlStreamReader::StartElement:
htmlToString(level, s);
break;
case XmlStreamReader::EndElement:
case QXmlStreamReader::EndElement:
*s += QString("</%1>").arg(name().toString());
--level;
return;
case XmlStreamReader::Characters:
case QXmlStreamReader::Characters:
if (!isWhitespace())
*s += text().toString().toHtmlEscaped();
break;
case XmlStreamReader::Comment:
case QXmlStreamReader::Comment:
break;
default:
@ -687,18 +687,18 @@ QString XmlReader::readXml()
QString s;
int level = 1;
for (;;) {
XmlStreamReader::TokenType t = readNext();
QXmlStreamReader::TokenType t = readNext();
switch(t) {
case XmlStreamReader::StartElement:
case QXmlStreamReader::StartElement:
htmlToString(level, &s);
break;
case XmlStreamReader::EndElement:
case QXmlStreamReader::EndElement:
return s;
case XmlStreamReader::Characters:
case QXmlStreamReader::Characters:
if (!isWhitespace() || text().toString() == "\n")
s += text().toString().toHtmlEscaped();
break;
case XmlStreamReader::Comment:
case QXmlStreamReader::Comment:
break;
default:

11
libmscore/xml.h
View file

@ -13,7 +13,6 @@
#ifndef __XML_H__
#define __XML_H__
#include "thirdparty/xmlstream/xmlstream.h"
#include "stafftype.h"
#include "interval.h"
#include "element.h"
@ -42,7 +41,7 @@ struct SpannerValues {
// XmlReader
//---------------------------------------------------------
class XmlReader : public XmlStreamReader {
class XmlReader : public QXmlStreamReader {
QString docName; // used for error reporting
// Score read context (for read optimizations):
@ -62,10 +61,10 @@ class XmlReader : public XmlStreamReader {
QList<QList<std::pair<int, ClefType>>> _clefs; // for 1.3 scores
public:
XmlReader(QFile* f) : XmlStreamReader(f), docName(f->fileName()) {}
XmlReader(const QByteArray& d, const QString& s = QString()) : XmlStreamReader(d), docName(s) {}
XmlReader(QIODevice* d, const QString& s = QString()) : XmlStreamReader(d), docName(s) {}
XmlReader(const QString& d, const QString& s = QString()) : XmlStreamReader(d), docName(s) {}
XmlReader(QFile* f) : QXmlStreamReader(f), docName(f->fileName()) {}
XmlReader(const QByteArray& d, const QString& s = QString()) : QXmlStreamReader(d), docName(s) {}
XmlReader(QIODevice* d, const QString& s = QString()) : QXmlStreamReader(d), docName(s) {}
XmlReader(const QString& d, const QString& s = QString()) : QXmlStreamReader(d), docName(s) {}
void unknown();

1
mscore/CMakeLists.txt
View file

@ -303,7 +303,6 @@ target_link_libraries(mscore
effects
vorbisfile
libmscore
xmlstream
qzip
beatroot
kqoauth

1
mtest/cmake.inc
View file

@ -26,7 +26,6 @@ target_link_libraries(
libmscore
synthesizer
midi
xmlstream
qzip
z
${QT_LIBRARIES}