diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-01 00:02:24 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-01 00:02:24 +0900 |
commit | b469f1c9ab7603a297b1c0082d804312cabbd550 (patch) | |
tree | 0af150a0180b12d9a74fb40c96ef9a184508039f /user.h | |
parent | 715ebcfc5c33ff83cc8f185b6e14cfbba01c637b (diff) | |
parent | ae59271da3a199eb936aa709893ef592cd51f172 (diff) | |
download | libquotient-b469f1c9ab7603a297b1c0082d804312cabbd550.tar.gz libquotient-b469f1c9ab7603a297b1c0082d804312cabbd550.zip |
Merge branch 'master' into kitsune-apigen
Diffstat (limited to 'user.h')
-rw-r--r-- | user.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -53,7 +53,8 @@ namespace QMatrixClient Q_INVOKABLE QString bridged() const; QPixmap avatar(int requestedWidth, int requestedHeight); - QPixmap croppedAvatar(int requestedWidth, int requestedHeight); + + const QUrl& avatarUrl() const; void processEvent(Event* event); |