status-im
/
SortFilterProxyModel
mirror of https://github.com/status-im/SortFilterProxyModel.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

clazy fixes 

- don't detach containers while iterating
- mixing const/non-const iterators
- const/qAsConst fixes
- QStringLiteral usage
- nullptr fixes
- don't #include whole Qt modules in .h files
This commit is contained in:
Lukáš Tinkl 2023-07-19 01:00:41 +02:00
parent 68b6377687
commit dd2947f19b
No known key found for this signature in database
GPG Key ID: 4ABB993B9382F296
21 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filters/expressionfilter.cpp
View File

@ -65,9 +65,9 @@ bool ExpressionFilter::filterRow(const QModelIndex& sourceIndex, const QQmlSortF
for (auto it = roles.cbegin(); it != roles.cend(); ++it)
addToContext(it.value(), proxyModel.sourceData(sourceIndex, it.key()));
addToContext("index", sourceIndex.row());
addToContext(QStringLiteral("index"), sourceIndex.row());
context.setContextProperty("model", modelMap);
context.setContextProperty(QStringLiteral("model"), modelMap);
QQmlExpression expression(m_scriptString, &context);
QVariant variantResult = expression.evaluate();
@ -101,12 +101,13 @@ void ExpressionFilter::updateContext(const QQmlSortFilterProxyModel& proxyModel)
modelMap.insert(name, value);
};
for (const QByteArray& roleName : proxyModel.roleNames().values())
const auto roleNames = proxyModel.roleNames();
for (const QByteArray& roleName : roleNames)
addToContext(roleName, QVariant());
addToContext("index", -1);
addToContext(QStringLiteral("index"), -1);
m_context->setContextProperty("model", modelMap);
m_context->setContextProperty(QStringLiteral("model"), modelMap);
updateExpression();
}
@ -116,7 +117,7 @@ void ExpressionFilter::updateExpression()
return;
delete m_expression;
m_expression = new QQmlExpression(m_scriptString, m_context, 0, this);
m_expression = new QQmlExpression(m_scriptString, m_context, nullptr, this);
connect(m_expression, &QQmlExpression::valueChanged, this, &ExpressionFilter::invalidate);
m_expression->setNotifyOnValueChanged(true);
m_expression->evaluate();

2
filters/filtercontainer.h
View File

