X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.h;h=b3aa1a690b00c3e29e74140317169bc5b2ac195e;hb=f896568baff2904ef2a26ee082321f4f689a86b2;hp=002c91161faffd053d2a690e15f641a65282de9d;hpb=24bb0bd140f7f8b00ea3c0cbe0c5d26dc03a3b69;p=pulseview.git

diff --git a/pv/prop/property.h b/pv/prop/property.h
index 002c911..b3aa1a6 100644
--- a/pv/prop/property.h
+++ b/pv/prop/property.h
@@ -21,8 +21,9 @@
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_H
 #define PULSEVIEW_PV_PROP_PROPERTY_H
 
-#include <boost/function.hpp>
+#include <glib.h>
 
+#include <functional>
 #include <QString>
 #include <QWidget>
 
@@ -31,18 +32,30 @@ class QWidget;
 namespace pv {
 namespace prop {
 
-class Property
+class Property : public QObject
 {
+	Q_OBJECT;
+
+public:
+	typedef std::function<GVariant* ()> Getter;
+	typedef std::function<void (GVariant*)> Setter;
+
 protected:
-	Property(QString name);
+	Property(QString name, Getter getter, Setter setter);
 
 public:
 	const QString& name() const;
 
-	virtual QWidget* get_widget(QWidget *parent) = 0;
+	virtual QWidget* get_widget(QWidget *parent,
+		bool auto_commit = false) = 0;
+	virtual bool labeled_widget() const;
 
 	virtual void commit() = 0;
 
+protected:
+	const Getter _getter;
+	const Setter _setter;
+
 private:
 	QString _name;
 };