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

qdbusxml2cpp: Use modern string literals

Browse Source 
Replace QStringLiteral and QString::fromLatin1 by u""_s or ""_L1.

Also use initializer list constructor for QStringList.

Change-Id: Ife020ddf48d27dd015aed1c04878216165decf69
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Ievgenii Meshcheriakov 2023-05-25 15:34:23 +02:00
parent f6be12f2f9
commit 1538d30c76
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,16 +232,16 @@ static QByteArray qtTypeName(const QString &where, const QString &signature,
{ {
int type = QDBusMetaType::signatureToMetaType(signature.toLatin1()).id(); int type = QDBusMetaType::signatureToMetaType(signature.toLatin1()).id();
if (type == QMetaType::UnknownType) { if (type == QMetaType::UnknownType) {
QString annotationName = QString::fromLatin1("org.qtproject.QtDBus.QtTypeName"); QString annotationName = u"org.qtproject.QtDBus.QtTypeName"_s;
if (paramId >= 0) if (paramId >= 0)
annotationName += QString::fromLatin1(".%1%2").arg(QLatin1StringView(direction)).arg(paramId); annotationName += ".%1%2"_L1.arg(QLatin1StringView(direction)).arg(paramId);
QString qttype = annotations.value(annotationName); QString qttype = annotations.value(annotationName);
if (!qttype.isEmpty()) if (!qttype.isEmpty())
return std::move(qttype).toLatin1(); return std::move(qttype).toLatin1();
QString oldAnnotationName = QString::fromLatin1("com.trolltech.QtDBus.QtTypeName"); QString oldAnnotationName = u"com.trolltech.QtDBus.QtTypeName"_s;
if (paramId >= 0) if (paramId >= 0)
oldAnnotationName += QString::fromLatin1(".%1%2").arg(QLatin1StringView(direction)).arg(paramId); oldAnnotationName += ".%1%2"_L1.arg(QLatin1StringView(direction)).arg(paramId);
qttype = annotations.value(oldAnnotationName); qttype = annotations.value(oldAnnotationName);
if (qttype.isEmpty()) { if (qttype.isEmpty()) {
@ -412,7 +412,7 @@ static QString propertySetter(const QDBusIntrospection::Property &property)
static QString methodName(const QDBusIntrospection::Method &method) static QString methodName(const QDBusIntrospection::Method &method)
{ {
QString name = method.annotations.value(QStringLiteral("org.qtproject.QtDBus.MethodName")); QString name = method.annotations.value(u"org.qtproject.QtDBus.MethodName"_s);
if (!name.isEmpty()) if (!name.isEmpty())
return name; return name;
@ -1078,44 +1078,44 @@ int main(int argc, char **argv)
parser.addHelpOption(); parser.addHelpOption();
parser.addVersionOption(); parser.addVersionOption();
parser.addPositionalArgument(QStringLiteral("xml-or-xml-file"), QStringLiteral("XML file to use.")); parser.addPositionalArgument(u"xml-or-xml-file"_s, u"XML file to use."_s);
parser.addPositionalArgument(QStringLiteral("interfaces"), QStringLiteral("List of interfaces to use."), parser.addPositionalArgument(u"interfaces"_s, u"List of interfaces to use."_s,
QStringLiteral("[interfaces ...]")); u"[interfaces ...]"_s);
QCommandLineOption adapterCodeOption(QStringList() << QStringLiteral("a") << QStringLiteral("adaptor"), QCommandLineOption adapterCodeOption(QStringList{u"a"_s, u"adaptor"_s},
QStringLiteral("Write the adaptor code to <filename>"), QStringLiteral("filename")); u"Write the adaptor code to <filename>"_s, u"filename"_s);
parser.addOption(adapterCodeOption); parser.addOption(adapterCodeOption);
QCommandLineOption classNameOption(QStringList() << QStringLiteral("c") << QStringLiteral("classname"), QCommandLineOption classNameOption(QStringList{u"c"_s, u"classname"_s},
QStringLiteral("Use <classname> as the class name for the generated classes"), QStringLiteral("classname")); u"Use <classname> as the class name for the generated classes"_s, u"classname"_s);
parser.addOption(classNameOption); parser.addOption(classNameOption);
QCommandLineOption addIncludeOption(QStringList() << QStringLiteral("i") << QStringLiteral("include"), QCommandLineOption addIncludeOption(QStringList{u"i"_s, u"include"_s},
QStringLiteral("Add #include \"filename\" to the output"), QStringLiteral("filename")); u"Add #include \"filename\" to the output"_s, u"filename"_s);
parser.addOption(addIncludeOption); parser.addOption(addIncludeOption);
QCommandLineOption addGlobalIncludeOption(QStringList() << QStringLiteral("I") << QStringLiteral("global-include"), QCommandLineOption addGlobalIncludeOption(QStringList{u"I"_s, u"global-include"_s},
QStringLiteral("Add #include <filename> to the output"), QStringLiteral("filename")); u"Add #include <filename> to the output"_s, u"filename"_s);
parser.addOption(addGlobalIncludeOption); parser.addOption(addGlobalIncludeOption);
QCommandLineOption adapterParentOption(QStringLiteral("l"), QCommandLineOption adapterParentOption(u"l"_s,
QStringLiteral("When generating an adaptor, use <classname> as the parent class"), QStringLiteral("classname")); u"When generating an adaptor, use <classname> as the parent class"_s, u"classname"_s);
parser.addOption(adapterParentOption); parser.addOption(adapterParentOption);
QCommandLineOption mocIncludeOption(QStringList() << QStringLiteral("m") << QStringLiteral("moc"), QCommandLineOption mocIncludeOption(QStringList{u"m"_s, u"moc"_s},
QStringLiteral("Generate #include \"filename.moc\" statements in the .cpp files")); u"Generate #include \"filename.moc\" statements in the .cpp files"_s);
parser.addOption(mocIncludeOption); parser.addOption(mocIncludeOption);
QCommandLineOption noNamespaceOption(QStringList() << QStringLiteral("N") << QStringLiteral("no-namespaces"), QCommandLineOption noNamespaceOption(QStringList{u"N"_s, u"no-namespaces"_s},
QStringLiteral("Don't use namespaces")); u"Don't use namespaces"_s);
parser.addOption(noNamespaceOption); parser.addOption(noNamespaceOption);
QCommandLineOption proxyCodeOption(QStringList() << QStringLiteral("p") << QStringLiteral("proxy"), QCommandLineOption proxyCodeOption(QStringList{u"p"_s, u"proxy"_s},
QStringLiteral("Write the proxy code to <filename>"), QStringLiteral("filename")); u"Write the proxy code to <filename>"_s, u"filename"_s);
parser.addOption(proxyCodeOption); parser.addOption(proxyCodeOption);
QCommandLineOption verboseOption(QStringList() << QStringLiteral("V") << QStringLiteral("verbose"), QCommandLineOption verboseOption(QStringList{u"V"_s, u"verbose"_s},
QStringLiteral("Be verbose.")); u"Be verbose."_s);
parser.addOption(verboseOption); parser.addOption(verboseOption);
parser.process(app); parser.process(app);
@ -1142,7 +1142,7 @@ int main(int argc, char **argv)
} }
if (verbose) if (verbose)
QLoggingCategory::setFilterRules(QStringLiteral("dbus.parser.debug=true")); QLoggingCategory::setFilterRules(u"dbus.parser.debug=true"_s);
QDBusIntrospection::Interfaces interfaces = readInput(); QDBusIntrospection::Interfaces interfaces = readInput();
cleanInterfaces(interfaces); cleanInterfaces(interfaces);