diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-08 19:56:03 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-10 21:02:08 +0200 |
| commit | 675a7f59025d40d4813bce70d72ce087024fb008 (patch) | |
| tree | 48b9d173109ac94c69b2d2c3e302c404e10563ee /src/assistant | |
| parent | 63541a15e21d3ced40e516705c904a4939cb70f1 (diff) | |
| download | qttools-675a7f59025d40d4813bce70d72ce087024fb008.tar.gz | |
Port from container::count() and length() to size() - V4
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:
const std::string o = "object";
auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };
auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
auto exprOfDeclaredType = [&](auto decl) {
return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
};
return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
};
auto renameMethod = [&] (ArrayRef<StringRef> classes,
StringRef from, StringRef to) {
return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
changeTo(cat(access(o, cat(to)), "()")),
cat("use '", to, "' instead of '", from, "'"));
};
renameMethod(<classes>, "count", "size");
renameMethod(<classes>, "length", "size");
a.k.a qt-port-to-std-compatible-api V4 with config Scope: 'Container'.
Change-Id: I58e1b41b91c34d2e860dbb5847b3752edbfc6fc9
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/assistant/bookmarkfiltermodel.cpp | 6 | ||||
| -rw-r--r-- | src/assistant/assistant/openpagesmanager.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/assistant/assistant/bookmarkfiltermodel.cpp b/src/assistant/assistant/bookmarkfiltermodel.cpp index 61954d8f9..89fe5cad7 100644 --- a/src/assistant/assistant/bookmarkfiltermodel.cpp +++ b/src/assistant/assistant/bookmarkfiltermodel.cpp @@ -62,7 +62,7 @@ void BookmarkFilterModel::setSourceModel(QAbstractItemModel *_sourceModel) int BookmarkFilterModel::rowCount(const QModelIndex &index) const { Q_UNUSED(index); - return cache.count(); + return cache.size(); } int BookmarkFilterModel::columnCount(const QModelIndex &index) const @@ -76,7 +76,7 @@ int BookmarkFilterModel::columnCount(const QModelIndex &index) const QModelIndex BookmarkFilterModel::mapToSource(const QModelIndex &proxyIndex) const { const int row = proxyIndex.row(); - if (proxyIndex.isValid() && row >= 0 && row < cache.count()) + if (proxyIndex.isValid() && row >= 0 && row < cache.size()) return cache[row]; return QModelIndex(); } @@ -96,7 +96,7 @@ QModelIndex BookmarkFilterModel::index(int row, int column, const QModelIndex &index) const { Q_UNUSED(index); - if (row < 0 || column < 0 || cache.count() <= row + if (row < 0 || column < 0 || cache.size() <= row || !sourceModel || sourceModel->columnCount() <= column) { return QModelIndex(); } diff --git a/src/assistant/assistant/openpagesmanager.cpp b/src/assistant/assistant/openpagesmanager.cpp index 65f37b19c..ca66bdde3 100644 --- a/src/assistant/assistant/openpagesmanager.cpp +++ b/src/assistant/assistant/openpagesmanager.cpp @@ -146,7 +146,7 @@ void OpenPagesManager::closeCurrentPage() = m_openPagesWidget->selectionModel()->selectedRows(); if (selectedIndexes.isEmpty()) return; - Q_ASSERT(selectedIndexes.count() == 1); + Q_ASSERT(selectedIndexes.size() == 1); removePage(selectedIndexes.first().row()); } |