Don't use Qt-defined keywords, they can cause problems with other headers.

[pulseview.git] / pv / view / decodetrace.h

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 642f2a0ed4394cec7d2c90f67548f4d027e0396b..4b3bc3dec21ca6322cb4de879ebb01ffab020e75 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -25,14 +25,13 @@
 
 #include <list>
 #include <map>
+#include <memory>
 
 #include <QSignalMapper>
 
-#include <boost/shared_ptr.hpp>
-
 #include <pv/prop/binding/decoderoptions.h>
 
-struct srd_probe;
+struct srd_channel;
 struct srd_decoder;
 
 class QComboBox;
@@ -65,8 +64,8 @@ private:
        struct ProbeSelector
        {
                const QComboBox *_combo;
-               const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
-               const srd_probe *_probe;
+               const std::shared_ptr<pv::data::decode::Decoder> _decoder;
+               const srd_channel *_pdch;
        };
 
 private:
@@ -83,12 +82,12 @@ private:
 
 public:
        DecodeTrace(pv::SigSession &session,
-               boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+               std::shared_ptr<pv::data::DecoderStack> decoder_stack,
                int index);
 
        bool enabled() const;
 
-       const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
+       const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
        void set_view(pv::view::View *view);
 
@@ -143,19 +142,19 @@ private:
                int right, double samples_per_pixel, double pixels_offset);
 
        void create_decoder_form(int index,
-               boost::shared_ptr<pv::data::decode::Decoder> &dec,
+               std::shared_ptr<pv::data::decode::Decoder> &dec,
                QWidget *parent, QFormLayout *form);
 
        QComboBox* create_probe_selector(QWidget *parent,
-               const boost::shared_ptr<pv::data::decode::Decoder> &dec,
-               const srd_probe *const probe);
+               const std::shared_ptr<pv::data::decode::Decoder> &dec,
+               const srd_channel *const pdch);
 
        void commit_decoder_probes(
-               boost::shared_ptr<data::decode::Decoder> &dec);
+               std::shared_ptr<data::decode::Decoder> &dec);
 
        void commit_probes();
 
-private slots:
+private Q_SLOTS:
        void on_new_decode_data();
 
        void on_delete();
@@ -170,11 +169,11 @@ private slots:
 
 private:
        pv::SigSession &_session;
-       boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+       std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
        uint64_t _decode_start, _decode_end;
 
-       std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+       std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
                _bindings;
 
        std::list<ProbeSelector> _probe_selectors;