X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=d4fbf3714ba040236cb055488a5dbc2fd4014a5a;hp=81c505986c85ac27662dfa7443b13ff5bcceff5f;hb=4e2195c8d934f7f874b612eaace8c6849e8b475d;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 81c5059..d4fbf37 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -20,6 +20,8 @@
 #ifndef PULSEVIEW_PV_BINDING_DEVICE_HPP
 #define PULSEVIEW_PV_BINDING_DEVICE_HPP
 
+#include <functional>
+
 #include <boost/optional.hpp>
 
 #include <QObject>
@@ -31,30 +33,35 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::function;
+using std::pair;
+using std::set;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace binding {
 
-class Device : public QObject, public Binding
+class Device : public Binding
 {
 	Q_OBJECT
 
 public:
-	Device(std::shared_ptr<sigrok::Configurable> configurable);
+	Device(shared_ptr<sigrok::Configurable> configurable);
 
 Q_SIGNALS:
 	void config_changed();
 
 private:
-	void bind_bool(const QString &name,
+	void bind_bool(const QString &name, const QString &desc,
 		prop::Property::Getter getter, prop::Property::Setter setter);
-	void bind_enum(const QString &name,
+	void bind_enum(const QString &name, const QString &desc,
 		const sigrok::ConfigKey *key,
-		std::set<const sigrok::Capability *> capabilities,
+		set<const sigrok::Capability *> capabilities,
 		prop::Property::Getter getter, prop::Property::Setter setter,
-		std::function<QString (Glib::VariantBase)> printer = print_gvariant);
-	void bind_int(const QString &name, QString suffix,
-		boost::optional< std::pair<int64_t, int64_t> > range,
+		function<QString (Glib::VariantBase)> printer = print_gvariant);
+	void bind_int(const QString &name, const QString &desc, QString suffix,
+		boost::optional< pair<int64_t, int64_t> > range,
 		prop::Property::Getter getter, prop::Property::Setter setter);
 
 	static QString print_timebase(Glib::VariantBase gvar);
@@ -63,10 +70,10 @@ private:
 	static QString print_probe_factor(Glib::VariantBase gvar);
 
 protected:
-	std::shared_ptr<sigrok::Configurable> configurable_;
+	shared_ptr<sigrok::Configurable> configurable_;
 };
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_BINDING_DEVICE_HPP