X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=3ebc9f9f41839b67d0d6fac1b8cb4d26f7b5ff33;hb=56853c982046f78abe433f4f096f9305f8bcf806;hp=2253e70dc4fe97261267dee8411a5bb43e95f18b;hpb=634ecdcdad8c19ec27c879d3eae74c4d65030511;p=pulseview.git
diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 2253e70..3ebc9f9 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -17,23 +17,24 @@
* along with this program; if not, see .
*/
-#include
+#include
#include
#include "device.hpp"
#include
-#include
#include
#include
#include
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 capabilities,
+ const ConfigKey *key, set capabilities,
Property::Getter getter,
Property::Setter setter, function printer)
{
@@ -164,7 +164,7 @@ void Device::bind_enum(const QString &name,
}
void Device::bind_int(const QString &name, QString suffix,
- optional< std::pair > range,
+ optional< pair > 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