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

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

diff --git a/pv/view/timemarker.h b/pv/view/timemarker.h
index f12fa2965693b7d7580b3b8638c8c9174f5f8561..ec34fb5668a1a89a6db2f03bc21753e8a0dfe4ce 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -22,8 +22,10 @@
 #define PULSEVIEW_PV_VIEW_MARKER_H
 
 #include <QColor>
+#include <QDoubleSpinBox>
 #include <QObject>
 #include <QRectF>
+#include <QWidgetAction>
 
 #include "selectableitem.h"
 
@@ -59,6 +61,8 @@ public:
         */
        void set_time(double time);
 
+       float get_x() const;
+
        /**
         * Paints the marker to the viewport.
         * @param p The painter to draw with.
@@ -82,13 +86,12 @@ public:
        virtual void paint_label(QPainter &p, const QRect &rect,
                unsigned int prefix) = 0;
 
-       /**
-        * Returns a list of context menu items to show in the context
-        * bar.
-        */
-       const std::list<QAction*> get_context_bar_actions();
+       pv::widgets::Popup* create_popup(QWidget *parent);
 
-signals:
+private Q_SLOTS:
+       void on_value_changed(double value);
+
+Q_SIGNALS:
        void time_changed();
 
 protected:
@@ -98,6 +101,10 @@ protected:
        double _time;
 
        QSizeF _text_size;
+
+       QWidgetAction *_value_action;
+       QDoubleSpinBox *_value_widget;
+       bool _updating_value_widget;
 };
 
 } // namespace view