UI can now add some widgets around

1 files changed, 18 insertions, 25 deletions

diff --git a/src/widgetinfo.h b/src/widgetinfo.h
index 06a6149..51d617b 100644
--- a/src/widgetinfo.h
+++ b/src/widgetinfo.h
@@ -1,23 +1,23 @@
 #ifndef WIDGETINFO_H
 #define WIDGETINFO_H
 
-#include <QtCore/QObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QSharedData>
 #include <QtCore/QUrl>
 
-class WidgetInfo : public QObject
+class WidgetInfoData;
+
+class WidgetInfo
 {
-	Q_OBJECT
+	Q_GADGET
 	Q_ENUMS(WidgetSize WidgetPosition)
 
-	Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
-	Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
-	Q_PROPERTY(bool invert READ invert WRITE setInvert NOTIFY invertChanged)
-	Q_PROPERTY(int page READ page WRITE setPage NOTIFY pageChanged)
-	Q_PROPERTY(WidgetSize size READ size WRITE setSize NOTIFY sizeChanged)
-	Q_PROPERTY(WidgetPosition position READ position WRITE setPosition NOTIFY positionChanged)
-
 public:
-	explicit WidgetInfo(QObject *parent = 0);
+	WidgetInfo();
+	WidgetInfo(const WidgetInfo &other);
+	~WidgetInfo();
+
+	WidgetInfo& operator=(const WidgetInfo &other);
 
 	enum WidgetSize
 	{
@@ -40,6 +40,9 @@ public:
 	QUrl url() const;
 	void setUrl(const QUrl &url);
 
+	QString description() const;
+	void setDescription(const QString &desc);
+
 	bool invert() const;
 	void setInvert(bool invert);
 
@@ -52,21 +55,11 @@ public:
 	WidgetPosition position() const;
 	void setPosition(const WidgetPosition &pos);
 
-signals:
-	void validChanged();
-	void urlChanged();
-	void invertChanged();
-	void pageChanged();
-	void sizeChanged();
-	void positionChanged();
-
 private:
-	QUrl _url;
-	bool _invert;
-	short _page;
-	WidgetSize _size;
-	WidgetPosition _pos;
-
+	QSharedDataPointer<WidgetInfoData> d;
 };
 
+Q_DECLARE_METATYPE(WidgetInfo::WidgetSize)
+Q_DECLARE_METATYPE(WidgetInfo::WidgetPosition)
+
 #endif // WIDGETINFO_H