@ -3,7 +3,7 @@
#include <QList>
#include <QQmlListProperty>
#include <qqml.h>
#include <QQmlEngine>
#include <QPointer>
namespace qqsfpm {

2
filters/filtercontainerfilter.cpp
View File

@ -4,7 +4,7 @@ namespace qqsfpm {
void FilterContainerFilter::proxyModelCompleted(const QQmlSortFilterProxyModel& proxyModel)
{
for (Filter* filter : m_filters)
for (Filter* filter : qAsConst(m_filters))
filter->proxyModelCompleted(proxyModel);
}

4
filters/filtersqmltypes.cpp
View File

@ -12,7 +12,7 @@
namespace qqsfpm {
void registerFiltersTypes() {
qmlRegisterUncreatableType<Filter>("SortFilterProxyModel", 0, 2, "Filter", "Filter is an abstract class");
qmlRegisterUncreatableType<Filter>("SortFilterProxyModel", 0, 2, "Filter", QStringLiteral("Filter is an abstract class"));
qmlRegisterType<ValueFilter>("SortFilterProxyModel", 0, 2, "ValueFilter");
qmlRegisterType<IndexFilter>("SortFilterProxyModel", 0, 2, "IndexFilter");
qmlRegisterType<RegExpFilter>("SortFilterProxyModel", 0, 2, "RegExpFilter");
@ -20,7 +20,7 @@ void registerFiltersTypes() {
qmlRegisterType<ExpressionFilter>("SortFilterProxyModel", 0, 2, "ExpressionFilter");
qmlRegisterType<AnyOfFilter>("SortFilterProxyModel", 0, 2, "AnyOf");
qmlRegisterType<AllOfFilter>("SortFilterProxyModel", 0, 2, "AllOf");
qmlRegisterUncreatableType<FilterContainerAttached>("SortFilterProxyModel", 0, 2, "FilterContainer", "FilterContainer can only be used as an attaching type");
qmlRegisterUncreatableType<FilterContainerAttached>("SortFilterProxyModel", 0, 2, "FilterContainer", QStringLiteral("FilterContainer can only be used as an attaching type"));
}
Q_COREAPP_STARTUP_FUNCTION(registerFiltersTypes)

4
filters/rangefilter.cpp
View File

@ -43,7 +43,7 @@ QVariant RangeFilter::minimumValue() const
return m_minimumValue;
}
void RangeFilter::setMinimumValue(QVariant minimumValue)
void RangeFilter::setMinimumValue(const QVariant &minimumValue)
{
if (m_minimumValue == minimumValue)
return;
@ -92,7 +92,7 @@ QVariant RangeFilter::maximumValue() const
return m_maximumValue;
}
void RangeFilter::setMaximumValue(QVariant maximumValue)
void RangeFilter::setMaximumValue(const QVariant &maximumValue)
{
if (m_maximumValue == maximumValue)
return;

4
filters/rangefilter.h
View File

@ -18,12 +18,12 @@ public:
using RoleFilter::RoleFilter;
QVariant minimumValue() const;
void setMinimumValue(QVariant minimumValue);
void setMinimumValue(const QVariant &minimumValue);
bool minimumInclusive() const;
void setMinimumInclusive(bool minimumInclusive);
QVariant maximumValue() const;
void setMaximumValue(QVariant maximumValue);
void setMaximumValue(const QVariant &maximumValue);
bool maximumInclusive() const;
void setMaximumInclusive(bool maximumInclusive);

2
filters/regexpfilter.h
View File

@ -19,7 +19,7 @@ public:
RegExp2 = QRegExp::RegExp2,
WildcardUnix = QRegExp::WildcardUnix,
W3CXmlSchema11 = QRegExp::W3CXmlSchema11 };
Q_ENUMS(PatternSyntax)
Q_ENUM(PatternSyntax)
using RoleFilter::RoleFilter;

15
proxyroles/expressionrole.cpp
View File

@ -76,9 +76,9 @@ QVariant ExpressionRole::data(const QModelIndex& sourceIndex, const QQmlSortFilt
for (auto it = roles.cbegin(); it != roles.cend(); ++it)
addToContext(it.value(), proxyModel.sourceData(sourceIndex, it.key()));
addToContext("index", sourceIndex.row());
addToContext(QStringLiteral("index"), sourceIndex.row());
context.setContextProperty("model", modelMap);
context.setContextProperty(QStringLiteral("model"), modelMap);
QQmlExpression expression(m_scriptString, &context);
QVariant result = expression.evaluate();
@ -89,7 +89,7 @@ QVariant ExpressionRole::data(const QModelIndex& sourceIndex, const QQmlSortFilt
}
return result;
}
return QVariant();
return {};
}
void ExpressionRole::updateContext(const QQmlSortFilterProxyModel& proxyModel)
@ -104,12 +104,13 @@ void ExpressionRole::updateContext(const QQmlSortFilterProxyModel& proxyModel)
modelMap.insert(name, value);
};
for (const QByteArray& roleName : proxyModel.roleNames().values())
const auto roleNames = proxyModel.roleNames();
for (const QByteArray& roleName : roleNames)
addToContext(roleName, QVariant());
addToContext("index", -1);
addToContext(QStringLiteral("index"), -1);
m_context->setContextProperty("model", modelMap);
m_context->setContextProperty(QStringLiteral("model"), modelMap);
updateExpression();
}
@ -119,7 +120,7 @@ void ExpressionRole::updateExpression()
return;
delete m_expression;
m_expression = new QQmlExpression(m_scriptString, m_context, 0, this);
m_expression = new QQmlExpression(m_scriptString, m_context, nullptr, this);
connect(m_expression, &QQmlExpression::valueChanged, this, &ExpressionRole::invalidate);
m_expression->setNotifyOnValueChanged(true);
m_expression->evaluate();

2
proxyroles/filterrole.cpp
View File

