diff options
| author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-07-31 16:58:21 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-08-19 11:38:42 +0000 |
| commit | 346c15102b14c58b8aaeed2c1586cd3100200e28 (patch) | |
| tree | 1a08ed150e8c3b6d313f0e2cd9c9f84f95de2e65 /src/corelib/itemmodels/qsortfilterproxymodel.h | |
| parent | bcd80eebf983a2b547662d7e0d67bc8624d1130f (diff) | |
Add support for QRegularExpression to QSortFilterProxyModel
This patch implements the support for QRegularExpression in
QSortFilterProxyModel.
[ChangeLog][QtCore][QSFPM] QSortFilterProxyModel now supports
QRegularExpression.
Task-number: QTBUG-46810
Change-Id: If932d55f98f9b8bcf3a72c03ffd51da52cb50ad1
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/itemmodels/qsortfilterproxymodel.h')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 907ceb8e6d..0b7c69f37d 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -42,6 +42,7 @@ #include <QtCore/qabstractproxymodel.h> #include <QtCore/qregexp.h> +#include <QtCore/qregularexpression.h> QT_REQUIRE_CONFIG(sortfilterproxymodel); @@ -59,6 +60,9 @@ class Q_CORE_EXPORT QSortFilterProxyModel : public QAbstractProxyModel Q_OBJECT Q_PROPERTY(QRegExp filterRegExp READ filterRegExp WRITE setFilterRegExp) +#if QT_CONFIG(regularexpression) + Q_PROPERTY(QRegularExpression filterRegularExpression READ filterRegularExpression WRITE setFilterRegularExpression) +#endif Q_PROPERTY(int filterKeyColumn READ filterKeyColumn WRITE setFilterKeyColumn) Q_PROPERTY(bool dynamicSortFilter READ dynamicSortFilter WRITE setDynamicSortFilter) Q_PROPERTY(Qt::CaseSensitivity filterCaseSensitivity READ filterCaseSensitivity WRITE setFilterCaseSensitivity) @@ -83,6 +87,9 @@ public: QRegExp filterRegExp() const; void setFilterRegExp(const QRegExp ®Exp); + QRegularExpression filterRegularExpression() const; + void setFilterRegularExpression(const QRegularExpression ®ularExpression); + int filterKeyColumn() const; void setFilterKeyColumn(int column); @@ -112,6 +119,9 @@ public: public Q_SLOTS: void setFilterRegExp(const QString &pattern); +#if QT_CONFIG(regularexpression) + void setFilterRegularExpression(const QString &pattern); +#endif void setFilterWildcard(const QString &pattern); void setFilterFixedString(const QString &pattern); #if QT_DEPRECATED_SINCE(5, 11) |