X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.h;h=420961ad1c9f4d83a1d873f3740aac9cb6ce1d63;hb=ef40ad83ac7e2cb12b4ecfede4564ba3ef416905;hp=9a991fcb436c63596fb3c2d3cedd9fff4b7a3aa3;hpb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;p=pulseview.git

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 9a991fcb..420961ad 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -25,11 +25,10 @@
 
 #include <list>
 #include <map>
+#include <memory>
 
 #include <QSignalMapper>
 
-#include <boost/shared_ptr.hpp>
-
 #include <pv/prop/binding/decoderoptions.h>
 
 struct srd_channel;
@@ -62,10 +61,10 @@ class DecodeTrace : public Trace
 	Q_OBJECT
 
 private:
-	struct ProbeSelector
+	struct ChannelSelector
 	{
 		const QComboBox *_combo;
-		const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+		const std::shared_ptr<pv::data::decode::Decoder> _decoder;
 		const srd_channel *_pdch;
 	};
 
@@ -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,24 +142,24 @@ 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,
+	QComboBox* create_channel_selector(QWidget *parent,
+		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);
+	void commit_decoder_channels(
+		std::shared_ptr<data::decode::Decoder> &dec);
 
-	void commit_probes();
+	void commit_channels();
 
-private slots:
+private Q_SLOTS:
 	void on_new_decode_data();
 
 	void on_delete();
 
-	void on_probe_selected(int);
+	void on_channel_selected(int);
 
 	void on_stack_decoder(srd_decoder *decoder);
 
@@ -170,17 +169,18 @@ 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;
+	std::list<ChannelSelector> _channel_selectors;
 	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
 	std::vector<QString> _cur_row_headings;
+	int _text_height, _row_height;
 
 	QSignalMapper _delete_mapper, _show_hide_mapper;
 };