1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdbusxml2cpp: Fix mismatches between strings and string literals

Browse Source 
Addressing some remarks made during the review of QTBUG-98434.

Fix the mismatches between strings and string literals.

Task-number: QTBUG-103100
Change-Id: I3a7d2574f55fcffa81b8c87fb510aba0a8853330
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Mate Barany 2022-09-20 17:46:35 +02:00
parent 67de96852d
commit c2df659c8d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -299,7 +299,7 @@ static QStringList makeArgNames(const QDBusIntrospection::Arguments &inputArgs,
const QDBusIntrospection::Argument &arg = inputArgs.at(i); const QDBusIntrospection::Argument &arg = inputArgs.at(i);
QString name = arg.name; QString name = arg.name;
if (name.isEmpty()) if (name.isEmpty())
name = QString( "in%1"_L1 ).arg(i); name = u"in%1"_s.arg(i);
else else
name.replace(u'-', u'_'); name.replace(u'-', u'_');
while (retval.contains(name)) while (retval.contains(name))
@ -310,7 +310,7 @@ static QStringList makeArgNames(const QDBusIntrospection::Arguments &inputArgs,
const QDBusIntrospection::Argument &arg = outputArgs.at(i); const QDBusIntrospection::Argument &arg = outputArgs.at(i);
QString name = arg.name; QString name = arg.name;
if (name.isEmpty()) if (name.isEmpty())
name = QString( "out%1"_L1 ).arg(i); name = u"out%1"_s.arg(i);
else else
name.replace(u'-', u'_'); name.replace(u'-', u'_');
while (retval.contains(name)) while (retval.contains(name))
@ -481,7 +481,7 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
if (pos != -1) if (pos != -1)
includeGuard = includeGuard.mid(pos + 1); includeGuard = includeGuard.mid(pos + 1);
} else { } else {
includeGuard = "QDBUSXML2CPP_PROXY"_L1; includeGuard = u"QDBUSXML2CPP_PROXY"_s;
} }
includeGuard = "%1"_L1.arg(includeGuard); includeGuard = "%1"_L1.arg(includeGuard);
hs << "#ifndef " << includeGuard << Qt::endl hs << "#ifndef " << includeGuard << Qt::endl
@ -798,7 +798,7 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
if (pos != -1) if (pos != -1)
includeGuard = includeGuard.mid(pos + 1); includeGuard = includeGuard.mid(pos + 1);
} else { } else {
includeGuard = "QDBUSXML2CPP_ADAPTOR"_L1; includeGuard = u"QDBUSXML2CPP_ADAPTOR"_s;
} }
includeGuard = "%1"_L1.arg(includeGuard); includeGuard = "%1"_L1.arg(includeGuard);
hs << "#ifndef " << includeGuard << Qt::endl hs << "#ifndef " << includeGuard << Qt::endl
@ -845,7 +845,7 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
QString parent = parentClassName; QString parent = parentClassName;
if (parentClassName.isEmpty()) if (parentClassName.isEmpty())
parent = "QObject"_L1; parent = u"QObject"_s;
for (const QDBusIntrospection::Interface *interface : interfaces) { for (const QDBusIntrospection::Interface *interface : interfaces) {
QString className = classNameForInterface(interface->name, Adaptor); QString className = classNameForInterface(interface->name, Adaptor);
@ -1173,8 +1173,7 @@ int main(int argc, char **argv)
QStringList args = app.arguments(); QStringList args = app.arguments();
args.removeFirst(); args.removeFirst();
commandLine = PROGRAMNAME " "_L1; commandLine = PROGRAMNAME " "_L1 + args.join(u' ');
commandLine += args.join(u' ');
if (!proxyFile.isEmpty() || adaptorFile.isEmpty()) if (!proxyFile.isEmpty() || adaptorFile.isEmpty())
writeProxy(proxyFile, interfaces); writeProxy(proxyFile, interfaces);