X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=5cab44040051ba3bc2bb71a0c181ee24f27714c5;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=2d8c7cf1f17d35bafec31ac567c3ba66d94bc56a;hpb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 2d8c7cf1..5cab4404 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -34,9 +34,6 @@
 class QFormLayout;
 
 namespace pv {
-
-class SigSession;
-
 namespace view {
 
 class View;
@@ -50,7 +47,7 @@ private:
 	static const int LabelHitPadding;
 
 protected:
-	Trace(SigSession &session, QString name);
+	Trace(QString name);
 
 public:
 	/**
@@ -115,7 +112,7 @@ public:
 	virtual void paint_fore(QPainter &p, int left, int right);
 
 	/**
-	 * Paints the signal label into a QGLWidget.
+	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
 	 * @param right the x-coordinate of the right edge of the header
 	 * 	area.
@@ -151,6 +148,8 @@ public:
 	 */
 	QRectF get_label_rect(int right);
 
+	bool eventFilter(QObject *obj, QEvent *evt);
+
 protected:
 
 	/**
@@ -176,20 +175,21 @@ protected:
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private slots:
+	void close_popup();
+
+private Q_SLOTS:
 	void on_text_changed(const QString &text);
 
 	void on_colour_changed(const QColor &colour);
 
 	void on_popup_closed();
 
-signals:
+Q_SIGNALS:
 	void visibility_changed();
 	void text_changed();	
 	void colour_changed();
 
 protected:
-	pv::SigSession &_session;
 	pv::view::View *_view;
 
 	QString _name;