Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / view / ruler.hpp

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index cf63eaff7c7cb27ae0b2ec451801bda05b23677d..923cceb5fc3d37abb998d239ae8e490ab9e5d027 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -30,9 +30,9 @@
 #include <pv/util.hpp>
 
 namespace RulerTest {
-class tick_position_test_0;
-class tick_position_test_1;
-class tick_position_test_2;
+struct tick_position_test_0;
+struct tick_position_test_1;
+struct tick_position_test_2;
 }
 
 namespace pv {
@@ -45,9 +45,9 @@ class Ruler : public MarginWidget
 {
        Q_OBJECT
 
-       friend class RulerTest::tick_position_test_0;
-       friend class RulerTest::tick_position_test_1;
-       friend class RulerTest::tick_position_test_2;
+       friend struct RulerTest::tick_position_test_0;
+       friend struct RulerTest::tick_position_test_1;
+       friend struct RulerTest::tick_position_test_2;
 
 private:
 
@@ -63,14 +63,14 @@ public:
        Ruler(View &parent);
 
 public:
-       QSize sizeHint() const;
+       QSize sizeHint() const override;
 
        /**
         * The extended area that the header widget would like to be sized to.
         * @remarks This area is the area specified by sizeHint, extended by
         * the area to overlap the viewport.
         */
-       QSize extended_size_hint() const;
+       QSize extended_size_hint() const override;
 
        /**
         * Formats a timestamp depending on its distance to another timestamp.
@@ -109,7 +109,7 @@ private:
        /**
         * Gets the time items.
         */
-       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+       std::vector< std::shared_ptr<pv::view::ViewItem> > items() override;
 
        /**
         * Gets the first view item which has a label that contains @c pt .
@@ -118,11 +118,11 @@ private:
         *   @c shared_ptr if no item was found.
         */
        std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt);
+               const QPoint &pt) override;
 
-       void paintEvent(QPaintEvent *event);
+       void paintEvent(QPaintEvent *event) override;
 
-       void mouseDoubleClickEvent(QMouseEvent *e);
+       void mouseDoubleClickEvent(QMouseEvent *event) override;
 
        /**
         * Draw a hover arrow under the cursor position.