status-im/SortFilterProxyModel
2
0
Fork 0
mirror of https://github.com/status-im/SortFilterProxyModel.git synced 2025-02-23 08:08:15 +00:00
Code Issues Projects Releases Wiki Activity

Use c++11 features

Browse Source
This commit is contained in:
oKcerG 2016-10-11 23:30:45 +02:00
parent ddf66c815b
commit 15e46852a4
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SortFilterProxyModel.pri
View File

@ -1,3 +1,5 @@
!c++11: warning("SortFilterProxyModel needs c++11, add CONFIG += c++11 to your .pro")
INCLUDEPATH += $$PWD
HEADERS += $$PWD/qqmlsortfilterproxymodel.h

5
qqmlsortfilterproxymodel.cpp
View File

@ -2,10 +2,7 @@
#include <QtQml>
QQmlSortFilterProxyModel::QQmlSortFilterProxyModel(QObject *parent) :
QSortFilterProxyModel(parent),
m_filterExpression(0),
m_compareExpression(0),
m_completed(false)
QSortFilterProxyModel(parent)
{
connect(this, &QAbstractProxyModel::sourceModelChanged, this, &QQmlSortFilterProxyModel::updateRoles);
connect(this, &QAbstractItemModel::modelReset, this, &QQmlSortFilterProxyModel::updateRoles);

14
qqmlsortfilterproxymodel.h
View File

@ -59,8 +59,8 @@ public:
const QQmlScriptString& sortExpression() const;
void setSortExpression(const QQmlScriptString& compareScriptString);
void classBegin();
void componentComplete();
void classBegin() override;
void componentComplete() override;
signals:
void countChanged();
@ -75,8 +75,8 @@ signals:
void sortExpressionChanged();
protected:
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
private slots:
void invalidateFilter();
@ -92,13 +92,13 @@ private:
QString m_sortRoleName;
QQmlScriptString m_filterScriptString;
QQmlExpression* m_filterExpression;
QQmlExpression* m_filterExpression = nullptr;
QQmlScriptString m_compareScriptString;
QQmlExpression* m_compareExpression;
QQmlExpression* m_compareExpression = nullptr;
QVariant m_filterValue;
bool m_completed;
bool m_completed = false;
};
#endif // QQMLSORTFILTERPROXYMODEL_H