Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/cursor.hpp b/pv/view/cursor.hpp
index b23bd642b47130446a21b8fcf7b67c812acb7dc5..319d3a746aaae4f74c254cfb294891bd3025efae 100644 (file)
--- a/pv/view/cursor.hpp
+++ b/pv/view/cursor.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_CURSOR_H
-#define PULSEVIEW_PV_VIEW_CURSOR_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP
 
 #include "timemarker.hpp"
 
@@ -30,7 +30,8 @@
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Cursor : public TimeMarker
 {
@@ -63,13 +64,14 @@ public:
         * @param rect The rectangle of the ruler client area.
         * @return Returns the label rectangle.
         */
-       QRectF get_label_rect(const QRect &rect) const;
+       QRectF label_rect(const QRectF &rect) const;
 
 private:
        std::shared_ptr<Cursor> get_other_cursor() const;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSOR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSOR_HPP