ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backwardport shownThingClassIds filter in ThingsProxy to Qt <= 5.12

Browse Source
This commit is contained in:
Michael Zanetti 2021-12-17 12:25:45 +01:00
parent 9fcdbafda4
commit 578b6c8209
2 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libnymea-app/thingsproxy.cpp
View File

@ -213,43 +213,67 @@ void ThingsProxy::setNameFilter(const QString &nameFilter)
}
}
QList<QUuid> ThingsProxy::shownThingClassIds() const
QStringList ThingsProxy::shownThingClassIds() const
{
return m_shownThingClassIds;
QStringList ret;
foreach (const QUuid &id, m_shownThingClassIds) {
ret << id.toString();
}
return ret;
}
void ThingsProxy::setShownThingClassIds(const QList<QUuid> &shownThingClassIds)
void ThingsProxy::setShownThingClassIds(const QStringList &shownThingClassIds)
{
if (m_shownThingClassIds != shownThingClassIds) {
m_shownThingClassIds = shownThingClassIds;
QList<QUuid> uuids;
foreach (const QString &str, shownThingClassIds) {
uuids << QUuid(str);
}
if (m_shownThingClassIds != uuids) {
m_shownThingClassIds = uuids;
emit shownThingClassIdsChanged();
invalidateFilterInternal();
}
}
QList<QUuid> ThingsProxy::hiddenThingClassIds() const
QStringList ThingsProxy::hiddenThingClassIds() const
{
return m_hiddenThingClassIds;
QStringList ret;
foreach (const QUuid &uuid, m_hiddenThingClassIds) {
ret << uuid.toString();
}
return ret;
}
void ThingsProxy::setHiddenThingClassIds(const QList<QUuid> &hiddenThingClassIds)
void ThingsProxy::setHiddenThingClassIds(const QStringList &hiddenThingClassIds)
{
if (m_hiddenThingClassIds != hiddenThingClassIds) {
m_hiddenThingClassIds = hiddenThingClassIds;
QList<QUuid> uuids;
foreach (const QString &str, hiddenThingClassIds) {
uuids << str;
}
if (m_hiddenThingClassIds != uuids) {
m_hiddenThingClassIds = uuids;
emit hiddenThingClassIdsChanged();
invalidateFilterInternal();
}
}
QList<QUuid> ThingsProxy::hiddenThingIds() const
QStringList ThingsProxy::hiddenThingIds() const
{
return m_hiddenThingIds;
QStringList ret;
foreach (const QUuid &uuid, m_hiddenThingIds) {
ret << uuid.toString();
}
return ret;
}
void ThingsProxy::setHiddenThingIds(const QList<QUuid> &hiddenThingIds)
void ThingsProxy::setHiddenThingIds(const QStringList &hiddenThingIds)
{
if (m_hiddenThingIds != hiddenThingIds) {
m_hiddenThingIds = hiddenThingIds;
QList<QUuid> uuids;
foreach (const QString &str, hiddenThingIds) {
uuids << str;
}
if (m_hiddenThingIds != uuids) {
m_hiddenThingIds = uuids;
emit hiddenThingIdsChanged();
invalidateFilterInternal();
}

18
libnymea-app/thingsproxy.h
View File

@ -54,9 +54,9 @@ class ThingsProxy : public QSortFilterProxyModel
Q_PROPERTY(QStringList hiddenInterfaces READ hiddenInterfaces WRITE setHiddenInterfaces NOTIFY hiddenInterfacesChanged)
Q_PROPERTY(QString nameFilter READ nameFilter WRITE setNameFilter NOTIFY nameFilterChanged)
Q_PROPERTY(QList<QUuid> shownThingClassIds READ shownThingClassIds WRITE setShownThingClassIds NOTIFY shownThingClassIdsChanged)
Q_PROPERTY(QList<QUuid> hiddenThingClassIds READ hiddenThingClassIds WRITE setHiddenThingClassIds NOTIFY hiddenThingClassIdsChanged)
Q_PROPERTY(QList<QUuid> hiddenThingIds READ hiddenThingIds WRITE setHiddenThingIds NOTIFY hiddenThingIdsChanged)
Q_PROPERTY(QStringList shownThingClassIds READ shownThingClassIds WRITE setShownThingClassIds NOTIFY shownThingClassIdsChanged)
Q_PROPERTY(QStringList hiddenThingClassIds READ hiddenThingClassIds WRITE setHiddenThingClassIds NOTIFY hiddenThingClassIdsChanged)
Q_PROPERTY(QStringList hiddenThingIds READ hiddenThingIds WRITE setHiddenThingIds NOTIFY hiddenThingIdsChanged)
Q_PROPERTY(QString requiredEventName READ requiredEventName WRITE setRequiredEventName NOTIFY requiredEventNameChanged)
Q_PROPERTY(QString requiredStateName READ requiredStateName WRITE setRequiredStateName NOTIFY requiredStateNameChanged)
@ -122,14 +122,14 @@ public:
QString nameFilter() const;
void setNameFilter(const QString &nameFilter);
QList<QUuid> shownThingClassIds() const;
void setShownThingClassIds(const QList<QUuid> &shownThingClassIds);
QStringList shownThingClassIds() const;
void setShownThingClassIds(const QStringList &shownThingClassIds);
QList<QUuid> hiddenThingClassIds() const;
void setHiddenThingClassIds(const QList<QUuid> &hiddenThingClassIds);
QStringList hiddenThingClassIds() const;
void setHiddenThingClassIds(const QStringList &hiddenThingClassIds);
QList<QUuid> hiddenThingIds() const;
void setHiddenThingIds(const QList<QUuid> &hiddenThingIds);
QStringList hiddenThingIds() const;
void setHiddenThingIds(const QStringList &hiddenThingIds);
QString requiredEventName() const;
void setRequiredEventName(const QString &requiredEventName);