X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftracetreeitemowner.hpp;h=cfe7bf7b5f5cf0d69ec4acb2faeb61055743092c;hb=ad21e6c1a85b991c0363232baf18ba7edbe2e31a;hp=cbb74427049af1db5b87eaeeb5d6ae0a31075a73;hpb=a8743cd962b2d18082c6ddaeb554d56013919d95;p=pulseview.git
diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index cbb7442..cfe7bf7 100644
--- 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 .
*/
-#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 >
- trace_tree_child_items() const;
+ vector< shared_ptr > 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 item);
+ void add_child_item(shared_ptr item);
/**
* Removes a child item from this object.
*/
- void remove_child_item(std::shared_ptr item);
+ void remove_child_item(shared_ptr item);
virtual void restack_items();
@@ -95,7 +98,7 @@ 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 v_extents() const;
+ pair v_extents() const;
public:
virtual void row_item_appearance_changed(bool label, bool content) = 0;
@@ -103,7 +106,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