X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=69e345660ab3558cf677ef66a2d7b7083602b65a;hb=a8743cd962b2d18082c6ddaeb554d56013919d95;hp=e364d6385f61eb9768b5b0afc9995adda4840bee;hpb=e8b969a9ae4e0a683eabddc8ded7babaf03844fd;p=pulseview.git

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index e364d63..69e3456 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -22,7 +22,7 @@
 #include <QMouseEvent>
 #include <QTouchEvent>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
 #include "view.hpp"
 #include "viewwidget.hpp"
 
@@ -64,9 +64,12 @@ void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 bool ViewWidget::accept_drag() const
 {
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+		view_.list_by_type<TraceTreeItem>());
 
-	const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
-		[](const shared_ptr<RowItem> &r) { return r->selected(); });
+	const bool any_row_items_selected = any_of(
+		trace_tree_items.begin(), trace_tree_items.end(),
+		[](const shared_ptr<TraceTreeItem> &r) { return r->selected(); });
 
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
 		[](const shared_ptr<TimeItem> &i) { return i->selected(); });
@@ -74,12 +77,12 @@ bool ViewWidget::accept_drag() const
 	if (any_row_items_selected && !any_time_items_selected)
 	{
 		// Check all the drag items share a common owner
-		RowItemOwner *item_owner = nullptr;
-		for (shared_ptr<RowItem> r : view_)
+		TraceTreeItemOwner *item_owner = nullptr;
+		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 			if (r->dragging()) {
 				if (!item_owner)
 					item_owner = r->owner();
-				else if(item_owner != r->owner())
+				else if (item_owner != r->owner())
 					return false;
 			}
 
@@ -105,8 +108,10 @@ void ViewWidget::drag_items(const QPoint &delta)
 	bool item_dragged = false;
 
 	// Drag the row items
-	RowItemOwner *item_owner = nullptr;
-	for (std::shared_ptr<RowItem> r : view_)
+	TraceTreeItemOwner *item_owner = nullptr;
+	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+		view_.list_by_type<TraceTreeItem>());
+	for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 		if (r->dragging()) {
 			item_owner = r->owner();
 			r->drag_by(delta);
@@ -118,7 +123,7 @@ void ViewWidget::drag_items(const QPoint &delta)
 	if (item_owner) {
 		item_dragged = true;
 		item_owner->restack_items();
-		for (const auto &r : *item_owner)
+		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 			r->animate_to_layout_v_offset();
 	}
 
@@ -201,7 +206,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 		i->drag_release();
 
 	if (item_dragging_)
-		view_.restack_all_row_items();
+		view_.restack_all_trace_tree_items();
 	else
 	{
 		if (!ctrl_pressed) {