whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few more {QString, QByteArray}::count() deprecation warnings 

Change-Id: I0be2d5e7a8f6af3bc1077ae6d1f20cc5da8f2266
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Sona Kurazyan 2022-03-16 14:50:59 +01:00
parent aec6b00758
commit 73e7fc2d8e
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/plugin/qlibrary_unix.cpp
View File

@ -230,7 +230,7 @@ bool QLibraryPrivate::load_sys()
attempt = name;
int lparen = attempt.indexOf(QLatin1Char('('));
if (lparen == -1)
lparen = attempt.count();
lparen = attempt.size();
attempt = path + prefixes.at(prefix) + attempt.insert(lparen, suffixes.at(suffix));
} else {
attempt = path + prefixes.at(prefix) + name + suffixes.at(suffix);

2
src/gui/util/qedidparser.cpp
View File

@ -272,7 +272,7 @@ QString QEdidParser::parseEdidString(const quint8 *data)
buffer = buffer.replace('\r', '\0').replace('\n', '\0');
// Replace non-printable characters with dash
for (int i = 0; i < buffer.count(); ++i) {
for (int i = 0; i < buffer.size(); ++i) {
if (buffer[i] < '\040' || buffer[i] > '\176')
buffer[i] = '-';
}

14
tests/auto/corelib/text/qstring/tst_qstring.cpp
View File

@ -976,7 +976,9 @@ void tst_QString::length()
QFETCH(QString, s1);
QTEST(s1.length(), "res");
QTEST(s1.size(), "res");
QTEST(s1.count(), "res");
#if QT_DEPRECATED_SINCE(6, 4)
QT_IGNORE_DEPRECATIONS(QTEST(s1.count(), "res");)
#endif
}
#include <qfile.h>
@ -1905,7 +1907,9 @@ void tst_QString::count()
QCOMPARE(a.count( QStringView(), Qt::CaseInsensitive), 16);
QString nullStr;
QCOMPARE(nullStr.count(), 0);
#if QT_DEPRECATED_SINCE(6, 4)
QT_IGNORE_DEPRECATIONS(QCOMPARE(nullStr.count(), 0);)
#endif
QCOMPARE(nullStr.count('A'), 0);
QCOMPARE(nullStr.count("AB"), 0);
QCOMPARE(nullStr.count(view), 0);
@ -1919,7 +1923,9 @@ void tst_QString::count()
#endif
QString emptyStr("");
QCOMPARE(emptyStr.count(), 0);
#if QT_DEPRECATED_SINCE(6, 4)
QT_IGNORE_DEPRECATIONS(QCOMPARE(emptyStr.count(), 0);)
#endif
QCOMPARE(emptyStr.count('A'), 0);
QCOMPARE(emptyStr.count("AB"), 0);
QCOMPARE(emptyStr.count(view), 0);
@ -6500,7 +6506,7 @@ void tst_QString::arg_fillChar()
QFETCH(IntList, widths);
QFETCH(QString, fillChars);
QFETCH(QString, expected);
QCOMPARE(replaceValues.count(), fillChars.count());
QCOMPARE(replaceValues.count(), fillChars.size());
QCOMPARE(replaceValues.count(), widths.count());
QString actual = pattern;