Corrected pv::view::Trace header gates

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 96172d77b3a439b761ccdf93e2de2d34cc14bb11..01f057fec47c2fbcf80575ccd622e35348dca304 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,11 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
 
 #include <QComboBox>
-#include <QPen>
 #include <QWidgetAction>
 
 #include <stdint.h>
@@ -43,15 +42,10 @@ class Signal : public Trace
 {
        Q_OBJECT
 
-private:
-       static const QPen SignalAxisPen;
-
 protected:
        Signal(pv::SigSession &session, const sr_probe *const probe);
 
 public:
-       virtual void init_context_bar_actions(QWidget *parent);
-
        /**
         * Sets the name of the signal.
         */
@@ -64,24 +58,11 @@ public:
 
        const sr_probe* probe() const;
 
-protected:
-
-       /**
-        * Paints a zero axis across the viewport.
-        * @param p the QPainter to paint into.
-        * @param y the y-offset of the axis.
-        * @param left the x-coordinate of the left edge of the view.
-        * @param right the x-coordinate of the right edge of the view.
-        */
-       void paint_axis(QPainter &p, int y, int left, int right);
-
-private slots:
-       void on_text_changed(const QString &text);
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 protected:
        const sr_probe *const _probe;
 
-       QWidgetAction *_name_action;
        QComboBox *_name_widget;
        bool _updating_name_widget;
 };
@@ -89,4 +70,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H