X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=14eeed4baf82bbd272e390c46468d8e30d9b1dd8;hb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;hp=dfc883f505e49ae87e708bb43f1036fed98d5728;hpb=303d6ea697468ee79f4c3f73afc57db0ce6319a8;p=pulseview.git

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index dfc883f..14eeed4 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -66,10 +66,10 @@ private:
 public:
 	LogicSignal(pv::Session &session,
 		std::shared_ptr<devices::Device> device,
-		std::shared_ptr<sigrok::Channel> channel,
+		std::shared_ptr<data::SignalBase> base,
 		std::shared_ptr<pv::data::Logic> data);
 
-	virtual ~LogicSignal();
+	virtual ~LogicSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
@@ -94,25 +94,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 +118,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);