Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 28 insertions, 20 deletions

diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index a43d3a85..c2100eaa 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -13,29 +13,37 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include "stateevent.h"
 #include "eventcontent.h"
+#include "stateevent.h"
+
+namespace Quotient {
+class RoomAvatarEvent : public StateEvent<EventContent::ImageContent> {
+    // It's a bit of an overkill to use a full-fledged ImageContent
+    // because in reality m.room.avatar usually only has a single URL,
+    // without a thumbnail. But The Spec says there be thumbnails, and
+    // we follow The Spec.
+public:
+    DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
+    explicit RoomAvatarEvent(const QJsonObject& obj) : StateEvent(typeId(), obj)
+    {}
+    explicit RoomAvatarEvent(const EventContent::ImageContent& avatar)
+        : StateEvent(typeId(), matrixTypeId(), QString(), avatar)
+    {}
+    // A replica of EventContent::ImageInfo constructor
+    explicit RoomAvatarEvent(const QUrl& u, qint64 fileSize = -1,
+                             QMimeType mimeType = {},
+                             const QSize& imageSize = {},
+                             const QString& originalFilename = {})
+        : RoomAvatarEvent(EventContent::ImageContent {
+            u, fileSize, mimeType, imageSize, originalFilename })
+    {}
 
-namespace QMatrixClient
-{
-    class RoomAvatarEvent: public StateEvent<EventContent::ImageContent>
-    {
-            // It's a bit of an overkill to use a full-fledged ImageContent
-            // because in reality m.room.avatar usually only has a single URL,
-            // without a thumbnail. But The Spec says there be thumbnails, and
-            // we follow The Spec.
-        public:
-            DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
-            explicit RoomAvatarEvent(const QJsonObject& obj)
-                : StateEvent(typeId(), obj)
-            { }
-            QUrl url() const { return content().url; }
-    };
-    REGISTER_EVENT_TYPE(RoomAvatarEvent)
-    DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
-}  // namespace QMatrixClient
+    QUrl url() const { return content().url; }
+};
+REGISTER_EVENT_TYPE(RoomAvatarEvent)
+} // namespace Quotient