diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 23:40:10 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 23:40:10 +0000 |
commit | c856c3c44f488b137dd3b76f81b2d4b9c5444b73 (patch) | |
tree | 88a64ae28e48d4f71396d329b0d1c797b31accc3 /muse2/al | |
parent | 1e2c10156202d4b50df409a1930adc3f151e44dc (diff) |
Converted all latin1() instances. Ported Qt3 methods to Qt4.
Diffstat (limited to 'muse2/al')
-rw-r--r-- | muse2/al/sig.cpp | 4 | ||||
-rw-r--r-- | muse2/al/xml.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/muse2/al/sig.cpp b/muse2/al/sig.cpp index 026104b2..7eeae6be 100644 --- a/muse2/al/sig.cpp +++ b/muse2/al/sig.cpp @@ -484,7 +484,7 @@ void SigList::read(QDomNode node) insert(std::pair<const unsigned, SigEvent*> (tick, t)); } else - printf("MusE:SigList: unknown tag %s\n", e.tagName().toLatin1().data()); + printf("MusE:SigList: unknown tag %s\n", e.tagName().toLatin1().constData()); node = node.nextSibling(); } normalize(); @@ -569,7 +569,7 @@ int SigEvent::read(QDomNode node) else if (e.tagName() == "denom") sig.n = e.text().toInt(); else - printf("MusE:SigEvent: unknown tag %s\n", e.tagName().toLatin1().data()); + printf("MusE:SigEvent: unknown tag %s\n", e.tagName().toLatin1().constData()); node = node.nextSibling(); } return at; diff --git a/muse2/al/xml.cpp b/muse2/al/xml.cpp index 7ae40b3e..63143b1a 100644 --- a/muse2/al/xml.cpp +++ b/muse2/al/xml.cpp @@ -242,10 +242,10 @@ void readProperties(QObject* o, QDomNode node) QDomElement e = node.toElement(); QString tag(e.tagName()); - int idx = meta->indexOfProperty(tag.toLatin1().data()); + int idx = meta->indexOfProperty(tag.toLatin1().constData()); if (idx == -1) { printf("MusE:%s: unknown tag %s\n", - meta->className(), tag.toLatin1().data()); + meta->className(), tag.toLatin1().constData()); return; } QMetaProperty p = meta->property(idx); @@ -326,9 +326,9 @@ void domError(QDomNode node) s += k; } fprintf(stderr, "%s: Unknown Node <%s>, type %d\n", - s.toLatin1().data(), tag.toLatin1().data(), node.nodeType()); + s.toLatin1().constData(), tag.toLatin1().constData(), node.nodeType()); if (node.isText()) { - fprintf(stderr, " text node <%s>\n", node.toText().data().toLatin1().data()); + fprintf(stderr, " text node <%s>\n", node.toText().data().toLatin1().constData()); } } @@ -353,9 +353,9 @@ void domNotImplemented(QDomNode node) s += k; } fprintf(stderr, "%s: Node not implemented: <%s>, type %d\n", - s.toLatin1().data(), tag.toLatin1().data(), node.nodeType()); + s.toLatin1().constData(), tag.toLatin1().constData(), node.nodeType()); if (node.isText()) { - fprintf(stderr, " text node <%s>\n", node.toText().data().toLatin1().data()); + fprintf(stderr, " text node <%s>\n", node.toText().data().toLatin1().constData()); } } } |