diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-09-19 18:08:57 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-09-19 18:08:57 +0900 |
commit | 35ef29ead1da906e4978dcd908e7c1513ac9bfd3 (patch) | |
tree | 0e784f13ec837b9dd6f40e07423e0a3eb8012256 /room.h | |
parent | c5c26ff4a09eecaa6d8e1507087566ccf0fd96b4 (diff) | |
parent | 0b11b06379fe668063ea5658a261f53f1dcf117a (diff) | |
download | libquotient-35ef29ead1da906e4978dcd908e7c1513ac9bfd3.tar.gz libquotient-35ef29ead1da906e4978dcd908e7c1513ac9bfd3.zip |
Merge branch 'master' into cache-state-to-json
Diffstat (limited to 'room.h')
-rw-r--r-- | room.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -64,7 +64,8 @@ namespace QMatrixClient class Room: public QObject { Q_OBJECT - Q_PROPERTY(const Connection* connection READ connection CONSTANT) + Q_PROPERTY(Connection* connection READ connection CONSTANT) + Q_PROPERTY(User* localUser READ localUser CONSTANT) Q_PROPERTY(QString id READ id CONSTANT) Q_PROPERTY(QString name READ name NOTIFY namesChanged) Q_PROPERTY(QStringList aliases READ aliases NOTIFY namesChanged) @@ -80,6 +81,7 @@ namespace QMatrixClient virtual ~Room(); Connection* connection() const; + User* localUser() const; QString id() const; QString name() const; QStringList aliases() const; @@ -92,6 +94,7 @@ namespace QMatrixClient Q_INVOKABLE QList<User*> users() const; Q_INVOKABLE QStringList memberNames() const; + Q_INVOKABLE int memberCount() const; /** * @brief Produces a disambiguated name for a given user in |