projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
prop
/
property.h
diff --git
a/pv/prop/property.h
b/pv/prop/property.h
index 0b4bc7b0ed9223bca1f20706688924812d41a51f..b3aa1a690b00c3e29e74140317169bc5b2ac195e 100644
(file)
--- a/
pv/prop/property.h
+++ b/
pv/prop/property.h
@@
-23,8
+23,7
@@
#include <glib.h>
#include <glib.h>
-#include <boost/function.hpp>
-
+#include <functional>
#include <QString>
#include <QWidget>
#include <QString>
#include <QWidget>
@@
-38,8
+37,8
@@
class Property : public QObject
Q_OBJECT;
public:
Q_OBJECT;
public:
- typedef
boost
::function<GVariant* ()> Getter;
- typedef
boost
::function<void (GVariant*)> Setter;
+ typedef
std
::function<GVariant* ()> Getter;
+ typedef
std
::function<void (GVariant*)> Setter;
protected:
Property(QString name, Getter getter, Setter setter);
protected:
Property(QString name, Getter getter, Setter setter);