@ -55,7 +55,7 @@ void FilterRole::onFiltersCleared()
QVariant FilterRole::data(const QModelIndex& sourceIndex, const QQmlSortFilterProxyModel& proxyModel)
{
return std::all_of(m_filters.begin(), m_filters.end(),
return std::all_of(m_filters.cbegin(), m_filters.cend(),
[&] (Filter* filter) {
return filter->filterAcceptsRow(sourceIndex, proxyModel);
}

2
proxyroles/joinrole.cpp
View File

@ -71,7 +71,7 @@ QVariant JoinRole::data(const QModelIndex &sourceIndex, const QQmlSortFilterProx
{
QString result;
for (const QString& roleName : m_roleNames)
for (const QString& roleName : qAsConst(m_roleNames))
result += proxyModel.sourceData(sourceIndex, roleName).toString() + m_separator;
if (!m_roleNames.isEmpty())

2
proxyroles/joinrole.h
View File

@ -28,7 +28,7 @@ Q_SIGNALS:
private:
QStringList m_roleNames;
QVariant data(const QModelIndex& sourceIndex, const QQmlSortFilterProxyModel& proxyModel) override;
QString m_separator = " ";
QString m_separator = QStringLiteral(" ");
};
}

10
proxyroles/proxyrole.cpp
View File

@ -1,11 +1,4 @@
#include "proxyrole.h"
#include <QQmlEngine>
#include <QQmlContext>
#include <QQmlExpression>
#include <QCoreApplication>
#include <QDebug>
#include <QQmlInfo>
#include "filters/filter.h"
#include "qqmlsortfilterproxymodel.h"
namespace qqsfpm {
@ -28,9 +21,8 @@ QVariant ProxyRole::roleData(const QModelIndex& sourceIndex, const QQmlSortFilte
QVariant result = data(sourceIndex, proxyModel, name);
m_mutex.unlock();
return result;
} else {
return {};
}
return {};
}
void ProxyRole::proxyModelCompleted(const QQmlSortFilterProxyModel &proxyModel)

2
proxyroles/proxyrolesqmltypes.cpp
View File

@ -10,7 +10,7 @@
namespace qqsfpm {
void registerProxyRoleTypes() {
qmlRegisterUncreatableType<ProxyRole>("SortFilterProxyModel", 0, 2, "ProxyRole", "ProxyRole is an abstract class");
qmlRegisterUncreatableType<ProxyRole>("SortFilterProxyModel", 0, 2, "ProxyRole", QStringLiteral("ProxyRole is an abstract class"));
qmlRegisterType<JoinRole>("SortFilterProxyModel", 0, 2, "JoinRole");
qmlRegisterType<SwitchRole>("SortFilterProxyModel", 0, 2, "SwitchRole");
qmlRegisterType<ExpressionRole>("SortFilterProxyModel", 0, 2, "ExpressionRole");

6
proxyroles/switchrole.cpp
View File

@ -50,7 +50,7 @@ QVariant SwitchRoleAttached::value() const
return m_value;
}
void SwitchRoleAttached::setValue(QVariant value)
void SwitchRoleAttached::setValue(const QVariant &value)
{
if (m_value == value)
return;
@ -113,7 +113,7 @@ void SwitchRole::setDefaultValue(const QVariant& defaultValue)
void SwitchRole::proxyModelCompleted(const QQmlSortFilterProxyModel& proxyModel)
{
for (Filter* filter : m_filters)
for (Filter* filter : qAsConst(m_filters))
filter->proxyModelCompleted(proxyModel);
}
@ -124,7 +124,7 @@ SwitchRoleAttached* SwitchRole::qmlAttachedProperties(QObject* object)
QVariant SwitchRole::data(const QModelIndex &sourceIndex, const QQmlSortFilterProxyModel &proxyModel)
{
for (auto filter: m_filters) {
for (auto filter: qAsConst(m_filters)) {
if (!filter->enabled())
continue;
if (filter->filterAcceptsRow(sourceIndex, proxyModel)) {

3
proxyroles/switchrole.h
View File

@ -3,7 +3,6 @@
#include "singlerole.h"
#include "filters/filtercontainer.h"
#include <QtQml>
namespace qqsfpm {
@ -15,7 +14,7 @@ public:
SwitchRoleAttached(QObject* parent);
QVariant value() const;
void setValue(QVariant value);
void setValue(const QVariant &value);
Q_SIGNALS:
void valueChanged();

4
qqmlsortfilterproxymodel.cpp
View File

@ -230,8 +230,8 @@ QVariant QQmlSortFilterProxyModel::sourceData(const QModelIndex &sourceIndex, in
QPair<ProxyRole*, QString> proxyRolePair = m_proxyRoleMap[role];
if (ProxyRole* proxyRole = proxyRolePair.first)
return proxyRole->roleData(sourceIndex, *this, proxyRolePair.second);
else
return sourceModel()->data(sourceIndex, role);
return sourceModel()->data(sourceIndex, role);
}
QVariant QQmlSortFilterProxyModel::data(const QModelIndex &index, int role) const

2
qqmlsortfilterproxymodel.h
View File

@ -44,7 +44,7 @@ public:
RegExp2 = QRegExp::RegExp2,
WildcardUnix = QRegExp::WildcardUnix,
W3CXmlSchema11 = QRegExp::W3CXmlSchema11 };
Q_ENUMS(PatternSyntax)
Q_ENUM(PatternSyntax)
QQmlSortFilterProxyModel(QObject* parent = 0);

29
sorters/expressionsorter.cpp
View File

@ -92,20 +92,20 @@ int ExpressionSorter::compare(const QModelIndex& sourceLeft, const QModelIndex&
modelLeftMap.insert(it.value(), proxyModel.sourceData(sourceLeft, it.key()));
modelRightMap.insert(it.value(), proxyModel.sourceData(sourceRight, it.key()));
}
modelLeftMap.insert("index", sourceLeft.row());
modelRightMap.insert("index", sourceRight.row());
modelLeftMap.insert(QStringLiteral("index"), sourceLeft.row());
modelRightMap.insert(QStringLiteral("index"), sourceRight.row());
QQmlExpression expression(m_scriptString, &context);
context.setContextProperty("modelLeft", modelLeftMap);
context.setContextProperty("modelRight", modelRightMap);
context.setContextProperty(QStringLiteral("modelLeft"), modelLeftMap);
context.setContextProperty(QStringLiteral("modelRight"), modelRightMap);
if (evaluateBoolExpression(expression))
return -1;
return -1;
context.setContextProperty("modelLeft", modelRightMap);
context.setContextProperty("modelRight", modelLeftMap);
context.setContextProperty(QStringLiteral("modelLeft"), modelRightMap);
context.setContextProperty(QStringLiteral("modelRight"), modelLeftMap);
if (evaluateBoolExpression(expression))
return 1;
return 1;
}
return 0;
}
@ -118,15 +118,16 @@ void ExpressionSorter::updateContext(const QQmlSortFilterProxyModel& proxyModel)
QVariantMap modelLeftMap, modelRightMap;
// what about roles changes ?
for (const QByteArray& roleName : proxyModel.roleNames().values()) {
const auto roleNames = proxyModel.roleNames();
for (const QByteArray& roleName : roleNames) {
modelLeftMap.insert(roleName, QVariant());
modelRightMap.insert(roleName, QVariant());
}
modelLeftMap.insert("index", -1);
modelRightMap.insert("index", -1);
modelLeftMap.insert(QStringLiteral("index"), -1);
modelRightMap.insert(QStringLiteral("index"), -1);
m_context->setContextProperty("modelLeft", modelLeftMap);
m_context->setContextProperty("modelRight", modelRightMap);
m_context->setContextProperty(QStringLiteral("modelLeft"), modelLeftMap);
m_context->setContextProperty(QStringLiteral("modelRight"), modelRightMap);
updateExpression();
}
@ -137,7 +138,7 @@ void ExpressionSorter::updateExpression()
return;
delete m_expression;
m_expression = new QQmlExpression(m_scriptString, m_context, 0, this);
m_expression = new QQmlExpression(m_scriptString, m_context, nullptr, this);
connect(m_expression, &QQmlExpression::valueChanged, this, &ExpressionSorter::invalidate);
m_expression->setNotifyOnValueChanged(true);
m_expression->evaluate();

2
sorters/filtersorter.cpp
View File

@ -48,7 +48,7 @@ int FilterSorter::compare(const QModelIndex& sourceLeft, const QModelIndex& sour
void FilterSorter::proxyModelCompleted(const QQmlSortFilterProxyModel& proxyModel)
{
for (Filter* filter : m_filters)
for (Filter* filter : qAsConst(m_filters))
filter->proxyModelCompleted(proxyModel);
}

2
sorters/sortercontainer.h
View File

@ -3,7 +3,7 @@
#include <QList>
#include <QQmlListProperty>
#include <qqml.h>
#include <QQmlEngine>
#include <QPointer>
namespace qqsfpm {

4
sorters/sortersqmltypes.cpp
View File

@ -10,12 +10,12 @@
namespace qqsfpm {
void registerSorterTypes() {
qmlRegisterUncreatableType<Sorter>("SortFilterProxyModel", 0, 2, "Sorter", "Sorter is an abstract class");
qmlRegisterUncreatableType<Sorter>("SortFilterProxyModel", 0, 2, "Sorter", QStringLiteral("Sorter is an abstract class"));
qmlRegisterType<RoleSorter>("SortFilterProxyModel", 0, 2, "RoleSorter");
qmlRegisterType<StringSorter>("SortFilterProxyModel", 0, 2, "StringSorter");
qmlRegisterType<FilterSorter>("SortFilterProxyModel", 0, 2, "FilterSorter");
qmlRegisterType<ExpressionSorter>("SortFilterProxyModel", 0, 2, "ExpressionSorter");
qmlRegisterUncreatableType<SorterContainerAttached>("SortFilterProxyModel", 0, 2, "SorterContainer", "SorterContainer can only be used as an attaching type");
qmlRegisterUncreatableType<SorterContainerAttached>("SortFilterProxyModel", 0, 2, "SorterContainer", QStringLiteral("SorterContainer can only be used as an attaching type"));
}
Q_COREAPP_STARTUP_FUNCTION(registerSorterTypes)