aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlimportscanner/main.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-05 07:29:16 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-07 23:38:48 +0200
commit958cd3ee1094a068b6d0ff27c73a4b3caff088ad (patch)
tree6d3816fedf5dab2307675fd6ef70d39758e246f5 /tools/qmlimportscanner/main.cpp
parente8e03215654ca730243336a80453cf9396cbdf58 (diff)
Port from container::count() and length() to size()
This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmlimportscanner/main.cpp')
-rw-r--r--tools/qmlimportscanner/main.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 1b2dbf285c..ea2ddac00d 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -304,7 +304,7 @@ QPair<QString, QString> resolveImportPath(const QString &uri, const QString &ver
// otherwise we keep looking if we can find the module again (with a qmldir this time)
}
} else {
- for (int index = parts.count() - 1; index >= 0; --index) {
+ for (int index = parts.size() - 1; index >= 0; --index) {
QString relativePath = parts.mid(0, index + 1).join(slash)
+ dot + ver + slash + parts.mid(index + 1).join(slash);
if (relativePath.endsWith(slash))
@@ -449,7 +449,7 @@ QVariantMap dependencyStringToImport(const QString &line) {
QVariantMap depImport;
depImport[typeLiteral()] = moduleLiteral();
depImport[nameLiteral()] = name;
- if (dep.length() > 1)
+ if (dep.size() > 1)
depImport[versionLiteral()] = dep[1].toString();
return depImport;
}
@@ -772,8 +772,8 @@ QVariantList findQmlImportsRecursively(const QStringList &qmlDirs,
{
QVariantList ret;
- qCDebug(lcImportScanner) << "Scanning" << qmlDirs.count() << "root directories and"
- << scanFiles.count() << "files.";
+ qCDebug(lcImportScanner) << "Scanning" << qmlDirs.size() << "root directories and"
+ << scanFiles.size() << "files.";
// Scan all app root qml directories for imports
for (const QString &qmlDir : qmlDirs) {
@@ -891,26 +891,26 @@ int main(int argc, char *argv[])
QString outputFile;
int i = 1;
- while (i < args.count()) {
+ while (i < args.size()) {
const QString &arg = args.at(i);
++i;
QStringList *argReceiver = nullptr;
if (!arg.startsWith(QLatin1Char('-')) || arg == QLatin1String("-")) {
qmlRootPaths += arg;
} else if (arg == QLatin1String("-rootPath")) {
- if (i >= args.count())
+ if (i >= args.size())
std::cerr << "-rootPath requires an argument\n";
argReceiver = &qmlRootPaths;
} else if (arg == QLatin1String("-qmlFiles")) {
- if (i >= args.count())
+ if (i >= args.size())
std::cerr << "-qmlFiles requires an argument\n";
argReceiver = &scanFiles;
} else if (arg == QLatin1String("-jsFiles")) {
- if (i >= args.count())
+ if (i >= args.size())
std::cerr << "-jsFiles requires an argument\n";
argReceiver = &scanFiles;
} else if (arg == QLatin1String("-importPath")) {
- if (i >= args.count())
+ if (i >= args.size())
std::cerr << "-importPath requires an argument\n";
argReceiver = &qmlImportPaths;
} else if (arg == QLatin1String("-cmake-output")) {
@@ -918,7 +918,7 @@ int main(int argc, char *argv[])
} else if (arg == QLatin1String("-qrcFiles")) {
argReceiver = &qrcFiles;
} else if (arg == QLatin1String("-output-file")) {
- if (i >= args.count()) {
+ if (i >= args.size()) {
std::cerr << "-output-file requires an argument\n";
return 1;
}
@@ -931,7 +931,7 @@ int main(int argc, char *argv[])
return 1;
}
- while (i < args.count()) {
+ while (i < args.size()) {
const QString arg = args.at(i);
if (arg.startsWith(QLatin1Char('-')) && arg != QLatin1String("-"))
break;