Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/tracetreeitem.hpp b/pv/view/tracetreeitem.hpp
index 3632ded2f3fb51553ec402a3126f25165561fdf5..56e1d73cbf2831e6785e009361a8e6ad28b0e338 100644 (file)
--- a/pv/view/tracetreeitem.hpp
+++ b/pv/view/tracetreeitem.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACETREEITEM_HPP
-#define PULSEVIEW_PV_VIEW_TRACETREEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
 
 #include <memory>
 
@@ -28,12 +28,13 @@
 #include "rowitem.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TraceTreeItemOwner;
 
 class TraceTreeItem : public RowItem,
-       public std::enable_shared_from_this<pv::view::TraceTreeItem>
+       public std::enable_shared_from_this<TraceTreeItem>
 {
        Q_OBJECT
        Q_PROPERTY(int visual_v_offset
@@ -47,7 +48,7 @@ public:
        TraceTreeItem();
 
        /**
-        * Gets the owner this item in the view item hierachy.
+        * Gets the owner of this item in the view item hierachy.
         */
        TraceTreeItemOwner* owner() const;
 
@@ -91,7 +92,7 @@ public:
         * Sets the owner this trace in the view trace hierachy.
         * @param The new owner of the trace.
         */
-       void set_owner(pv::view::TraceTreeItemOwner *owner);
+       void set_owner(TraceTreeItemOwner *owner);
 
        /**
         * Gets the visual y-offset of the axis.
@@ -111,7 +112,7 @@ public:
        QPoint point(const QRect &rect) const;
 
        /**
-     * Sets the new background colour state: false means dark, true means bright.
+        * Sets the new background colour state: false = dark, true = bright.
         * This is to allow for alternating backgrounds but has no effect
         * when coloured background colours are used.
         * @param state New bg color state to use.
@@ -136,7 +137,8 @@ private:
        QPropertyAnimation v_offset_animation_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACETREEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP