X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=5abcc86a5ec9d3253581a6da6d2c948f95bbb8c5;hp=87f1ff3dcab20fac2c065a5daadb0525534e56f8;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hpb=af503b104d890a357c736c678bb00296d889c090

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 87f1ff3d..5abcc86a 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -33,7 +33,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int TraceGroup::Padding = 8;
 const int TraceGroup::Width = 12;
@@ -49,7 +50,7 @@ TraceGroup::~TraceGroup()
 bool TraceGroup::enabled() const
 {
 	return std::any_of(child_items().begin(), child_items().end(),
-		[](const shared_ptr<TraceTreeItem> &r) { return r->enabled(); });
+		[](const shared_ptr<ViewItem> &r) { return r->enabled(); });
 }
 
 pv::Session& TraceGroup::session()
@@ -64,13 +65,13 @@ const pv::Session& TraceGroup::session() const
 	return owner_->session();
 }
 
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
 {
 	assert(owner_);
 	return owner_->view();
 }
 
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
 {
 	assert(owner_);
 	return owner_->view();
@@ -115,7 +116,7 @@ void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
 QRectF TraceGroup::label_rect(const QRectF &rect) const
 {
 	QRectF child_rect;
-	for (const shared_ptr<TraceTreeItem> r : child_items())
+	for (const shared_ptr<ViewItem> r : child_items())
 		if (r && r->enabled())
 			child_rect = child_rect.united(r->label_rect(rect));
 
@@ -157,15 +158,14 @@ int TraceGroup::owner_visual_v_offset() const
 
 void TraceGroup::restack_items()
 {
-	vector< shared_ptr<TraceTreeItem> > items(
-		child_items().begin(), child_items().end());
+	vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 
 	// Sort by the centre line of the extents
 	stable_sort(items.begin(), items.end(),
 		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			const auto aext = a->v_extents();
 			const auto bext = b->v_extents();
-                        return a->layout_v_offset() +
+			return a->layout_v_offset() +
 					(aext.first + aext.second) / 2 <
 				b->layout_v_offset() +
 					(bext.first + bext.second) / 2;
@@ -197,8 +197,7 @@ unsigned int TraceGroup::depth() const
 
 void TraceGroup::ungroup()
 {
-	const vector< shared_ptr<TraceTreeItem> > items(
-		child_items().begin(), child_items().end());
+	const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 	clear_child_items();
 
 	for (shared_ptr<TraceTreeItem> r : items)
@@ -224,5 +223,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
 		owner_->extents_changed(horz, vert);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv