From b7586ded8583f75edab227cf810a32b9a440cabc Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 21 Jul 2018 20:40:16 +0800 Subject: Mark Room::addTag() and Room::removeTag() as Q_INVOKABLE. --- lib/room.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/room.h b/lib/room.h index 7aa39eb5..622410f5 100644 --- a/lib/room.h +++ b/lib/room.h @@ -300,10 +300,10 @@ namespace QMatrixClient * of tags and the new set is sent to the server to update other * clients. */ - void addTag(const QString& name, const TagRecord& record = {}); + Q_INVOKABLE void addTag(const QString& name, const TagRecord& record = {}); /** Remove a tag from the room */ - void removeTag(const QString& name); + Q_INVOKABLE void removeTag(const QString& name); /** Overwrite the room's tags * This completely replaces the existing room's tags with a set -- cgit v1.2.3 From 287eccb4b7f88a52cd191ae208009335fca7e907 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 21 Jul 2018 21:37:21 +0800 Subject: Overload Room:addTag. --- lib/room.cpp | 5 +++++ lib/room.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/room.cpp b/lib/room.cpp index 01a88f89..4330cddc 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -684,6 +684,11 @@ void Room::addTag(const QString& name, const TagRecord& record) d->broadcastTagUpdates(); } +void Room::addTag(const QString &name, int order) +{ + addTag(name, TagRecord{order}); +} + void Room::removeTag(const QString& name) { if (!d->tags.contains(name)) diff --git a/lib/room.h b/lib/room.h index 622410f5..d148b9c7 100644 --- a/lib/room.h +++ b/lib/room.h @@ -300,7 +300,8 @@ namespace QMatrixClient * of tags and the new set is sent to the server to update other * clients. */ - Q_INVOKABLE void addTag(const QString& name, const TagRecord& record = {}); + void addTag(const QString& name, const TagRecord& record = {}); + Q_INVOKABLE void addTag(const QString& name, int order); /** Remove a tag from the room */ Q_INVOKABLE void removeTag(const QString& name); -- cgit v1.2.3 From 04d463a4347f54e66687a99fbc906923e50bcad1 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 22 Jul 2018 11:44:32 +0800 Subject: Change order data type. --- lib/room.cpp | 2 +- lib/room.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/room.cpp b/lib/room.cpp index 4330cddc..1668fdb7 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -684,7 +684,7 @@ void Room::addTag(const QString& name, const TagRecord& record) d->broadcastTagUpdates(); } -void Room::addTag(const QString &name, int order) +void Room::addTag(const QString& name, const QString& order) { addTag(name, TagRecord{order}); } diff --git a/lib/room.h b/lib/room.h index d148b9c7..e7f260dd 100644 --- a/lib/room.h +++ b/lib/room.h @@ -301,7 +301,7 @@ namespace QMatrixClient * clients. */ void addTag(const QString& name, const TagRecord& record = {}); - Q_INVOKABLE void addTag(const QString& name, int order); + Q_INVOKABLE void addTag(const QString& name, const QString& order); /** Remove a tag from the room */ Q_INVOKABLE void removeTag(const QString& name); -- cgit v1.2.3