From 2fb03272a8bc7da4943347ea7ecca6070f667bd6 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 26 Oct 2017 19:40:59 +0300
Subject: Move out common message event content classes

ImageContent is usable outside of m.room.message (in particular, m.room.avatar
uses the same structure for content. And EventContent::Base is very suitable to
derive from even for standard event content structures (such as in room name
events), let alone non-standard ones.
Also, renamed MessageEventContent to EventContent (for obvious reasons).
---
 events/eventcontent.cpp | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 events/eventcontent.cpp

(limited to 'events/eventcontent.cpp')

diff --git a/events/eventcontent.cpp b/events/eventcontent.cpp
new file mode 100644
index 00000000..205d404b
--- /dev/null
+++ b/events/eventcontent.cpp
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#include "eventcontent.h"
+
+#include <QtCore/QUrl>
+#include <QtCore/QMimeDatabase>
+
+using namespace QMatrixClient::EventContent;
+
+QJsonObject Base::toJson() const
+{
+    QJsonObject o;
+    fillJson(&o);
+    return o;
+}
+
+QJsonObject InfoBase::toInfoJson() const
+{
+    QJsonObject info;
+    fillInfoJson(&info);
+    return info;
+}
+
+FileInfo::FileInfo(const QUrl& u, int payloadSize, const QMimeType& mimeType,
+                   const QString& originalFilename)
+    : InfoBase(mimeType), url(u), payloadSize(payloadSize)
+    , originalName(originalFilename)
+{ }
+
+FileInfo::FileInfo(const QUrl& u, const QJsonObject& infoJson,
+                   const QString& originalFilename)
+    : FileInfo(u, infoJson["size"].toInt(),
+               QMimeDatabase().mimeTypeForName(infoJson["mimetype"].toString()),
+               originalFilename)
+{
+    if (!mimeType.isValid())
+        mimeType = QMimeDatabase().mimeTypeForData(QByteArray());
+}
+
+void FileInfo::fillInfoJson(QJsonObject* infoJson) const
+{
+    Q_ASSERT(infoJson);
+    infoJson->insert("size", payloadSize);
+    infoJson->insert("mimetype", mimeType.name());
+}
+
+void FileInfo::fillJson(QJsonObject* json) const
+{
+    Q_ASSERT(json);
+    json->insert("url", url.toString());
+    if (!originalName.isEmpty())
+        json->insert("filename", originalName);
+    json->insert("info", toInfoJson());
+}
+
-- 
cgit v1.2.3


From da8bb556dca628e20be732b4a30895010abcc9bf Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 31 Oct 2017 13:12:33 +0300
Subject: Streamline EventContent hierarchy

Two changes to make EventContent hierarchy easier to understand and use:
- InfoBase is unbound from Base, and downstream classes use multiple inheritance
to work "info" objects
- MIME types are separated from Base into a separate TypedBase class because
MIME typing is not common to all content kinds.
---
 events/eventcontent.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'events/eventcontent.cpp')

diff --git a/events/eventcontent.cpp b/events/eventcontent.cpp
index 205d404b..dcbccf08 100644
--- a/events/eventcontent.cpp
+++ b/events/eventcontent.cpp
@@ -37,6 +37,8 @@ QJsonObject InfoBase::toInfoJson() const
     return info;
 }
 
+void InfoBase::fillInfoJson(QJsonObject*) const { }
+
 FileInfo::FileInfo(const QUrl& u, int payloadSize, const QMimeType& mimeType,
                    const QString& originalFilename)
     : InfoBase(mimeType), url(u), payloadSize(payloadSize)
@@ -59,13 +61,3 @@ void FileInfo::fillInfoJson(QJsonObject* infoJson) const
     infoJson->insert("size", payloadSize);
     infoJson->insert("mimetype", mimeType.name());
 }
-
-void FileInfo::fillJson(QJsonObject* json) const
-{
-    Q_ASSERT(json);
-    json->insert("url", url.toString());
-    if (!originalName.isEmpty())
-        json->insert("filename", originalName);
-    json->insert("info", toInfoJson());
-}
-
-- 
cgit v1.2.3