* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
+#include <cstdint>
#include <QDebug>
#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;
using sigrok::Error;
using pv::prop::Bool;
-using pv::prop::Double;
using pv::prop::Enum;
using pv::prop::Int;
using pv::prop::Property;
}
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)
{
}
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_);
{
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)