diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-14 16:36:18 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-05-03 01:38:46 +0200 |
commit | e65e3f3021db90ffd236f9aa4bc3dd43b89a0ec8 (patch) | |
tree | 44bd9b1cd9e1327fc6aa3feeaa478185a493def3 /src/tools | |
parent | 39a6307178603211e070580ed0c25ec65c0b8a70 (diff) | |
download | qtbase-e65e3f3021db90ffd236f9aa4bc3dd43b89a0ec8.tar.gz |
Tools: replace remaining uses of QLatin1String with QLatin1StringView
Task-number: QTBUG-98434
Change-Id: Ie136f600f823019c29461561d4e30be66a66e87b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/moc/moc.cpp | 6 | ||||
-rw-r--r-- | src/tools/moc/symbols.h | 2 | ||||
-rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 12 | ||||
-rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 14 | ||||
-rw-r--r-- | src/tools/qtpaths/qtpaths.cpp | 2 | ||||
-rw-r--r-- | src/tools/tracegen/provider.cpp | 2 | ||||
-rw-r--r-- | src/tools/tracegen/tracegen.cpp | 4 | ||||
-rw-r--r-- | src/tools/windeployqt/main.cpp | 30 | ||||
-rw-r--r-- | src/tools/windeployqt/utils.cpp | 4 | ||||
-rw-r--r-- | src/tools/windeployqt/utils.h | 6 |
10 files changed, 41 insertions, 41 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 04f4b2a95a..94caf72f33 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1146,7 +1146,7 @@ void Moc::generate(FILE *out, FILE *jsonOutput) if (jsonOutput) { QJsonObject mocData; mocData["outputRevision"_L1] = mocOutputRevision; - mocData["inputFile"_L1] = QLatin1String(fn.constData()); + mocData["inputFile"_L1] = QLatin1StringView(fn.constData()); QJsonArray classesJsonFormatted; @@ -2052,7 +2052,7 @@ QJsonObject PropertyDef::toJson() const const auto jsonify = [&prop](const char *str, const QByteArray &member) { if (!member.isEmpty()) - prop[QLatin1String(str)] = QString::fromUtf8(member); + prop[QLatin1StringView(str)] = QString::fromUtf8(member); }; jsonify("member", member); @@ -2071,7 +2071,7 @@ QJsonObject PropertyDef::toJson() const value = false; else value = QString::fromUtf8(boolOrString); // function name to query at run-time - prop[QLatin1String(str)] = value; + prop[QLatin1StringView(str)] = value; }; jsonifyBoolOrString("designable", designable); diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index cbe5466b4a..65696f5423 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -62,7 +62,7 @@ struct SubArray inline size_t qHash(const SubArray &key) { - return qHash(QLatin1String(key.array.constData() + key.from, key.len)); + return qHash(QLatin1StringView(key.array.constData() + key.from, key.len)); } diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 914402bbbf..cde2bef1fb 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -97,7 +97,7 @@ int qDBusParametersForMethod(const FunctionDef &mm, QList<QMetaType> &metaTypes, static inline QString typeNameToXml(const char *typeName) { - QString plain = QLatin1String(typeName); + QString plain = QLatin1StringView(typeName); return plain.toHtmlEscaped(); } @@ -157,7 +157,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) { const char *signature = QDBusMetaType::typeToSignature(QMetaType(types.at(j))); xml += QString::fromLatin1(" <arg %1type=\"%2\" direction=\"%3\"/>\n") .arg(name, - QLatin1String(signature), + QLatin1StringView(signature), isOutput ? "out"_L1 : "in"_L1); // do we need to describe this argument? @@ -221,9 +221,9 @@ static QString generateInterfaceXml(const ClassDef *mo) continue; retval += QString::fromLatin1(" <property name=\"%1\" type=\"%2\" access=\"%3\"") - .arg(QLatin1String(mp.name), - QLatin1String(signature), - QLatin1String(accessvalues[access])); + .arg(QLatin1StringView(mp.name), + QLatin1StringView(signature), + QLatin1StringView(accessvalues[access])); if (!QDBusMetaType::signatureToMetaType(signature).isValid()) { retval += QString::fromLatin1(">\n <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n </property>\n") @@ -272,7 +272,7 @@ QString qDBusInterfaceFromClassDef(const ClassDef *mo) if (cid.name == QCLASSINFO_DBUS_INTERFACE) return QString::fromUtf8(cid.value); } - interface = QLatin1String(mo->classname); + interface = QLatin1StringView(mo->classname); interface.replace("::"_L1, "."_L1); if (interface.startsWith("QDBus"_L1)) { diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index df60b4a18d..dbad177a00 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -210,14 +210,14 @@ static QByteArray qtTypeName(const QString &where, const QString &signature, if (type == QMetaType::UnknownType) { QString annotationName = QString::fromLatin1("org.qtproject.QtDBus.QtTypeName"); if (paramId >= 0) - annotationName += QString::fromLatin1(".%1%2").arg(QLatin1String(direction)).arg(paramId); + annotationName += QString::fromLatin1(".%1%2").arg(QLatin1StringView(direction)).arg(paramId); QString qttype = annotations.value(annotationName); if (!qttype.isEmpty()) return std::move(qttype).toLatin1(); QString oldAnnotationName = QString::fromLatin1("com.trolltech.QtDBus.QtTypeName"); if (paramId >= 0) - oldAnnotationName += QString::fromLatin1(".%1%2").arg(QLatin1String(direction)).arg(paramId); + oldAnnotationName += QString::fromLatin1(".%1%2").arg(QLatin1StringView(direction)).arg(paramId); qttype = annotations.value(oldAnnotationName); if (qttype.isEmpty()) { @@ -248,23 +248,23 @@ static QByteArray qtTypeName(const QString &where, const QString &signature, static QString nonConstRefArg(const QByteArray &arg) { - return QLatin1String(arg + " &"); + return QLatin1StringView(arg + " &"); } static QString templateArg(const QByteArray &arg) { if (!arg.endsWith('>')) - return QLatin1String(arg); + return QLatin1StringView(arg); - return QLatin1String(arg + ' '); + return QLatin1StringView(arg + ' '); } static QString constRefArg(const QByteArray &arg) { if (!arg.startsWith('Q')) - return QLatin1String(arg + ' '); + return QLatin1StringView(arg + ' '); else - return QString( "const %1 &"_L1 ).arg( QLatin1String(arg) ); + return QString("const %1 &"_L1).arg(QLatin1StringView(arg)); } static QStringList makeArgNames(const QDBusIntrospection::Arguments &inputArgs, diff --git a/src/tools/qtpaths/qtpaths.cpp b/src/tools/qtpaths/qtpaths.cpp index 7078532c32..86b31fa558 100644 --- a/src/tools/qtpaths/qtpaths.cpp +++ b/src/tools/qtpaths/qtpaths.cpp @@ -147,7 +147,7 @@ static QStringList types() static const StringEnum &parseLocationOrError(const QString &locationString) { for (const StringEnum &se : lookupTableData) - if (locationString == QLatin1String(se.stringvalue)) + if (locationString == QLatin1StringView(se.stringvalue)) return se; QString message = QStringLiteral("Unknown location: %1"); diff --git a/src/tools/tracegen/provider.cpp b/src/tools/tracegen/provider.cpp index 5fa93bf8a9..d2b0f625b9 100644 --- a/src/tools/tracegen/provider.cpp +++ b/src/tools/tracegen/provider.cpp @@ -177,7 +177,7 @@ static Tracepoint::Field::BackendType backendType(QString rawType) static const size_t tableSize = sizeof (typeTable) / sizeof (typeTable[0]); for (size_t i = 0; i < tableSize; ++i) { - if (rawType == QLatin1String(typeTable[i].type)) + if (rawType == QLatin1StringView(typeTable[i].type)) return typeTable[i].backendType; } diff --git a/src/tools/tracegen/tracegen.cpp b/src/tools/tracegen/tracegen.cpp index 978fe406d0..ecf6e3cf7d 100644 --- a/src/tools/tracegen/tracegen.cpp +++ b/src/tools/tracegen/tracegen.cpp @@ -75,8 +75,8 @@ static void parseArgs(int argc, char *argv[], Target *target, QString *inFile, Q usage(EXIT_FAILURE); } - *inFile = QLatin1String(argv[2]); - *outFile = QLatin1String(argv[3]); + *inFile = QLatin1StringView(argv[2]); + *outFile = QLatin1StringView(argv[3]); } int main(int argc, char *argv[]) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index d3b821c088..234cc82df8 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -183,7 +183,7 @@ static const char webEngineProcessC[] = "QtWebEngineProcess"; static inline QString webProcessBinary(const char *binaryName, Platform p) { - const QString webProcess = QLatin1String(binaryName); + const QString webProcess = QLatin1StringView(binaryName); return (p & WindowsBased) ? webProcess + QStringLiteral(".exe") : webProcess; } @@ -284,7 +284,7 @@ static inline QString findBinary(const QString &directory, Platform platform) QDir(QDir::cleanPath(directory)).entryInfoList(nameFilters, QDir::Files | QDir::Executable); for (const QFileInfo &binaryFi : binaries) { const QString binary = binaryFi.fileName(); - if (!binary.contains(QLatin1String(webEngineProcessC), Qt::CaseInsensitive)) { + if (!binary.contains(QLatin1StringView(webEngineProcessC), Qt::CaseInsensitive)) { return binaryFi.absoluteFilePath(); } } @@ -457,8 +457,8 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse enabledModuleOptions.reserve(qtModulesCount); disabledModuleOptions.reserve(qtModulesCount); for (int i = 0; i < qtModulesCount; ++i) { - const QString option = QLatin1String(qtModuleEntries[i].option); - const QString name = QLatin1String(qtModuleEntries[i].libraryName); + const QString option = QLatin1StringView(qtModuleEntries[i].option); + const QString name = QLatin1StringView(qtModuleEntries[i].libraryName); const QString enabledDescription = QStringLiteral("Add ") + name + QStringLiteral(" module."); CommandLineOptionPtr enabledOption(new QCommandLineOption(option, enabledDescription)); parser->addOption(*enabledOption.data()); @@ -875,7 +875,7 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName) const auto end = std::end(pluginModuleMappings); const auto result = std::find_if(std::begin(pluginModuleMappings), end, - [&subDirName] (const PluginModuleMapping &m) { return subDirName == QLatin1String(m.directoryName); }); + [&subDirName] (const PluginModuleMapping &m) { return subDirName == QLatin1StringView(m.directoryName); }); return result != end ? result->module : 0; // "designer" } @@ -894,7 +894,7 @@ static quint64 qtModule(QString module, const QString &infix) module.truncate(endPos); // That should leave us with 'Qt6Core<d>'. for (const auto &qtModule : qtModuleEntries) { - const QLatin1String libraryName(qtModule.libraryName); + const QLatin1StringView libraryName(qtModule.libraryName); if (module == libraryName || (module.size() == libraryName.size() + 1 && module.startsWith(libraryName))) { return qtModule.module; @@ -990,7 +990,7 @@ static QStringList translationNameFilters(quint64 modules, const QString &prefix QStringList result; for (const auto &qtModule : qtModuleEntries) { if ((qtModule.module & modules) && qtModule.translation) { - const QString name = QLatin1String(qtModule.translation) + + const QString name = QLatin1StringView(qtModule.translation) + u'_' + prefix + QStringLiteral(".qm"); if (!result.contains(name)) result.push_back(name); @@ -1067,13 +1067,13 @@ static QString libraryPath(const QString &libraryLocation, const char *name, { QString result = libraryLocation + u'/'; if (platform & WindowsBased) { - result += QLatin1String(name); + result += QLatin1StringView(name); result += qtLibInfix; if (debug && platformHasDebugSuffix(platform)) result += u'd'; } else if (platform.testFlag(UnixBased)) { result += QStringLiteral("lib"); - result += QLatin1String(name); + result += QLatin1StringView(name); result += qtLibInfix; } result += sharedLibrarySuffix(platform); @@ -1132,7 +1132,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned QStringList filters; const QString suffix = u'*' + sharedLibrarySuffix(platform); for (auto minGwRuntime : minGwRuntimes) - filters.append(QLatin1String(minGwRuntime) + suffix); + filters.append(QLatin1StringView(minGwRuntime) + suffix); const QFileInfoList &dlls = QDir(binPath).entryInfoList(filters, QDir::Files); for (const QFileInfo &dllFi : dlls) result.append(dllFi.absoluteFilePath()); @@ -1247,7 +1247,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString> const QString libraryLocation = options.platform == Unix ? qtpathsVariables.value(QStringLiteral("QT_INSTALL_LIBS")) : qtBinDir; - const QString infix = qtpathsVariables.value(QLatin1String(qmakeInfixKey)); + const QString infix = qtpathsVariables.value(QLatin1StringView(qmakeInfixKey)); const int version = qtVersion(qtpathsVariables); Q_UNUSED(version); @@ -1334,12 +1334,12 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString> if (optVerboseLevel > 1) std::wcout << "Adding ICU version " << icuVersion << '\n'; QString icuLib = QStringLiteral("icudt") + icuVersion - + QLatin1String(windowsSharedLibrarySuffix);; + + QLatin1StringView(windowsSharedLibrarySuffix);; // Some packages contain debug dlls of ICU libraries even though it's a C // library and the official packages do not differentiate (QTBUG-87677) if (result.isDebug) { const QString icuLibCandidate = QStringLiteral("icudtd") + icuVersion - + QLatin1String(windowsSharedLibrarySuffix); + + QLatin1StringView(windowsSharedLibrarySuffix); if (!findInPath(icuLibCandidate).isEmpty()) { icuLib = icuLibCandidate; } @@ -1451,7 +1451,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString> const QStringList guiLibraries = findDependentLibraries(qtGuiLibrary, options.platform, errorMessage); const bool dependsOnOpenGl = !guiLibraries.filter(QStringLiteral("opengl32"), Qt::CaseInsensitive).isEmpty(); if (options.softwareRasterizer && !dependsOnOpenGl) { - const QFileInfo softwareRasterizer(qtBinDir + slash + QStringLiteral("opengl32sw") + QLatin1String(windowsSharedLibrarySuffix)); + const QFileInfo softwareRasterizer(qtBinDir + slash + QStringLiteral("opengl32sw") + QLatin1StringView(windowsSharedLibrarySuffix)); if (softwareRasterizer.isFile()) deployedQtLibraries.append(softwareRasterizer.absoluteFilePath()); } @@ -1604,7 +1604,7 @@ static bool deployWebEngineCore(const QMap<QString, QString> &qtpathsVariables, if (!createDirectory(resourcesTargetDir, errorMessage)) return false; for (auto installDataFile : installDataFiles) { - if (!updateFile(resourcesSourceDir + QLatin1String(installDataFile), + if (!updateFile(resourcesSourceDir + QLatin1StringView(installDataFile), resourcesTargetDir, options.updateFileFlags, options.json, errorMessage)) { return false; } diff --git a/src/tools/windeployqt/utils.cpp b/src/tools/windeployqt/utils.cpp index 5781d2d8f6..c5509bf684 100644 --- a/src/tools/windeployqt/utils.cpp +++ b/src/tools/windeployqt/utils.cpp @@ -496,7 +496,7 @@ QMap<QString, QString> queryQtPaths(const QString &qtpathsBinary, QString *error if (pos >= 0) { const QString infix = QString::fromUtf8(line.right(line.size() - pos - 1).trimmed()); if (!infix.isEmpty()) - result.insert(QLatin1String(qmakeInfixKey), infix); + result.insert(QLatin1StringView(qmakeInfixKey), infix); } break; } @@ -871,7 +871,7 @@ bool readPeExecutable(const QString &peExecutableFileName, QString *errorMessage QString findD3dCompiler(Platform platform, const QString &qtBinDir, unsigned wordSize) { const QString prefix = QStringLiteral("D3Dcompiler_"); - const QString suffix = QLatin1String(windowsSharedLibrarySuffix); + const QString suffix = QLatin1StringView(windowsSharedLibrarySuffix); // Get the DLL from Kit 8.0 onwards const QString kitDir = QString::fromLocal8Bit(qgetenv("WindowsSdkDir")); if (!kitDir.isEmpty()) { diff --git a/src/tools/windeployqt/utils.h b/src/tools/windeployqt/utils.h index 94c0093455..2cc0e14cf0 100644 --- a/src/tools/windeployqt/utils.h +++ b/src/tools/windeployqt/utils.h @@ -164,7 +164,7 @@ inline QString normalizeFileName(const QString &name) { return name; } static const char windowsSharedLibrarySuffix[] = ".dll"; static const char unixSharedLibrarySuffix[] = ".so"; -inline QString sharedLibrarySuffix(Platform platform) { return QLatin1String((platform & WindowsBased) ? windowsSharedLibrarySuffix : unixSharedLibrarySuffix); } +inline QString sharedLibrarySuffix(Platform platform) { return QLatin1StringView((platform & WindowsBased) ? windowsSharedLibrarySuffix : unixSharedLibrarySuffix); } bool isBuildDirectory(Platform platform, const QString &dirName); bool createSymbolicLink(const QFileInfo &source, const QString &target, QString *errorMessage); @@ -293,7 +293,7 @@ bool updateFile(const QString &sourceFileName, } // Source is symbolic link if (sourceFileInfo.isDir()) { - if ((flags & SkipQmlDesignerSpecificsDirectories) && sourceFileInfo.fileName() == QLatin1String("designer")) { + if ((flags & SkipQmlDesignerSpecificsDirectories) && sourceFileInfo.fileName() == QLatin1StringView("designer")) { if (optVerboseLevel) std::wcout << "Skipping " << QDir::toNativeSeparators(sourceFileName) << ".\n"; return true; @@ -329,7 +329,7 @@ bool updateFile(const QString &sourceFileName, if (created && (flags & RemoveEmptyQmlDirectories)) { QDir d(targetFileName); const QStringList entries = d.entryList(QStringList(), QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); - if (entries.isEmpty() || (entries.size() == 1 && entries.first() == QLatin1String("qmldir"))) { + if (entries.isEmpty() || (entries.size() == 1 && entries.first() == QLatin1StringView("qmldir"))) { if (!d.removeRecursively()) { *errorMessage = QString::fromLatin1("Cannot remove empty directory %1.") .arg(QDir::toNativeSeparators(targetFileName)); |