diff --git a/libnymea-app/thingsproxy.cpp b/libnymea-app/thingsproxy.cpp index fdb424fc..cdcf9165 100644 --- a/libnymea-app/thingsproxy.cpp +++ b/libnymea-app/thingsproxy.cpp @@ -213,43 +213,67 @@ void ThingsProxy::setNameFilter(const QString &nameFilter) } } -QList 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 &shownThingClassIds) +void ThingsProxy::setShownThingClassIds(const QStringList &shownThingClassIds) { - if (m_shownThingClassIds != shownThingClassIds) { - m_shownThingClassIds = shownThingClassIds; + QList uuids; + foreach (const QString &str, shownThingClassIds) { + uuids << QUuid(str); + } + if (m_shownThingClassIds != uuids) { + m_shownThingClassIds = uuids; emit shownThingClassIdsChanged(); invalidateFilterInternal(); } } -QList 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 &hiddenThingClassIds) +void ThingsProxy::setHiddenThingClassIds(const QStringList &hiddenThingClassIds) { - if (m_hiddenThingClassIds != hiddenThingClassIds) { - m_hiddenThingClassIds = hiddenThingClassIds; + QList uuids; + foreach (const QString &str, hiddenThingClassIds) { + uuids << str; + } + if (m_hiddenThingClassIds != uuids) { + m_hiddenThingClassIds = uuids; emit hiddenThingClassIdsChanged(); invalidateFilterInternal(); } } -QList 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 &hiddenThingIds) +void ThingsProxy::setHiddenThingIds(const QStringList &hiddenThingIds) { - if (m_hiddenThingIds != hiddenThingIds) { - m_hiddenThingIds = hiddenThingIds; + QList uuids; + foreach (const QString &str, hiddenThingIds) { + uuids << str; + } + if (m_hiddenThingIds != uuids) { + m_hiddenThingIds = uuids; emit hiddenThingIdsChanged(); invalidateFilterInternal(); } diff --git a/libnymea-app/thingsproxy.h b/libnymea-app/thingsproxy.h index debb039e..5317f7d8 100644 --- a/libnymea-app/thingsproxy.h +++ b/libnymea-app/thingsproxy.h @@ -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 shownThingClassIds READ shownThingClassIds WRITE setShownThingClassIds NOTIFY shownThingClassIdsChanged) - Q_PROPERTY(QList hiddenThingClassIds READ hiddenThingClassIds WRITE setHiddenThingClassIds NOTIFY hiddenThingClassIdsChanged) - Q_PROPERTY(QList 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 shownThingClassIds() const; - void setShownThingClassIds(const QList &shownThingClassIds); + QStringList shownThingClassIds() const; + void setShownThingClassIds(const QStringList &shownThingClassIds); - QList hiddenThingClassIds() const; - void setHiddenThingClassIds(const QList &hiddenThingClassIds); + QStringList hiddenThingClassIds() const; + void setHiddenThingClassIds(const QStringList &hiddenThingClassIds); - QList hiddenThingIds() const; - void setHiddenThingIds(const QList &hiddenThingIds); + QStringList hiddenThingIds() const; + void setHiddenThingIds(const QStringList &hiddenThingIds); QString requiredEventName() const; void setRequiredEventName(const QString &requiredEventName);