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 54b9c248529ff3e4a6c87d3fef5a1f274c626ca2..ec34fb5668a1a89a6db2f03bc21753e8a0dfe4ce 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -61,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.
@@ -84,10 +86,12 @@ public:
        virtual void paint_label(QPainter &p, const QRect &rect,
                unsigned int prefix) = 0;
 
-private slots:
+       pv::widgets::Popup* create_popup(QWidget *parent);
+
+private Q_SLOTS:
        void on_value_changed(double value);
 
-signals:
+Q_SIGNALS:
        void time_changed();
 
 protected: