Don't use Qt-defined keywords, they can cause problems with other headers.

[pulseview.git] / pv / view / trace.h

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 2d8c7cf1f17d35bafec31ac567c3ba66d94bc56a..71ad4953d84dc8f37f6f3c2418ef7a554ee0eda4 100644 (file)
--- 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:
        /**
@@ -176,20 +173,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;