Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index cf63eaff7c7cb27ae0b2ec451801bda05b23677d..f6ce99dc833985b2175a13a55078128e6d2f96ff 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-#ifndef PULSEVIEW_PV_VIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP

 
 #include <functional>
 #include <memory>
 
 #include <functional>
 #include <memory>


@@ -30,13 +30,14 @@
 #include <pv/util.hpp>
 
 namespace RulerTest {
 #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 {
 }
 
 namespace pv {

-namespace view {
+namespace views {
+namespace TraceView {

 
 class TimeItem;
 class ViewItem;
 
 class TimeItem;
 class ViewItem;


@@ -45,9 +46,9 @@ class Ruler : public MarginWidget
 {
        Q_OBJECT
 
 {
        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:
 
 
 private:
 


@@ -63,14 +64,14 @@ public:
        Ruler(View &parent);
 
 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.
         */
 
        /**
         * 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.
 
        /**
         * Formats a timestamp depending on its distance to another timestamp.


@@ -109,7 +110,7 @@ private:
        /**
         * Gets the time items.
         */
        /**
         * Gets the time items.
         */

-       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+       std::vector< std::shared_ptr<ViewItem> > items() override;

 
        /**
         * Gets the first view item which has a label that contains @c pt .
 
        /**
         * Gets the first view item which has a label that contains @c pt .


@@ -117,12 +118,12 @@ private:
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */

-       std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt);
+       std::shared_ptr<ViewItem> get_mouse_over_item(
+               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.
 
        /**
         * Draw a hover arrow under the cursor position.


@@ -174,7 +175,8 @@ private Q_SLOTS:
        void invalidate_tick_position_cache();
 };
 
        void invalidate_tick_position_cache();
 };
 

-} // namespace view
+} // namespace TraceView
+} // namespace views

 } // namespace pv
 
 } // namespace pv
 

-#endif // PULSEVIEW_PV_VIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP