X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=8274b618a541b565126aa4c67562292957e29cd8;hp=dfc883f505e49ae87e708bb43f1036fed98d5728;hb=0aa57689a8abc7eb313de50774b8d0cf271bc61f;hpb=303d6ea697468ee79f4c3f73afc57db0ce6319a8

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index dfc883f5..8274b618 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -66,17 +66,14 @@ private:
 public:
 	LogicSignal(pv::Session &session,
 		std::shared_ptr<devices::Device> device,
-		std::shared_ptr<sigrok::Channel> channel,
-		std::shared_ptr<pv::data::Logic> data);
+		std::shared_ptr<data::SignalBase> base);
 
-	virtual ~LogicSignal();
+	virtual ~LogicSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
 	std::shared_ptr<pv::data::Logic> logic_data() const;
 
-	void set_logic_data(std::shared_ptr<pv::data::Logic> data);
-
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -94,25 +91,18 @@ public:
 	 */
 	void scale_handle_dragged(int offset);
 
-	/**
-	 * Paints the background layer of the signal with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param pp the painting parameters object to paint with..
-	 **/
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
-
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
-	 **/
+	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
@@ -125,7 +115,7 @@ private:
 
 	const std::vector<int32_t> get_trigger_types() const;
 	QAction* action_from_trigger_type(
-		const sigrok::TriggerMatchType *match);
+		const sigrok::TriggerMatchType *type);
 	const sigrok::TriggerMatchType* trigger_type_from_action(
 		QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -141,7 +131,6 @@ private:
 	int signal_height_;
 
 	std::shared_ptr<pv::devices::Device> device_;
-	std::shared_ptr<pv::data::Logic> data_;
 
 	const sigrok::TriggerMatchType *trigger_match_;
 	QToolBar *trigger_bar_;