diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-02 14:21:50 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-15 14:38:40 +0200 |
| commit | eb349930eee1ca8f31415dd2269a70d3dfd76257 (patch) | |
| tree | 6f26a330928139086f80d1e84dcba292d901ac5a /src/corelib/itemmodels/qsortfilterproxymodel.h | |
| parent | 48794f5057f49373a7b8803db8bab7131e04575c (diff) | |
Remove QRegExp support from QSortFilterProxyModel
Map setFilterWildcard() and setFilterFixedString() to now use
QRegularExpression.
Change-Id: I2dff2015234decb2badfd306975dcff8553cdd7f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/corelib/itemmodels/qsortfilterproxymodel.h')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index fb26da39ba..b7d4e69cb9 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -41,7 +41,6 @@ #define QSORTFILTERPROXYMODEL_H #include <QtCore/qabstractproxymodel.h> -#include <QtCore/qregexp.h> #if QT_CONFIG(regularexpression) # include <QtCore/qregularexpression.h> @@ -62,7 +61,6 @@ class Q_CORE_EXPORT QSortFilterProxyModel : public QAbstractProxyModel friend class QSortFilterProxyModelGreaterThan; Q_OBJECT - Q_PROPERTY(QRegExp filterRegExp READ filterRegExp WRITE setFilterRegExp) #if QT_CONFIG(regularexpression) Q_PROPERTY(QRegularExpression filterRegularExpression READ filterRegularExpression WRITE setFilterRegularExpression) #endif @@ -87,8 +85,6 @@ public: QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const override; QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const override; - QRegExp filterRegExp() const; - #if QT_CONFIG(regularexpression) QRegularExpression filterRegularExpression() const; #endif @@ -121,8 +117,6 @@ public: void setRecursiveFilteringEnabled(bool recursive); public Q_SLOTS: - void setFilterRegExp(const QString &pattern); - void setFilterRegExp(const QRegExp ®Exp); #if QT_CONFIG(regularexpression) void setFilterRegularExpression(const QString &pattern); void setFilterRegularExpression(const QRegularExpression ®ularExpression); |