Trace: Removed coloured_bg state

[pulseview.git] / pv / binding / device.hpp

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 81c505986c85ac27662dfa7443b13ff5bcceff5f..dcef9470cc12e091565871486d1ef3d6a8799053 100644 (file)
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -31,6 +31,11 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::function;
+using std::pair;
+using std::set;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace binding {
@@ -40,21 +45,21 @@ class Device : public QObject, 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 +68,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