diff options
author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-09-12 08:52:49 +0200 |
---|---|---|
committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-10-02 06:19:10 +0000 |
commit | 933df86bbcb96779b26d888a1e08fddbebbfcfe8 (patch) | |
tree | 582d7de672314e1ea01b846284a23a3006c59e2c /src | |
parent | b6022eccc4c330e01f0cfe8bba211b332dacbb61 (diff) |
QSFPM: setFilterRegExp and setFilterRegularExpression overloads to slots
The setters of both filterRegExp and filterRegularExpression are
currently normal functions. This patch moves them to slots to make
them usable using the old syntax. This can be done since there are
already overloads for both of them so people using the new connect
syntax would have needed to use qOverload already therefore there is
no SIC.
[ChangeLog][QtCore][QSortFilterProxyModel] Setters of both the
filterRegExp and filterRegularExpression properties are now slots and
can be used with the old as well as the new syntax.
Change-Id: Id5cd9a50fa4a62e2bbd6bd665b44bd25a0402852
Fixes: QTBUG-18113
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 1304a95d13..0be8b88672 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -88,11 +88,9 @@ public: QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const override; QRegExp filterRegExp() const; - void setFilterRegExp(const QRegExp ®Exp); #if QT_CONFIG(regularexpression) QRegularExpression filterRegularExpression() const; - void setFilterRegularExpression(const QRegularExpression ®ularExpression); #endif int filterKeyColumn() const; @@ -124,8 +122,10 @@ public: 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); #endif void setFilterWildcard(const QString &pattern); void setFilterFixedString(const QString &pattern); |