diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-10 15:56:40 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-11 13:59:44 +0000 |
commit | 1a7b140eb8f3f03354452c4669aabae2f141b9c8 (patch) | |
tree | 35f5d92966427a9488c4b6e3b57cc2f24be9c4ce /tools | |
parent | 4db7de9fafb6d4620828ad8ed51c3d22b3efba9f (diff) | |
download | qtactiveqt-1a7b140eb8f3f03354452c4669aabae2f141b9c8.tar.gz |
String fixes.
- Avoid conversion from QString to QByteArray.
- Replace a = a.mid() by a.remove().
- Replace a = a.left() by a.truncate().
- Streamline code extracting an error code.
Change-Id: I43c1f04e947632f725bbb86af5abf108b2b02261
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/dumpcpp/main.cpp | 4 | ||||
-rw-r--r-- | tools/testcon/invokemethod.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index c65d5cd..f516fff 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -414,7 +414,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb if (slotSignature.endsWith("()")) { // no parameters - no names slotNamedSignature = slotSignature; } else { - slotNamedSignature = slotSignature.left(slotSignature.indexOf('(') + 1); + slotNamedSignature.truncate(slotSignature.indexOf('(') + 1); QByteArray slotSignatureTruncated(slotSignature.mid(slotNamedSignature.length())); slotSignatureTruncated.truncate(slotSignatureTruncated.length() - 1); @@ -1092,7 +1092,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname, QByteArray refTypeLib; if (refType.contains("::")) { refTypeLib = refType; - refType = refType.mid(refType.lastIndexOf("::") + 2); + refType.remove(0, refType.lastIndexOf("::") + 2); if (refTypeLib.contains(' ')) { refType = refTypeLib.left(refTypeLib.indexOf(' ')) + ' ' + refType; } diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp index 0f898b1..ec6024c 100644 --- a/tools/testcon/invokemethod.cpp +++ b/tools/testcon/invokemethod.cpp @@ -114,7 +114,7 @@ void InvokeMethod::on_comboMethods_activated(const QString &method) const QMetaObject *mo = activex->metaObject(); const QMetaMethod slot = mo->method(mo->indexOfSlot(method.toLatin1())); QString signature = QString::fromLatin1(slot.methodSignature()); - signature = signature.mid(signature.indexOf(QLatin1Char('(')) + 1); + signature.remove(0, signature.indexOf(QLatin1Char('(')) + 1); signature.truncate(signature.length()-1); QList<QByteArray> pnames = slot.parameterNames(); |