projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 85315f1d166a15b6ebca1bf6841315876cee48fb..fe08d2b4ab48a8c91e1543ee971ea398ae6eda4e 100644
(file)
--- a/
pv/binding/device.cpp
+++ b/
pv/binding/device.cpp
@@
-17,7
+17,7
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <
stdint.h
>
+#include <
cstdint
>
#include <QDebug>
#include <QDebug>
@@
-31,9
+31,11
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
using boost::optional;
#include <libsigrokcxx/libsigrokcxx.hpp>
using boost::optional;
+
using std::function;
using std::make_pair;
using std::pair;
using std::function;
using std::make_pair;
using std::pair;
+using std::set;
using std::shared_ptr;
using std::string;
using std::vector;
using std::shared_ptr;
using std::string;
using std::vector;
@@
-143,7
+145,7
@@
void Device::bind_bool(const QString &name,
}
void Device::bind_enum(const QString &name,
}
void Device::bind_enum(const QString &name,
- const ConfigKey *key, s
td::s
et<const Capability *> capabilities,
+ const ConfigKey *key, set<const Capability *> capabilities,
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
@@
-164,7
+166,7
@@
void Device::bind_enum(const QString &name,
}
void Device::bind_int(const QString &name, QString suffix,
}
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_);
Property::Getter getter, Property::Setter setter)
{
assert(configurable_);
@@
-177,7
+179,7
@@
QString Device::print_timebase(Glib::VariantBase gvar)
{
uint64_t p, q;
g_variant_get(gvar.gobj(), "(tt)", &p, &q);
{
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)
}
QString Device::print_vdiv(Glib::VariantBase gvar)