More deprecation induced busywork

QString::count() will vanish.

Change-Id: I65672fa648c0969930e9398ec4e541a0771c8a57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-06-06 16:58:05 +02:00
parent f83fb72af8
commit 19a6428f54
29 changed files with 161 additions and 161 deletions

View File

@@ -215,13 +215,13 @@ bool CMakeConfigItem::less(const CMakeConfigItem &a, const CMakeConfigItem &b)
CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
{
// Strip comments (only at start of line!):
int commentStart = s.count();
for (int i = 0; i < s.count(); ++i) {
int commentStart = s.size();
for (int i = 0; i < s.size(); ++i) {
const QChar c = s.at(i);
if (c == ' ' || c == '\t')
continue;
else if ((c == '#')
|| (c == '/' && i < s.count() - 1 && s.at(i + 1) == '/')) {
|| (c == '/' && i < s.size() - 1 && s.at(i + 1) == '/')) {
commentStart = i;
break;
} else {
@@ -234,7 +234,7 @@ CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
int firstPos = -1;
int colonPos = -1;
int equalPos = -1;
for (int i = 0; i < line.count(); ++i) {
for (int i = 0; i < line.size(); ++i) {
const QChar c = s.at(i);
if (firstPos < 0 && !c.isSpace()) {
firstPos = i;
@@ -371,7 +371,7 @@ CMakeConfig CMakeConfig::fromFile(const Utils::FilePath &cacheFile, QString *err
if (pieces.isEmpty())
continue;
QTC_ASSERT(pieces.count() == 3, continue);
QTC_ASSERT(pieces.size() == 3, continue);
const QByteArray key = pieces.at(0);
const QByteArray type = pieces.at(1);
const QByteArray value = pieces.at(2);
@@ -387,7 +387,7 @@ CMakeConfig CMakeConfig::fromFile(const Utils::FilePath &cacheFile, QString *err
}
// Set advanced flags:
for (int i = 0; i < result.count(); ++i) {
for (int i = 0; i < result.size(); ++i) {
CMakeConfigItem &item = result[i];
item.isAdvanced = advancedSet.contains(item.key);