X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=3ebc9f9f41839b67d0d6fac1b8cb4d26f7b5ff33;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=8ef05f05bcfa20baaf608e9975a6beeadaa666cc;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 8ef05f0..3ebc9f9 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -24,16 +24,17 @@
 #include "device.hpp"
 
 #include <pv/prop/bool.hpp>
-#include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::optional;
+
 using std::function;
 using std::make_pair;
 using std::pair;
+using std::set;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -44,7 +45,6 @@ using sigrok::ConfigKey;
 using sigrok::Error;
 
 using pv::prop::Bool;
-using pv::prop::Double;
 using pv::prop::Enum;
 using pv::prop::Int;
 using pv::prop::Property;
@@ -143,7 +143,7 @@ void Device::bind_bool(const QString &name,
 }
 
 void Device::bind_enum(const QString &name,
-	const ConfigKey *key, std::set<const Capability *> capabilities,
+	const ConfigKey *key, set<const Capability *> capabilities,
 	Property::Getter getter,
 	Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
@@ -164,7 +164,7 @@ void Device::bind_enum(const QString &name,
 }
 
 void Device::bind_int(const QString &name, QString suffix,
-	optional< std::pair<int64_t, int64_t> > range,
+	optional< pair<int64_t, int64_t> > range,
 	Property::Getter getter, Property::Setter setter)
 {
 	assert(configurable_);
@@ -201,5 +201,5 @@ QString Device::print_probe_factor(Glib::VariantBase gvar)
 	return QString("%1x").arg(factor);
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv