diff options
| author | Felix Rohrbach <fxrh@gmx.de> | 2016-10-14 16:58:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 16:58:06 +0200 |
| commit | 6536124821c1df791a69a58de21a71322d9363f6 (patch) | |
| tree | 712be9dc1f146105c5569dfac65367381f260793 /connection.h | |
| parent | 45f38a1d6687d1ceaca87a6d6d94ac2515debb02 (diff) | |
| parent | 24deeda0fe95fd352b823b48a3bc2e660f6a261d (diff) | |
| download | libquotient-6536124821c1df791a69a58de21a71322d9363f6.tar.gz libquotient-6536124821c1df791a69a58de21a71322d9363f6.zip | |
Merge pull request #42 from Fxrh/kitsune-use-qsize
MediaThumbnailJob: Use QSize instead of two separate int's for size
Diffstat (limited to 'connection.h')
| -rw-r--r-- | connection.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/connection.h b/connection.h index fed0b1c4..c5dad246 100644 --- a/connection.h +++ b/connection.h @@ -58,7 +58,8 @@ namespace QMatrixClient Q_INVOKABLE virtual void joinRoom( QString roomAlias ); Q_INVOKABLE virtual void leaveRoom( Room* room ); Q_INVOKABLE virtual RoomMessagesJob* getMessages( Room* room, QString from ); - virtual MediaThumbnailJob* getThumbnail( QUrl url, int requestedWidth, int requestedHeight ); + virtual MediaThumbnailJob* getThumbnail( QUrl url, QSize requestedSize ); + MediaThumbnailJob* getThumbnail( QUrl url, int requestedWidth, int requestedHeight ); Q_INVOKABLE QUrl homeserver() const; Q_INVOKABLE User* user(QString userId); |