projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
prop
/
property.h
diff --git
a/pv/prop/property.h
b/pv/prop/property.h
index 6ab83193963c3d0a8f6b470c2bd551c41ad625ac..dd6d25bad37460d4e1fe9bac6992366a42933907 100644
(file)
--- 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
#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>
#include <QString>
#include <QWidget>
@@
-33,11
+32,13
@@
class QWidget;
namespace pv {
namespace prop {
namespace pv {
namespace prop {
-class Property
+class Property
: public QObject
{
{
+ Q_OBJECT;
+
public:
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);
protected:
Property(QString name, Getter getter, Setter setter);
@@
-45,16
+46,18
@@
protected:
public:
const QString& name() const;
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:
virtual void commit() = 0;
protected:
- const Getter
_getter
;
- const Setter
_setter
;
+ const Getter
getter_
;
+ const Setter
setter_
;
private:
private:
- QString
_name
;
+ QString
name_
;
};
} // prop
};
} // prop