EventContent: rewrite without mixins

MSVC is not good at dealing with type parameter packs of member functions, which is what the whole mixin magic in UrlBasedContent<> relied on. So it's one more level of inheritance instead of mixins now.

1 files changed, 6 insertions, 8 deletions

diff --git a/events/eventcontent.cpp b/events/eventcontent.cpp
index 271669e2..c96da9b3 100644
--- a/events/eventcontent.cpp
+++ b/events/eventcontent.cpp
@@ -74,15 +74,13 @@ void ImageInfo::fillInfoJson(QJsonObject* infoJson) const
     infoJson->insert("h", imageSize.height());
 }
 
-WithThumbnail::WithThumbnail(const QJsonObject& infoJson)
-    : thumbnail(infoJson["thumbnail_url"].toString(),
-      infoJson["thumbnail_info"].toObject())
+Thumbnail::Thumbnail(const QJsonObject& infoJson)
+    : ImageInfo(infoJson["thumbnail_url"].toString(),
+                infoJson["thumbnail_info"].toObject())
 { }
 
-void WithThumbnail::fillInfoJson(QJsonObject* infoJson) const
+void Thumbnail::fillInfoJson(QJsonObject* infoJson) const
 {
-    infoJson->insert("thumbnail_url", thumbnail.url.toString());
-    QJsonObject thumbnailInfoJson;
-    thumbnail.fillInfoJson(&thumbnailInfoJson);
-    infoJson->insert("thumbnail_info", thumbnailInfoJson);
+    infoJson->insert("thumbnail_url", url.toString());
+    infoJson->insert("thumbnail_info", toInfoJson<ImageInfo>(*this));
 }