Use range-based for loops more often.

[pulseview.git] / pv / data / decode / decoder.cpp

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index d3e483bd8d0435ea0aea65ea3d1df0661d5e743e..374dd4d360c9bf8bca84f544eaf04892395c9888 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -20,12 +20,12 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decoder.h"
+#include "decoder.hpp"
 
-#include <pv/view/logicsignal.h>
+#include <pv/view/logicsignal.hpp>
 
 using std::set;
 using std::map;
@@ -37,62 +37,62 @@ namespace data {
 namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
-       _decoder(dec),
-       _shown(true)
+       decoder_(dec),
+       shown_(true)
 {
 }
 
 Decoder::~Decoder()
 {
-       for (auto i = _options.begin(); i != _options.end(); i++)
-               g_variant_unref((*i).second);
+       for (auto & option : options_)
+               g_variant_unref(option.second);
 }
 
 const srd_decoder* Decoder::decoder() const
 {
-       return _decoder;
+       return decoder_;
 }
 
 bool Decoder::shown() const
 {
-       return _shown;
+       return shown_;
 }
 
 void Decoder::show(bool show)
 {
-       _shown = show;
+       shown_ = show;
 }
 
 const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
 Decoder::channels() const
 {
-       return _probes;
+       return channels_;
 }
 
-void Decoder::set_probes(std::map<const srd_channel*,
-       std::shared_ptr<view::LogicSignal> > probes)
+void Decoder::set_channels(std::map<const srd_channel*,
+       std::shared_ptr<view::LogicSignal> > channels)
 {
-       _probes = probes;
+       channels_ = channels;
 }
 
 const std::map<std::string, GVariant*>& Decoder::options() const
 {
-       return _options;
+       return options_;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {
        assert(value);
        g_variant_ref(value);
-       _options[id] = value;
+       options_[id] = value;
 }
 
-bool Decoder::have_required_probes() const
+bool Decoder::have_required_channels() const
 {
-       for (GSList *l = _decoder->channels; l; l = l->next) {
+       for (GSList *l = decoder_->channels; l; l = l->next) {
                const srd_channel *const pdch = (const srd_channel*)l->data;
                assert(pdch);
-               if (_probes.find(pdch) == _probes.end())
+               if (channels_.find(pdch) == channels_.end())
                        return false;
        }
 
@@ -102,8 +102,8 @@ bool Decoder::have_required_probes() const
 set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
        set< shared_ptr<pv::data::Logic> > data;
-       for(auto i = _probes.cbegin(); i != _probes.cend(); i++) {
-               shared_ptr<view::LogicSignal> signal((*i).second);
+       for (const auto & channel : channels_) {
+               shared_ptr<view::LogicSignal> signal(channel.second);
                assert(signal);
                data.insert(signal->logic_data());
        }
@@ -111,40 +111,38 @@ set< shared_ptr<pv::data::Logic> > Decoder::get_data()
        return data;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 {
        GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for (auto i = _options.cbegin(); i != _options.cend(); i++)
-       {
-               GVariant *const value = (*i).second;
+       for (const auto & option : options_) {
+               GVariant *const value = option.second;
                g_variant_ref(value);
                g_hash_table_replace(opt_hash, (void*)g_strdup(
-                       (*i).first.c_str()), value);
+                       option.first.c_str()), value);
        }
 
        srd_decoder_inst *const decoder_inst = srd_inst_new(
-               session, _decoder->id, opt_hash);
+               session, decoder_->id, opt_hash);
        g_hash_table_destroy(opt_hash);
 
-       if(!decoder_inst)
-               return NULL;
+       if (!decoder_inst)
+               return nullptr;
 
-       // Setup the probes
-       GHashTable *const probes = g_hash_table_new_full(g_str_hash,
+       // Setup the channels
+       GHashTable *const channels = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for(auto i = _probes.cbegin(); i != _probes.cend(); i++)
-       {
-               shared_ptr<view::LogicSignal> signal((*i).second);
+       for (const auto & channel : channels_) {
+               shared_ptr<view::LogicSignal> signal(channel.second);
                GVariant *const gvar = g_variant_new_int32(
-                       signal->probe()->index);
+                       signal->channel()->index());
                g_variant_ref_sink(gvar);
-               g_hash_table_insert(probes, (*i).first->id, gvar);
+               g_hash_table_insert(channels, channel.first->id, gvar);
        }
 
-       srd_inst_channel_set_all(decoder_inst, probes, unit_size);
+       srd_inst_channel_set_all(decoder_inst, channels);
 
        return decoder_inst;
 }