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 328d428f0e52ca547c48840d5a4071e247c78e14..ec34fb5668a1a89a6db2f03bc21753e8a0dfe4ce 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -51,8 +51,6 @@ protected:
        TimeMarker(View &view, const QColor &colour, double time);
 
 public:
-       virtual void init_context_bar_actions(QWidget *parent);
-       
        /**
         * Gets the time of the marker.
         */
@@ -63,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.
@@ -86,16 +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);
 
-private slots:
+private Q_SLOTS:
        void on_value_changed(double value);
 
-signals:
+Q_SIGNALS:
        void time_changed();
 
 protected: