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
/
inputoutput.hpp
diff --git
a/pv/binding/inputoutput.hpp
b/pv/binding/inputoutput.hpp
index 7cf535b27450b5955a5223701fa5ce6ab477fdf3..3c64781f2ffa17ecd8f2f8f1979f0696e0b72686 100644
(file)
--- a/
pv/binding/inputoutput.hpp
+++ b/
pv/binding/inputoutput.hpp
@@
-28,6
+28,11
@@
#include <pv/prop/property.hpp>
#include <pv/prop/property.hpp>
+using std::map;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+
namespace sigrok {
class Option;
}
namespace sigrok {
class Option;
}
@@
-45,15
+50,13
@@
public:
* Constructs a new @c InputOutput binding.
* @param options the map of options to use as a template.
*/
* Constructs a new @c InputOutput binding.
* @param options the map of options to use as a template.
*/
- InputOutput(
- const std::map<std::string, std::shared_ptr<sigrok::Option>>
- &options);
+ InputOutput(const map<string, shared_ptr<sigrok::Option>> &options);
/**
* Gets the map of selected options.
* @return the options.
*/
/**
* Gets the map of selected options.
* @return the options.
*/
- const
std::map<std::
string, Glib::VariantBase>& options() const;
+ const
map<
string, Glib::VariantBase>& options() const;
private:
/**
private:
/**
@@
-63,15
+66,15
@@
private:
* @param getter the getter that will read the values out of the map.
* @param setter the setter that will set the values into the map.
*/
* @param getter the getter that will read the values out of the map.
* @param setter the setter that will set the values into the map.
*/
- s
td::s
hared_ptr<prop::Property> bind_enum(const QString &name,
- const
std::
vector<Glib::VariantBase> &values,
+ shared_ptr<prop::Property> bind_enum(const QString &name,
+ const vector<Glib::VariantBase> &values,
prop::Property::Getter getter, prop::Property::Setter setter);
private:
/**
* The current map of options.
*/
prop::Property::Getter getter, prop::Property::Setter setter);
private:
/**
* The current map of options.
*/
-
std::map<std::
string, Glib::VariantBase> options_;
+
map<
string, Glib::VariantBase> options_;
};
} // binding
};
} // binding