X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.hpp;h=b5f1a3ad7124ac45cc994e752581ae959917eace;hp=3e7927a8794a13659764b8801856c90c78ad06e3;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hpb=ac0708fb7e6b4010d90a569386810d3d2edc7eb9

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index 3e7927a8..b5f1a3ad 100644
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP
 
 #include "viewitemowner.hpp"
 #include "tracetreeitem.hpp"
@@ -28,7 +28,8 @@ namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TraceTreeItem;
 class View;
@@ -39,24 +40,24 @@ public:
 	/**
 	 * Returns the view of the owner.
 	 */
-	virtual pv::view::View* view() = 0;
+	virtual View* view() = 0;
 
 	/**
 	 * Returns the view of the owner.
 	 */
-	virtual const pv::view::View* view() const = 0;
+	virtual const View* view() const = 0;
 
 	virtual int owner_visual_v_offset() const = 0;
 
 	/**
-	 * Returns the session of the onwer.
+	 * Returns the session of the owner.
 	 */
-	virtual pv::Session& session() = 0;
+	virtual Session& session() = 0;
 
 	/**
 	 * Returns the session of the owner.
 	 */
-	virtual const pv::Session& session() const = 0;
+	virtual const Session& session() const = 0;
 
 	/**
 	 * Returns the number of nested parents that this row item owner has.
@@ -100,7 +101,7 @@ public:
 	/*
 	 * Reassigns background color states to all its children, thereby
 	 * providing them with alternating backgrounds.
-	 * @param next_brightness_state First brightness state to use.
+	 * @param next_bgcolour_state First brightness state to use.
 	 * @return The next brightness state to use.
 	 */
 	bool reassign_bgcolour_states(bool next_bgcolour_state);
@@ -111,7 +112,8 @@ public:
 	virtual void extents_changed(bool horz, bool vert) = 0;
 };
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACETREEITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEMOWNER_HPP