Make member variable underscores a suffix instead of a prefix

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 08a0fd0fadb5cbe23b89e8e93acea84dae027599..513177be356a24ac5fe88e1acbe75702a58fa68e 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -29,6 +29,8 @@
 #include <thread>
 #include <vector>
 
+#include <boost/thread.hpp>
+
 #include <QObject>
 #include <QString>
 
@@ -104,8 +106,9 @@ public:
 
        std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-       std::vector< std::shared_ptr<view::Signal> >
-               get_signals() const;
+       boost::shared_mutex& signals_mutex() const;
+
+       const std::vector< std::shared_ptr<view::Signal> >& signals() const;
 
 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);
@@ -145,29 +148,29 @@ private:
                std::shared_ptr<sigrok::Packet> packet);
 
 private:
-       DeviceManager &_device_manager;
-       std::shared_ptr<sigrok::Session> _session;
+       DeviceManager &device_manager_;
+       std::shared_ptr<sigrok::Session> session_;
 
        /**
         * The device instance that will be used in the next capture session.
         */
-       std::shared_ptr<sigrok::Device> _device;
+       std::shared_ptr<sigrok::Device> device_;
 
-       std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
+       std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-       mutable std::mutex _sampling_mutex;
-       capture_state _capture_state;
+       mutable std::mutex sampling_mutex_;
+       capture_state capture_state_;
 
-       mutable std::mutex _signals_mutex;
-       std::vector< std::shared_ptr<view::Signal> > _signals;
+       mutable boost::shared_mutex signals_mutex_;
+       std::vector< std::shared_ptr<view::Signal> > signals_;
 
-       mutable std::mutex _data_mutex;
-       std::shared_ptr<data::Logic> _logic_data;
-       std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+       mutable std::mutex data_mutex_;
+       std::shared_ptr<data::Logic> logic_data_;
+       std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
        std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
-               _cur_analog_snapshots;
+               cur_analog_snapshots_;
 
-       std::thread _sampling_thread;
+       std::thread sampling_thread_;
 
 Q_SIGNALS:
        void capture_state_changed(int state);