Port away from Quotient::Omittable

This commit is contained in:
Tobias Fella
2024-06-27 20:19:01 +02:00
parent fd8725f649
commit 2e0c074a9b
9 changed files with 41 additions and 18 deletions

View File

@@ -7,6 +7,8 @@
#include <Quotient/events/eventcontent.h>
#include <Quotient/events/stateevent.h>
#include "definitions.h"
namespace Quotient
{
/**
@@ -26,10 +28,10 @@ public:
* @brief Defines the properties of an image pack.
*/
struct Pack {
Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
Omittable<QString> displayName; /**< The display name of the pack. */
Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
Omittable<QString> attribution; /**< The attribution for the pack author(s). */
};
/**
@@ -38,14 +40,14 @@ public:
struct ImagePackImage {
QString shortcode; /**< The shortcode for the image. */
QUrl url; /**< The mxc URL for this image. */
Quotient::Omittable<QString> body; /**< An optional text body for this image. */
Quotient::Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
Omittable<QString> body; /**< An optional text body for this image. */
Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
/**
* @brief An array of the usages for this image.
*
* The possible values match those of the usage key of a pack object.
*/
Quotient::Omittable<QStringList> usage;
Omittable<QStringList> usage;
};
/**
@@ -53,7 +55,7 @@ public:
*
* @sa Pack
*/
Quotient::Omittable<Pack> pack;
Omittable<Pack> pack;
/**
* @brief Return a vector of images in the pack.