X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fsignal.hpp;h=72c97e1d00c6f1720cc5cebabfbb38ee05b7f0a9;hb=cbd2a2de848f957507096785d3be1cc97d30df9a;hp=bcd4e2eb617eef83a46a5c1e98bf308751b48d8e;hpb=99af6802961b0a5ec7ec7d3ff2215c8eb6925ca3;p=pulseview.git

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index bcd4e2eb..72c97e1d 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -32,15 +32,12 @@
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
-namespace sigrok {
-	class Channel;
-}
-
 namespace pv {
 
 class Session;
 
 namespace data {
+class SignalBase;
 class SignalData;
 }
 
@@ -52,13 +49,13 @@ class Signal : public Trace, public ViewItemOwner
 
 protected:
 	Signal(pv::Session &session,
-		std::shared_ptr<sigrok::Channel> channel);
+		std::shared_ptr<data::SignalBase> channel);
 
 public:
 	/**
 	 * Sets the name of the signal.
 	 */
-	void set_name(QString name);
+	virtual void set_name(QString name);
 
 	virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
@@ -69,7 +66,7 @@ public:
 
 	void enable(bool enable = true);
 
-	std::shared_ptr<sigrok::Channel> channel() const;
+	std::shared_ptr<data::SignalBase> base() const;
 
 	/**
 	 * Returns a list of row items owned by this object.
@@ -100,18 +97,18 @@ public:
 	 */
 	virtual void scale_handle_released() {};
 
-private Q_SLOTS:
+protected Q_SLOTS:
+	virtual void on_name_changed(const QString &text);
+
 	void on_disable();
 
 protected:
 	pv::Session &session_;
-	std::shared_ptr<sigrok::Channel> channel_;
 
 	const std::shared_ptr<SignalScaleHandle> scale_handle_;
 	const item_list items_;
 
 	QComboBox *name_widget_;
-	bool updating_name_widget_;
 };
 
 } // namespace view