Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index 3e7927a8794a13659764b8801856c90c78ad06e3..58a656d084d0259fa73c29c1d2d46b49dfa05191 100644 (file)
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.hpp
@@ -14,21 +14,25 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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"
 
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TraceTreeItem;
 class View;
@@ -39,24 +43,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.
@@ -71,8 +75,7 @@ public:
        /**
         * Returns a list of row items owned by this object.
         */
-       std::vector< std::shared_ptr<TraceTreeItem> >
-       trace_tree_child_items() const;
+       vector< shared_ptr<TraceTreeItem> > trace_tree_child_items() const;
 
        /**
         * Clears the list of child items.
@@ -82,12 +85,12 @@ public:
        /**
         * Adds a child item to this object.
         */
-       void add_child_item(std::shared_ptr<TraceTreeItem> item);
+       void add_child_item(shared_ptr<TraceTreeItem> item);
 
        /**
         * Removes a child item from this object.
         */
-       void remove_child_item(std::shared_ptr<TraceTreeItem> item);
+       void remove_child_item(shared_ptr<TraceTreeItem> item);
 
        virtual void restack_items();
 
@@ -95,12 +98,12 @@ public:
         * Computes the vertical extents of the contents of this row item owner.
         * @return A pair containing the minimum and maximum y-values.
         */
-       std::pair<int, int> v_extents() const;
+       pair<int, int> v_extents() const;
 
        /*
         * 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 +114,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