Drop ifdefs for libQuotient 0.7

src/events/imagepackevent.cpp

@@ -11,11 +11,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
     if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
             fromJson<Omittable<QString>>(json["pack"].toObject()["display_name"]),
-#ifdef QUOTIENT_07
             fromJson<Omittable<QUrl>>(json["pack"].toObject()["avatar_url"]),
-#else
-            QUrl(),
-#endif
             fromJson<Omittable<QStringList>>(json["pack"].toObject()["usage"]),
             fromJson<Omittable<QString>>(json["pack"].toObject()["attribution"]),
         };
@@ -27,21 +23,13 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
     for (const auto &k : keys) {
         Omittable<EventContent::ImageInfo> info;
         if (json["images"][k].toObject().contains(QStringLiteral("info"))) {
-#ifdef QUOTIENT_07
             info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k]["info"].toObject(), k);
-#else
-            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k].toObject(), k);
-#endif
         } else {
             info = none;
         }
         images += ImagePackImage{
             k,
-#ifdef QUOTIENT_07
             fromJson<QUrl>(json["images"][k]["url"].toString()),
-#else
-            QUrl(),
-#endif
             fromJson<Omittable<QString>>(json["images"][k]["body"]),
             info,
             fromJson<Omittable<QStringList>>(json["images"][k]["usage"]),

src/events/imagepackevent.h

@@ -83,23 +83,11 @@ public:
  *
  * @sa Quotient::StateEvent, ImagePackEventContent
  */
-#ifdef QUOTIENT_07
 class ImagePackEvent : public KeyedStateEventBase<ImagePackEvent, ImagePackEventContent>
-#else
-class ImagePackEvent : public StateEvent<ImagePackEventContent>
-#endif
 {
 public:
-#ifdef QUOTIENT_07
     QUO_EVENT(ImagePackEvent, "im.ponies.room_emotes")
     using KeyedStateEventBase::KeyedStateEventBase;
-#else
-    DEFINE_EVENT_TYPEID("im.ponies.room_emotes", ImagePackEvent)
-    explicit ImagePackEvent(const QJsonObject &obj)
-        : StateEvent(typeId(), obj)
-    {
-    }
-#endif
 };
 
 REGISTER_EVENT_TYPE(ImagePackEvent)

src/events/joinrulesevent.h

@@ -14,25 +14,13 @@ namespace Quotient
  *
  * @sa Quotient::StateEvent
  */
-#ifdef QUOTIENT_07
 class JoinRulesEvent : public StateEvent
-#else
-class JoinRulesEvent : public StateEventBase
-#endif
 {
 public:
-#ifdef QUOTIENT_07
     QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
-#else
-    DEFINE_EVENT_TYPEID("m.room.join_rules", JoinRulesEvent)
-#endif
 
     explicit JoinRulesEvent(const QJsonObject &obj)
-#ifdef QUOTIENT_07
         : StateEvent(obj)
-#else
-        : StateEventBase(typeId(), obj)
-#endif
     {
     }
 

src/events/stickerevent.cpp

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#include "stickerevent.h"
-
-using namespace Quotient;
-
-StickerEvent::StickerEvent(const QJsonObject &obj)
-#ifdef QUOTIENT_07
-    : RoomEvent(obj)
-#else
-    : RoomEvent(typeId(), obj)
-#endif
-    , m_imageContent(EventContent::ImageContent(obj["content"_ls].toObject()))
-{
-}
-
-QString StickerEvent::body() const
-{
-    return content<QString>("body"_ls);
-}
-
-const EventContent::ImageContent &StickerEvent::image() const
-{
-    return m_imageContent;
-}
-
-QUrl StickerEvent::url() const
-{
-#ifdef QUOTIENT_07
-    return m_imageContent.url();
-#else
-    return m_imageContent.url;
-#endif
-}

src/events/stickerevent.h

@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include <events/eventcontent.h>
-#include <events/roomevent.h>
-
-namespace Quotient
-{
-/**
- * @class StickerEvent
- *
- * Class to define a sticker event.
- *
- * Sticker messages are specialised image messages that are displayed without
- * controls (e.g. no "download" link, or light-box view on click, as would be
- * displayed for for m.image events).
- *
- * @sa Quotient::RoomEvent
- */
-class StickerEvent : public RoomEvent
-{
-public:
-#ifdef QUOTIENT_07
-    QUO_EVENT(StickerEvent, "m.sticker")
-#else
-    DEFINE_EVENT_TYPEID("m.sticker", StickerEvent)
-#endif
-
-    explicit StickerEvent(const QJsonObject &obj);
-
-    /**
-     * @brief A textual representation or associated description of the sticker image.
-     *
-     * This could be the alt text of the original image, or a message to accompany
-     * and further describe the sticker.
-     */
-    QString body() const;
-
-    /**
-     * @brief Metadata about the image referred to in url including a thumbnail representation.
-     */
-    const EventContent::ImageContent &image() const;
-
-    /**
-     * @brief The URL to the sticker image. This must be a valid mxc:// URI.
-     */
-    QUrl url() const;
-
-private:
-    EventContent::ImageContent m_imageContent;
-};
-REGISTER_EVENT_TYPE(StickerEvent)
-}