X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=845708e59626f3dea41fdbc183c7424ef0f87ccf;hb=83b1c8d251386ac1980284c4668cbdd8e425550f;hp=85315f1d166a15b6ebca1bf6841315876cee48fb;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git
diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 85315f1..845708e 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_);
@@ -177,7 +177,7 @@ QString Device::print_timebase(Glib::VariantBase gvar)
{
uint64_t p, q;
g_variant_get(gvar.gobj(), "(tt)", &p, &q);
- return QString::fromUtf8(sr_period_string(p * q));
+ return QString::fromUtf8(sr_period_string(p, q));
}
QString Device::print_vdiv(Glib::VariantBase gvar)