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

diff --git a/pv/prop/property.h b/pv/prop/property.h
index e5a523f..dd6d25b 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 <glib.h>
+#include <glibmm-2.4/glibmm.h>
 
+#include <functional>
 #include <QString>
 #include <QWidget>
 
@@ -36,8 +37,8 @@ class Property : public QObject
 	Q_OBJECT;
 
 public:
-	typedef std::function<GVariant* ()> Getter;
-	typedef std::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);
@@ -52,11 +53,11 @@ public:
 	virtual void commit() = 0;
 
 protected:
-	const Getter _getter;
-	const Setter _setter;
+	const Getter getter_;
+	const Setter setter_;
 
 private:
-	QString _name;
+	QString name_;
 };
 
 } // prop