diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-10-09 14:47:07 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-10-09 16:16:21 +0200 |
commit | 88d118bf9ac694effcc110d39a62089aeeb16684 (patch) | |
tree | 7013d677c00de32233e2300f5555b15eb037c609 | |
parent | a87481450381022bcf6f3357f939952368bfff30 (diff) | |
download | qtactiveqt-88d118bf9ac694effcc110d39a62089aeeb16684.tar.gz |
Use QString/QByteArray::prepend() where appropriate.
Change-Id: Ifbdc828a646cab18548683829c2f45c84da0076b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 6 | ||||
-rw-r--r-- | src/activeqt/control/qaxserver.cpp | 4 | ||||
-rw-r--r-- | tools/dumpcpp/main.cpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 82b416c..ffaf18e 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -1912,20 +1912,20 @@ QByteArray MetaObjectGenerator::usertypeToString(const TYPEDESC &tdesc, ITypeInf userTypeName = "IDispatch"; } else { if (typeLibName != current_typelib) - userTypeName = typeLibName + "::" + userTypeName; + userTypeName.prepend(typeLibName + "::"); if (!qax_qualified_usertypes.contains(userTypeName)) qax_qualified_usertypes << userTypeName; } break; case TKIND_ENUM: if (typeLibName != current_typelib) - userTypeName = typeLibName + "::" + userTypeName; + userTypeName.prepend(typeLibName + "::"); if (!qax_qualified_usertypes.contains("enum " + userTypeName)) qax_qualified_usertypes << "enum " + userTypeName; break; case TKIND_INTERFACE: if (typeLibName != current_typelib) - userTypeName = typeLibName + "::" + userTypeName; + userTypeName.prepend(typeLibName + "::"); if (!qax_qualified_usertypes.contains(userTypeName)) qax_qualified_usertypes << userTypeName; break; diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp index e31e4e1..bbae778 100644 --- a/src/activeqt/control/qaxserver.cpp +++ b/src/activeqt/control/qaxserver.cpp @@ -329,8 +329,8 @@ HRESULT UpdateRegistry(BOOL bRegister) mime.chop(extension.length() - 1); // Prepend '.' before extension, if required. extension = extension.trimmed(); - if (extension[0] != QLatin1Char('.')) - extension = QLatin1Char('.') + extension; + if (!extension.startsWith(QLatin1Char('.'))) + extension.prepend(QLatin1Char('.')); } if (!extension.isEmpty()) { diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 2ced187..8a55a36 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -287,7 +287,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb if (!propertyType.contains("::") && (qax_qualified_usertypes.contains(simplePropType) || qax_qualified_usertypes.contains("enum "+ simplePropType)) ) { - propertyType = nameSpace + "::" + propertyType; + propertyType.prepend(nameSpace + "::"); foreignNamespace = false; } @@ -402,7 +402,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb QByteArray simpleSlotType = slotType; simpleSlotType.replace('*', ""); if (!slotType.contains("::") && qax_qualified_usertypes.contains(simpleSlotType)) - slotType = nameSpace + "::" + slotType; + slotType.prepend(nameSpace + "::"); QByteArray slotNamedSignature; @@ -425,7 +425,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb for (int i = 0; i < signatureSplit.count(); ++i) { QByteArray parameterType = signatureSplit.at(i); if (!parameterType.contains("::") && namespaceForType.contains(parameterType)) - parameterType = namespaceForType.value(parameterType) + "::" + parameterType; + parameterType.prepend(namespaceForType.value(parameterType) + "::"); slotNamedSignature += constRefify(parameterType); slotNamedSignature += " "; @@ -1124,10 +1124,10 @@ bool generateTypeLibrary(const QByteArray &typeLib, const QByteArray &outname, O SysFreeString(bstr); switch (typekind) { case TKIND_RECORD: - className = "struct " + className; + className.prepend("struct "); break; case TKIND_ENUM: - className = "enum " + className; + className.prepend("enum "); break; default: break; |