X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fproperty.hpp;h=4ce352e11e5dacb2aaacfe4e726e3e94875daaef;hb=97378470ded88af84edaa0f1063d10d834475665;hp=77eb9a6a73ec61f36f828775e22fbd3cf1b501d1;hpb=8ada6ef1319fa11fd594a34853967c1f9688913b;p=pulseview.git diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp index 77eb9a6..4ce352e 100644 --- a/pv/prop/property.hpp +++ b/pv/prop/property.hpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP @@ -28,9 +27,12 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS #include + #include #include +using std::function; + class QWidget; namespace pv { @@ -41,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; @@ -60,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