Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h
index 087955853ca3f6ad719c6f7063193c20a682b66a..fbe59059cf6190167d8cc0333c27e01008e094eb 100644 (file)
--- a/pv/data/decode/decoder.h
+++ b/pv/data/decode/decoder.h
@@ -22,14 +22,14 @@
 #define PULSEVIEW_PV_DATA_DECODE_DECODER_H
 
 #include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <set>
 
 #include <glib.h>
 
 struct srd_decoder;
 struct srd_decoder_inst;
-struct srd_probe;
+struct srd_channel;
 struct srd_session;
 
 namespace pv {
@@ -39,6 +39,9 @@ class LogicSignal;
 }
 
 namespace data {
+
+class Logic;
+
 namespace decode {
 
 class Decoder
@@ -53,28 +56,30 @@ public:
        bool shown() const;
        void show(bool show = true);
 
-       const std::map<const srd_probe*,
-               boost::shared_ptr<view::LogicSignal> >& probes() const;
-       void set_probes(std::map<const srd_probe*,
-               boost::shared_ptr<view::LogicSignal> > probes);
+       const std::map<const srd_channel*,
+               std::shared_ptr<view::LogicSignal> >& channels() const;
+       void set_channels(std::map<const srd_channel*,
+               std::shared_ptr<view::LogicSignal> > channels);
 
        const std::map<std::string, GVariant*>& options() const;
 
        void set_option(const char *id, GVariant *value);
 
-       bool have_required_probes() const;
+       bool have_required_channels() const;
 
        srd_decoder_inst* create_decoder_inst(
-               srd_session *const session) const;
+               srd_session *session, int unit_size) const;
+
+       std::set< std::shared_ptr<pv::data::Logic> > get_data();        
 
 private:
-       const srd_decoder *const _decoder;
+       const srd_decoder *const decoder_;
 
-       bool _shown;
+       bool shown_;
 
-       std::map<const srd_probe*, boost::shared_ptr<pv::view::LogicSignal> >
-               _probes;
-       std::map<std::string, GVariant*> _options;
+       std::map<const srd_channel*, std::shared_ptr<pv::view::LogicSignal> >
+               channels_;
+       std::map<std::string, GVariant*> options_;
 };
 
 } // namespace decode