aboutsummaryrefslogtreecommitdiff
path: root/avatar.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-12-31 08:53:32 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-12-31 08:53:32 +0900
commit0b5f0deb773f850d1b905fafc656f67f5b63de24 (patch)
treeb5e0ad5a4558a86d9c95a5d14cc3595e0fa2b5d8 /avatar.h
parentcbfe29b3435fbe47fee268facbe6a82000fce0ad (diff)
parent2c440249052b0d518fccd953a7dc657f9eed7ab7 (diff)
downloadlibquotient-0b5f0deb773f850d1b905fafc656f67f5b63de24.tar.gz
libquotient-0b5f0deb773f850d1b905fafc656f67f5b63de24.zip
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'avatar.h')
-rw-r--r--avatar.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/avatar.h b/avatar.h
index e71fecd7..d8b4b206 100644
--- a/avatar.h
+++ b/avatar.h
@@ -36,7 +36,8 @@ namespace QMatrixClient
using notifier_t = std::function<void()>;
- QPixmap get(int w, int h, notifier_t notifier);
+ QImage get(int dimension, notifier_t notifier);
+ QImage get(int w, int h, notifier_t notifier);
QUrl url() const;
bool updateUrl(const QUrl& newUrl);