diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-01-05 19:59:48 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-01-05 21:01:37 +0900 |
| commit | e3578b3cc6b978db1c04a1f684e1a03676c33f3b (patch) | |
| tree | 69191451c891f408a98159081e97a518a11d023c | |
| parent | fb46c2d2a6e53557452837c2690f32a56387fcac (diff) | |
| download | libquotient-e3578b3cc6b978db1c04a1f684e1a03676c33f3b.tar.gz libquotient-e3578b3cc6b978db1c04a1f684e1a03676c33f3b.zip | |
EventContent::ImageInfo: support originalFilename in POD constructor
It's not mandated by the spec for anything except m.file but hey it's
convenient.
| -rw-r--r-- | lib/events/eventcontent.cpp | 4 | ||||
| -rw-r--r-- | lib/events/eventcontent.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp index 03880885..9a5e872c 100644 --- a/lib/events/eventcontent.cpp +++ b/lib/events/eventcontent.cpp @@ -60,8 +60,8 @@ void FileInfo::fillInfoJson(QJsonObject* infoJson) const } ImageInfo::ImageInfo(const QUrl& u, qint64 fileSize, QMimeType mimeType, - const QSize& imageSize) - : FileInfo(u, fileSize, mimeType), imageSize(imageSize) + const QSize& imageSize, const QString& originalFilename) + : FileInfo(u, fileSize, mimeType, originalFilename), imageSize(imageSize) { } ImageInfo::ImageInfo(const QUrl& u, const QJsonObject& infoJson, diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h index 2e61276b..0588c0e2 100644 --- a/lib/events/eventcontent.h +++ b/lib/events/eventcontent.h @@ -129,7 +129,8 @@ namespace QMatrixClient public: explicit ImageInfo(const QUrl& u, qint64 fileSize = -1, QMimeType mimeType = {}, - const QSize& imageSize = {}); + const QSize& imageSize = {}, + const QString& originalFilename = {}); ImageInfo(const QUrl& u, const QJsonObject& infoJson, const QString& originalFilename = {}); |