#include <pv/view/logicsignal.h>
-using boost::shared_ptr;
using std::set;
using std::map;
+using std::shared_ptr;
using std::string;
namespace pv {
Decoder::~Decoder()
{
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.begin(); i != _options.end(); i++)
g_variant_unref((*i).second);
}
}
void Decoder::set_probes(std::map<const srd_channel*,
- boost::shared_ptr<view::LogicSignal> > probes)
+ std::shared_ptr<view::LogicSignal> > probes)
{
_probes = probes;
}
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
- for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
- {
+ for(auto i = _probes.cbegin(); i != _probes.cend(); i++) {
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.cbegin(); i != _options.cend(); i++)
{
GVariant *const value = (*i).second;
g_variant_ref(value);
GHashTable *const probes = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
+ for(auto i = _probes.cbegin(); i != _probes.cend(); i++)
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(