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>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index 9beaffc2ae..ae61ca0c83 100644
--- a/src/qml/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -200,12 +200,12 @@ QHashedStringRef::QHashedStringRef()
 }
 
 QHashedStringRef::QHashedStringRef(const QString &str)
-: m_data(str.constData()), m_length(str.length()), m_hash(0)
+: m_data(str.constData()), m_length(str.size()), m_hash(0)
 {
 }
 
 QHashedStringRef::QHashedStringRef(QStringView str)
-: m_data(str.constData()), m_length(str.length()), m_hash(0)
+: m_data(str.constData()), m_length(str.size()), m_hash(0)
 {
 }
 
@@ -220,7 +220,7 @@ QHashedStringRef::QHashedStringRef(const QChar *data, int length, quint32 hash)
 }
 
 QHashedStringRef::QHashedStringRef(const QHashedString &string)
-: m_data(string.constData()), m_length(string.length()), m_hash(string.m_hash)
+: m_data(string.constData()), m_length(string.size()), m_hash(string.m_hash)
 {
 }
 
@@ -248,7 +248,7 @@ bool QHashedStringRef::operator==(const QHashedString &string) const
     if (m_hash && string.m_hash && m_hash != string.m_hash)
         return false;
     QStringView view {m_data, m_length};
-    QStringView otherView {string.constData(), string.length()};
+    QStringView otherView {string.constData(), string.size()};
     return view == otherView;
 }
 
diff --git a/src/qml/qml/ftw/qstringhash_p.h b/src/qml/qml/ftw/qstringhash_p.h
index 1d0e7d6e97..ee2928ee59 100644
--- a/src/qml/qml/ftw/qstringhash_p.h
+++ b/src/qml/qml/ftw/qstringhash_p.h
@@ -38,7 +38,7 @@ public:
     }
 
     QStringHashNode(const QHashedString &key)
-    : length(key.length()), hash(key.hash()), symbolId(0)
+    : length(key.size()), hash(key.hash()), symbolId(0)
     , arrayData(mutableStringData(key).d_ptr())
     , strData(mutableStringData(key).data())
     {
@@ -491,7 +491,7 @@ int QStringHash<T>::numBuckets() const
 template<class T>
 void QStringHash<T>::initializeNode(Node *node, const QHashedString &key)
 {
-    node->length = key.length();
+    node->length = key.size();
     node->hash = key.hash();
     node->arrayData = mutableStringData(key).d_ptr();
     node->strData = mutableStringData(key).data();