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/gui/text | |
| 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/gui/text')
| -rw-r--r-- | src/gui/text/qfont.h | 1 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 65d126374e..4079e48dda 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE class QFontPrivate; /* don't touch */ -class QStringList; class QVariant; class Q_GUI_EXPORT QFont diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index eacce5a2c4..67f06b8485 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE -class QStringList; struct QFontDef; class QFontEngine; |