aboutsummaryrefslogtreecommitdiff
path: root/avatar.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-12-28 11:26:59 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-12-28 11:26:59 +0900
commita3b9fe1ddd2d3b0a0cbb07ffc42317b30a1a3899 (patch)
tree206628e68b5f19db48b6bcc03cbaa00ae151fc29 /avatar.h
parent1dce783c4ac9ca37343648114885d332bdfe7fa1 (diff)
downloadlibquotient-a3b9fe1ddd2d3b0a0cbb07ffc42317b30a1a3899.tar.gz
libquotient-a3b9fe1ddd2d3b0a0cbb07ffc42317b30a1a3899.zip
Switch from QPixmap to QImage; add convenience avatar() overloads to Room and User
The switch is necessary because MediaThumbnailJob is supposed to return something that can be worked on in non-GUI threads (as is the case of QML image providers), and QPixmap is not supposed for usage out of the main thread.
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);