From 21cef78720c97244ef5ebfb1e7d44b96d3370426 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 10 Mar 2015 11:52:45 +0100 Subject: [PATCH] Modify SortFilterProxyModel to be compliant with Coding Standards --- mix/sortfilterproxymodel.cpp | 90 +++++++++--------------------------- mix/sortfilterproxymodel.h | 35 ++++++-------- 2 files changed, 37 insertions(+), 88 deletions(-) diff --git a/mix/sortfilterproxymodel.cpp b/mix/sortfilterproxymodel.cpp index 04e403738..62d85cfa3 100644 --- a/mix/sortfilterproxymodel.cpp +++ b/mix/sortfilterproxymodel.cpp @@ -44,7 +44,7 @@ using namespace dev::mix; -SortFilterProxyModel::SortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) +SortFilterProxyModel::SortFilterProxyModel(QObject* _parent) : QSortFilterProxyModel(_parent) { connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(countChanged())); connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(countChanged())); @@ -55,14 +55,14 @@ int SortFilterProxyModel::count() const return rowCount(); } -QObject *SortFilterProxyModel::source() const +QObject* SortFilterProxyModel::source() const { return sourceModel(); } -void SortFilterProxyModel::setSource(QObject *source) +void SortFilterProxyModel::setSource(QObject* _source) { - setSourceModel(qobject_cast(source)); + setSourceModel(qobject_cast(_source)); } QByteArray SortFilterProxyModel::sortRole() const @@ -70,34 +70,24 @@ QByteArray SortFilterProxyModel::sortRole() const return roleNames().value(QSortFilterProxyModel::sortRole()); } -void SortFilterProxyModel::setSortRole(const QByteArray &role) +void SortFilterProxyModel::setSortRole(QByteArray const& _role) { - QSortFilterProxyModel::setSortRole(roleKey(role)); + QSortFilterProxyModel::setSortRole(roleKey(_role)); } -void SortFilterProxyModel::setSortOrder(Qt::SortOrder order) +void SortFilterProxyModel::setSortOrder(Qt::SortOrder _order) { - QSortFilterProxyModel::sort(0, order); + QSortFilterProxyModel::sort(0, _order); } -/*QByteArray SortFilterProxyModel::filterRole() const -{ - return roleNames().value(QSortFilterProxyModel::filterRole()); -}*/ - -/*void SortFilterProxyModel::setFilterRole(const QByteArray &role) -{ - QSortFilterProxyModel::setFilterRole(roleKey(role)); -}*/ - QString SortFilterProxyModel::filterString() const { return filterRegExp().pattern(); } -void SortFilterProxyModel::setFilterString(const QString &filter) +void SortFilterProxyModel::setFilterString(QString const& _filter) { - setFilterRegExp(QRegExp(filter, filterCaseSensitivity(), static_cast(filterSyntax()))); + setFilterRegExp(QRegExp(_filter, filterCaseSensitivity(), static_cast(filterSyntax()))); } SortFilterProxyModel::FilterSyntax SortFilterProxyModel::filterSyntax() const @@ -105,33 +95,33 @@ SortFilterProxyModel::FilterSyntax SortFilterProxyModel::filterSyntax() const return static_cast(filterRegExp().patternSyntax()); } -void SortFilterProxyModel::setFilterSyntax(SortFilterProxyModel::FilterSyntax syntax) +void SortFilterProxyModel::setFilterSyntax(SortFilterProxyModel::FilterSyntax _syntax) { - setFilterRegExp(QRegExp(filterString(), filterCaseSensitivity(), static_cast(syntax))); + setFilterRegExp(QRegExp(filterString(), filterCaseSensitivity(), static_cast(_syntax))); } -QJSValue SortFilterProxyModel::get(int idx) const +QJSValue SortFilterProxyModel::get(int _idx) const { QJSEngine *engine = qmlEngine(this); QJSValue value = engine->newObject(); - if (idx >= 0 && idx < count()) { + if (_idx >= 0 && _idx < count()) { QHash roles = roleNames(); QHashIterator it(roles); while (it.hasNext()) { it.next(); - value.setProperty(QString::fromUtf8(it.value()), data(index(idx, 0), it.key()).toString()); + value.setProperty(QString::fromUtf8(it.value()), data(index(_idx, 0), it.key()).toString()); } } return value; } -int SortFilterProxyModel::roleKey(const QByteArray &role) const +int SortFilterProxyModel::roleKey(QByteArray const& _role) const { QHash roles = roleNames(); QHashIterator it(roles); while (it.hasNext()) { it.next(); - if (it.value() == role) + if (it.value() == _role) return it.key(); } return -1; @@ -139,62 +129,26 @@ int SortFilterProxyModel::roleKey(const QByteArray &role) const QHash SortFilterProxyModel::roleNames() const { - if (QAbstractItemModel *source = sourceModel()) + if (QAbstractItemModel* source = sourceModel()) return source->roleNames(); return QHash(); } -bool SortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const +bool SortFilterProxyModel::filterAcceptsRow(int _sourceRow, QModelIndex const& _sourceParent) const { - /*QRegExp rx = filterRegExp(); - if (rx.isEmpty()) - return true; - QAbstractItemModel *model = sourceModel(); - - if (filterRole().isEmpty()) { - QHash roles = roleNames(); - QHashIterator it(roles); - while (it.hasNext()) { - it.next(); - QModelIndex sourceIndex = model->index(sourceRow, 0, sourceParent); - QString key = model->data(sourceIndex, it.key()).toString(); - if (key.contains(rx))data - return true; - } - return false; - }*/ QRegExp rx = filterRegExp(); QAbstractItemModel *model = sourceModel(); - QModelIndex sourceIndex = model->index(sourceRow, 0, sourceParent); + QModelIndex sourceIndex = model->index(_sourceRow, 0, _sourceParent); if (!sourceIndex.isValid()) return true; QString keyType = model->data(sourceIndex, roleKey(type.toUtf8())).toString(); QString keyContent = model->data(sourceIndex, roleKey(content.toUtf8())).toString(); - return keyType.contains(m_filterType) && keyContent.contains(m_filterContent); -/* - for (auto filter: filterRoles()) - { - QString key = model->data(sourceIndex, roleKey(filter.toUtf8())).toString(); - if (!key.contains(rx)) - return false; - } - return true; - QModelIndex sourceIndex = model->index(sourceRow, 0, sourceParent); - if (!sourceIndex.isValid()) - return true; - for (auto role: filterR) - { - QString key = model->data(sourceIndex, roleKey(role)).toString(); - if (key.contains(rx)) - return true; - } - return false;*/ } -void SortFilterProxyModel::setFilterType(const QString &_type) +void SortFilterProxyModel::setFilterType(QString const& _type) { m_filterType = QRegExp(_type, filterCaseSensitivity(), static_cast(filterSyntax())); setFilterRegExp(_type); @@ -205,7 +159,7 @@ QString SortFilterProxyModel::filterType() const return m_filterType.pattern(); } -void SortFilterProxyModel::setFilterContent(const QString &_content) +void SortFilterProxyModel::setFilterContent(QString const& _content) { m_filterContent = QRegExp(_content, filterCaseSensitivity(), static_cast(filterSyntax())); setFilterRegExp(_content); diff --git a/mix/sortfilterproxymodel.h b/mix/sortfilterproxymodel.h index 8eae97a68..bc220a911 100644 --- a/mix/sortfilterproxymodel.h +++ b/mix/sortfilterproxymodel.h @@ -38,8 +38,7 @@ ** ****************************************************************************/ -#ifndef SORTFILTERPROXYMODEL_H -#define SORTFILTERPROXYMODEL_H +#pragma once #include #include @@ -49,11 +48,11 @@ namespace dev namespace mix { -class SortFilterProxyModel : public QSortFilterProxyModel +class SortFilterProxyModel: public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) - Q_PROPERTY(QObject *source READ source WRITE setSource) + Q_PROPERTY(QObject* source READ source WRITE setSource) Q_PROPERTY(QByteArray sortRole READ sortRole WRITE setSortRole) Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder) @@ -66,26 +65,23 @@ class SortFilterProxyModel : public QSortFilterProxyModel Q_ENUMS(FilterSyntax) public: - explicit SortFilterProxyModel(QObject *parent = 0); + explicit SortFilterProxyModel(QObject* _parent = 0); - QObject *source() const; - void setSource(QObject *source); + QObject* source() const; + void setSource(QObject* _source); QByteArray sortRole() const; - void setSortRole(const QByteArray &role); + void setSortRole(QByteArray const& _role); - void setSortOrder(Qt::SortOrder order); + void setSortOrder(Qt::SortOrder _order); QString filterContent() const; - void setFilterContent(const QString &_content); + void setFilterContent(QString const& _content); QString filterType() const; - void setFilterType(const QString &_type); + void setFilterType(QString const& _type); - /*QStringList filterRoles() const; - void setFilterRoles(const QStringList &roles); -*/ QString filterString() const; - void setFilterString(const QString &filter); + void setFilterString(QString const& _filter); enum FilterSyntax { RegExp, @@ -94,18 +90,18 @@ public: }; FilterSyntax filterSyntax() const; - void setFilterSyntax(FilterSyntax syntax); + void setFilterSyntax(FilterSyntax _syntax); int count() const; - Q_INVOKABLE QJSValue get(int index) const; + Q_INVOKABLE QJSValue get(int _index) const; signals: void countChanged(); protected: - int roleKey(const QByteArray &role) const; + int roleKey(QByteArray const& _role) const; QHash roleNames() const; - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + bool filterAcceptsRow(int _sourceRow, QModelIndex const& _sourceParent) const; private: QRegExp m_filterType; @@ -116,4 +112,3 @@ private: } } -#endif // SORTFILTERPROXYMODEL_H