diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-03 15:04:16 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-12 23:37:15 +0200 |
| commit | 652bd1efca34b7e114836f79c33b5e4a248faaee (patch) | |
| tree | 23eea549c4a282626ec5d891011e76482b8cc4be /src/testlib | |
| parent | ead02871cc97fa7dae956b1cd649a91de432dc73 (diff) | |
Make QStringList an alias to QList<QString>
Fix our API, so that QStringList and QList<QString> are the
same thing.
This required a bit of refactoring in QList and moving the
indexOf(), lastIndexOf() and contains() method into
QListSpecialMethods. In addition, we need to ensure that
the QStringList(const QString&) constructor is still available
for compatibility with Qt 5.
Once those two are done, all methods in QStringList can be moved
into QListSpecialMethods<QString>.
Change-Id: Ib8afbf5b6d9df4d0d47051252233506f62335fa3
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmarkvalgrind_p.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtest.h | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h index 0619be9f22..0cbb8bb103 100644 --- a/src/testlib/qbenchmarkvalgrind_p.h +++ b/src/testlib/qbenchmarkvalgrind_p.h @@ -56,8 +56,6 @@ #include <QtCore/qmap.h> #include <QtCore/qstring.h> -class QStringList; - QT_REQUIRE_CONFIG(valgrind); QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 7a6bbb5edf..f9cf7aa941 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -499,13 +499,6 @@ bool qCompare(QList<T> const &t1, const T (& t2)[N], actual, expected, file, line); } -template <> -inline bool qCompare(QStringList const &t1, QStringList const &t2, const char *actual, const char *expected, - const char *file, int line) -{ - return qCompare<QString>(t1, t2, actual, expected, file, line); -} - template <typename T> inline bool qCompare(QFlags<T> const &t1, T const &t2, const char *actual, const char *expected, const char *file, int line) |