From 4fbfdf753e5c39415ebf1f098737edf543003b9e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 5 Feb 2015 00:28:02 +0100 Subject: [PATCH] Add a default constructor for DanbooruPost --- src/libdanbooru/danboorupost.cpp | 13 +++++++++++++ src/libdanbooru/danboorupost.h | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/libdanbooru/danboorupost.cpp b/src/libdanbooru/danboorupost.cpp index 7a596b9..0ff40e5 100644 --- a/src/libdanbooru/danboorupost.cpp +++ b/src/libdanbooru/danboorupost.cpp @@ -38,6 +38,19 @@ namespace Danbooru const QMap DanbooruPost::RATING_MAP = initRatingMap(); +DanbooruPost::DanbooruPost(QObject* parent): QObject(parent) +{ + m_pixmap = QPixmap(); + m_tags = QSet(); + m_height = 0; + m_width = 0; + m_url = QUrl(); + m_thumbnailUrl = QUrl(); + m_size = 0; + m_rating = Questionable; +} + + DanbooruPost::DanbooruPost(QVariantMap postData, QPixmap pixmap, QObject *parent): QObject(parent), diff --git a/src/libdanbooru/danboorupost.h b/src/libdanbooru/danboorupost.h index b1747cc..d36e4c1 100644 --- a/src/libdanbooru/danboorupost.h +++ b/src/libdanbooru/danboorupost.h @@ -69,7 +69,7 @@ class DanbooruPost : public QObject Q_OBJECT - Q_PROPERTY(const QPixmap pixmap READ pixmap WRITE setPixmap) + Q_PROPERTY(const QPixmap pixmapData READ pixmap WRITE setPixmap) Q_PROPERTY(int id READ id) Q_PROPERTY(QUrl fileUrl READ fileUrl) Q_PROPERTY(QSet tags READ tags) @@ -89,6 +89,8 @@ public: Explicit = 4 /**< Explicit material **/ }; Q_DECLARE_FLAGS(Ratings, DanbooruPost::Rating) + Q_ENUMS(Rating) + private: @@ -127,9 +129,12 @@ public: * @param parent A pointer to the parent QObject. * **/ + explicit DanbooruPost(QVariantMap postData, QPixmap pixmap = QPixmap(), QObject *parent = 0); + explicit DanbooruPost(QObject* parent = 0); + /** * @brief Construct a Danbooru post from XML attributes * @@ -217,6 +222,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(DanbooruPost::Ratings) }; // namespace Danbooru Q_DECLARE_METATYPE(Danbooru::DanbooruPost *) +Q_DECLARE_METATYPE(Danbooru::DanbooruPost::Rating) + #endif // DANBOORUPOST_H