X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.h;h=b3aa1a690b00c3e29e74140317169bc5b2ac195e;hb=f896568baff2904ef2a26ee082321f4f689a86b2;hp=31b90330d5e68a69cd63f01c220b5abdbdb30f2d;hpb=de1d99bbe58f825e30048baa48a9439c01686f10;p=pulseview.git diff --git a/pv/prop/property.h b/pv/prop/property.h index 31b9033..b3aa1a6 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 - -#include +#include +#include #include #include @@ -33,11 +32,13 @@ class QWidget; namespace pv { namespace prop { -class Property +class Property : public QObject { + Q_OBJECT; + public: - typedef boost::function Getter; - typedef boost::function Setter; + typedef std::function Getter; + typedef std::function Setter; protected: Property(QString name, Getter getter, Setter setter); @@ -45,7 +46,8 @@ 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;