STL compatibility: use size() instead of count()

This is a simple find and replace with manual sanity check.

Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

6 files changed, 13 insertions, 14 deletions

diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp
index 816c0e7d0..2a55fe99b 100644
--- a/src/lib/corelib/tools/executablefinder.cpp
+++ b/src/lib/corelib/tools/executablefinder.cpp
@@ -98,7 +98,7 @@ QString ExecutableFinder::findBySuffix(const QString &filePath) const
 bool ExecutableFinder::candidateCheck(const QString &directory, const QString &program,
         QString &fullProgramPath) const
 {
-    for (int i = 0; i < m_executableSuffixes.count(); ++i) {
+    for (int i = 0; i < m_executableSuffixes.size(); ++i) {
         QString candidate = directory + program + m_executableSuffixes.at(i);
         qCDebug(lcExec) << "candidate:" << candidate;
         QFileInfo fi(candidate);
@@ -122,12 +122,12 @@ QString ExecutableFinder::findInPath(const QString &filePath, const QString &wor
             .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
     if (HostOsInfo::isWindowsHost())
         pathEnv.prepend(QLatin1String("."));
-    for (int i = 0; i < pathEnv.count(); ++i) {
+    for (int i = 0; i < pathEnv.size(); ++i) {
         QString directory = pathEnv.at(i);
         if (directory == QLatin1String("."))
             directory = workingDirPath;
         if (!directory.isEmpty()) {
-            const QChar lastChar = directory.at(directory.count() - 1);
+            const QChar lastChar = directory.at(directory.size() - 1);
             if (lastChar != QLatin1Char('/') && lastChar != QLatin1Char('\\'))
                 directory.append(QLatin1Char('/'));
         }
diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp
index 61315a669..b731f067f 100644
--- a/src/lib/corelib/tools/jsliterals.cpp
+++ b/src/lib/corelib/tools/jsliterals.cpp
@@ -60,7 +60,7 @@ QString toJSLiteral(const QString &str)
 QString toJSLiteral(const QStringList &strs)
 {
     QString js = QLatin1String("[");
-    for (int i = 0; i < strs.count(); ++i) {
+    for (int i = 0; i < strs.size(); ++i) {
         if (i != 0)
             js.append(QLatin1String(", "));
         js.append(toJSLiteral(strs.at(i)));
diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h
index ff91eface..847ded5cb 100644
--- a/src/lib/corelib/tools/persistence.h
+++ b/src/lib/corelib/tools/persistence.h
@@ -257,7 +257,7 @@ template<> struct PersistentPool::Helper<QProcessEnvironment>
     static void store(const QProcessEnvironment &env, PersistentPool *pool)
     {
         const QStringList &keys = env.keys();
-        pool->store(keys.count());
+        pool->store(keys.size());
         for (const QString &key : keys) {
             pool->store(key);
             pool->store(env.value(key));
@@ -339,7 +339,7 @@ struct PersistentPool::Helper<T, typename std::enable_if<IsKeyValueContainer<T>:
 {
     static void store(const T &container, PersistentPool *pool)
     {
-        pool->store(container.count());
+        pool->store(container.size());
         for (auto it = container.cbegin(); it != container.cend(); ++it) {
             pool->store(it.key());
             pool->store(it.value());
diff --git a/src/lib/corelib/tools/scripttools.h b/src/lib/corelib/tools/scripttools.h
index 8346aea66..2d8f54204 100644
--- a/src/lib/corelib/tools/scripttools.h
+++ b/src/lib/corelib/tools/scripttools.h
@@ -55,7 +55,7 @@ namespace Internal {
 template <typename C>
 QScriptValue toScriptValue(QScriptEngine *scriptEngine, const C &container)
 {
-    QScriptValue v = scriptEngine->newArray(container.count());
+    QScriptValue v = scriptEngine->newArray(container.size());
     int i = 0;
     for (const typename C::value_type &item : container)
         v.setProperty(i++, scriptEngine->toScriptValue(item));
diff --git a/src/lib/corelib/tools/set.h b/src/lib/corelib/tools/set.h
index 393b8530c..3292b68f6 100644
--- a/src/lib/corelib/tools/set.h
+++ b/src/lib/corelib/tools/set.h
@@ -119,8 +119,7 @@ public:
     bool contains(const T &v) const { return std::binary_search(cbegin(), cend(), v); }
     bool contains(const Set<T> &other) const;
     bool isEmpty() const { return m_data.empty(); }
-    int count() const { return int(m_data.size()); }
-    int size() const { return count(); }
+    int size() const { return int(m_data.size()); }
     int capacity() const { return int(m_data.capacity()); }
     bool intersects(const Set<T> &other) const;
 
@@ -274,7 +273,7 @@ template<typename T> void Set<T>::load(PersistentPool &pool)
 
 template<typename T> void Set<T>::store(PersistentPool &pool) const
 {
-    pool.store(count());
+    pool.store(size());
     std::for_each(m_data.cbegin(), m_data.cend(),
                   std::bind(&Set<T>::storeElem, this, std::ref(pool), std::placeholders::_1));
 }
@@ -282,7 +281,7 @@ template<typename T> void Set<T>::store(PersistentPool &pool) const
 template<typename T> QStringList Set<T>::toStringList() const
 {
     QStringList sl;
-    sl.reserve(count());
+    sl.reserve(size());
     std::transform(cbegin(), cend(), std::back_inserter(sl),
                    [this](const T &e) { return toString(e); });
     return sl;
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index 4544fa5d0..c24c58d2c 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -166,7 +166,7 @@ void SettingsModel::addNewKey(const QModelIndex &parent)
     Node * const newNode = new Node;
     newNode->parent = parentNode;
     newNode->name = parentNode->uniqueChildName();
-    beginInsertRows(parent, parentNode->children.count(), parentNode->children.count());
+    beginInsertRows(parent, parentNode->children.size(), parentNode->children.size());
     parentNode->children << newNode;
     endInsertRows();
     d->dirty = true;
@@ -247,7 +247,7 @@ int SettingsModel::rowCount(const QModelIndex &parent) const
         return 0;
     const Node * const node = d->indexToNode(parent);
     Q_ASSERT(node);
-    return node->children.count();
+    return node->children.size();
 }
 
 QVariant SettingsModel::data(const QModelIndex &index, int role) const
@@ -302,7 +302,7 @@ QModelIndex SettingsModel::index(int row, int column, const QModelIndex &parent)
 {
     const Node * const parentNode = d->indexToNode(parent);
     Q_ASSERT(parentNode);
-    if (parentNode->children.count() <= row)
+    if (parentNode->children.size() <= row)
         return QModelIndex();
     return createIndex(row, column, parentNode->children.at(row));
 }