diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 20:58:30 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-14 12:19:47 +0000 |
| commit | 45ed28a9d3790707b18798454d976f3a818a7740 (patch) | |
| tree | a757ffb39ed2a9a5891cb56affc81db9617f7a68 /src/corelib/kernel/qvariant.h | |
| parent | b2ee684a13d01363c121d3ba597feaf274786fdb (diff) | |
Remove QRegExp from QVariant
Add an operator QVariant() to QRegExp to keep things at source compatible
as possible.
Add a hack to QVariant::load/save() to recognize the old typeid
for QRegExp and stream them correctly as long as the streaming operators
for QRegExp are registered.
Also move the datastream test for QRegExp to tst_qregexp, and adjust it to
the qvariant changes.
Change-Id: I120b38a7541b43ec07a21b17f7f35c55f071eb75
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index c519411fc1..d8ac0324ac 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -81,9 +81,6 @@ class QSize; class QSizeF; class QRect; class QRectF; -#ifndef QT_NO_REGEXP -class QRegExp; -#endif // QT_NO_REGEXP #if QT_CONFIG(regularexpression) class QRegularExpression; #endif // QT_CONFIG(regularexpression) @@ -160,7 +157,6 @@ class Q_CORE_EXPORT QVariant LineF = QMetaType::QLineF, Point = QMetaType::QPoint, PointF = QMetaType::QPointF, - RegExp = QMetaType::QRegExp, #if QT_CONFIG(regularexpression) RegularExpression = QMetaType::QRegularExpression, #endif @@ -252,9 +248,6 @@ class Q_CORE_EXPORT QVariant QVariant(const QRectF &rect); #endif QVariant(const QLocale &locale); -#ifndef QT_NO_REGEXP - QVariant(const QRegExp ®Exp); -#endif // QT_NO_REGEXP #if QT_CONFIG(regularexpression) QVariant(const QRegularExpression &re); #endif // QT_CONFIG(regularexpression) @@ -329,9 +322,6 @@ class Q_CORE_EXPORT QVariant QRectF toRectF() const; #endif QLocale toLocale() const; -#ifndef QT_NO_REGEXP - QRegExp toRegExp() const; -#endif // QT_NO_REGEXP #if QT_CONFIG(regularexpression) QRegularExpression toRegularExpression() const; #endif // QT_CONFIG(regularexpression) |