X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.hpp;h=4ce352e11e5dacb2aaacfe4e726e3e94875daaef;hb=152a0b1b4e19dc3d8b816851abc82813d891b363;hp=6a4dd9ab2723156171cd04a23283b5f3ffd3434f;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp index 6a4dd9a..4ce352e 100644 --- a/pv/prop/property.hpp +++ b/pv/prop/property.hpp @@ -27,9 +27,12 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS #include + #include #include +using std::function; + class QWidget; namespace pv { @@ -40,18 +43,19 @@ class Property : public QObject Q_OBJECT; public: - typedef std::function Getter; - typedef std::function Setter; + typedef function Getter; + typedef function Setter; protected: - Property(QString name, Getter getter, Setter setter); + Property(QString name, QString desc, Getter getter, Setter setter); public: const QString& name() const; + const QString& desc() const; - virtual QWidget* get_widget(QWidget *parent, - bool auto_commit = false) = 0; + virtual QWidget* get_widget(QWidget *parent, bool auto_commit = false) = 0; virtual bool labeled_widget() const; + virtual void update_widget() = 0; virtual void commit() = 0; @@ -59,11 +63,12 @@ protected: const Getter getter_; const Setter setter_; -private: +protected: QString name_; + QString desc_; }; -} // prop -} // pv +} // namespace prop +} // namespace pv #endif // PULSEVIEW_PV_PROP_PROPERTY_HPP