X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.h;h=dd6d25bad37460d4e1fe9bac6992366a42933907;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=6ab83193963c3d0a8f6b470c2bd551c41ad625ac;hpb=9b25892767cee1d871ac18beb025033e905b28ae;p=pulseview.git

diff --git a/pv/prop/property.h b/pv/prop/property.h
index 6ab8319..dd6d25b 100644
--- a/pv/prop/property.h
+++ b/pv/prop/property.h
@@ -21,10 +21,9 @@
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_H
 #define PULSEVIEW_PV_PROP_PROPERTY_H
 
-#include <glib-2.0/glib.h>
-
-#include <boost/function.hpp>
+#include <glibmm-2.4/glibmm.h>
 
+#include <functional>
 #include <QString>
 #include <QWidget>
 
@@ -33,11 +32,13 @@ class QWidget;
 namespace pv {
 namespace prop {
 
-class Property
+class Property : public QObject
 {
+	Q_OBJECT;
+
 public:
-	typedef boost::function<GVariant* ()> Getter;
-	typedef boost::function<void (GVariant*)> Setter;
+	typedef std::function<Glib::VariantBase ()> Getter;
+	typedef std::function<void (Glib::VariantBase)> Setter;
 
 protected:
 	Property(QString name, Getter getter, Setter setter);
@@ -45,16 +46,18 @@ protected:
 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;
+	const Getter getter_;
+	const Setter setter_;
 
 private:
-	QString _name;
+	QString name_;
 };
 
 } // prop