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 /src/activeqt/container/qaxbase.cpp | |
parent | 4db7de9fafb6d4620828ad8ed51c3d22b3efba9f (diff) |
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 'src/activeqt/container/qaxbase.cpp')
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index fb1351e..472e041 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -1403,7 +1403,7 @@ bool QAxBase::initializeRemote(IUnknown** ptr) at = server.indexOf(QChar::fromLatin1('@')); if (at != -1) { user = server.left(at); - server = server.mid(at+1); + server.remove(0, at + 1); at = user.indexOf(QChar::fromLatin1(':')); if (at != -1) { @@ -1413,7 +1413,7 @@ bool QAxBase::initializeRemote(IUnknown** ptr) at = user.indexOf(QChar::fromLatin1('/')); if (at != -1) { domain = user.left(at); - user = user.mid(at+1); + user.remove(0, at + 1); } } @@ -3832,7 +3832,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> & parse = !varc && normFunction.length() > function.length() + 2; if (parse) { QString args = QLatin1String(normFunction); - args = args.mid(function.length() + 1); + args.remove(0, function.length() + 1); // parse argument string int list of arguments QString curArg; const QChar *c = args.unicode(); @@ -4452,7 +4452,8 @@ QVariant QAxBase::asVariant() const else if (d->ptr) qvar.setValue(d->ptr); } else { - cn = cn.mid(cn.lastIndexOf(':') + 1) + '*'; + cn.remove(0, cn.lastIndexOf(':') + 1); + cn += '*'; QObject *object = qObject(); int typeId = QMetaType::type(cn); if (typeId == QMetaType::UnknownType) |