X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=3bd8c6b9d919522909a3578fe69240767f2e7788;hp=2a97eefc2dc1577b4afa7596fedf12a32114914c;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=453b6d63444bf7fb03242761653fd18e9cde7443

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 2a97eefc..3bd8c6b9 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -31,7 +31,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 ViewWidget::ViewWidget(View &parent) :
 	QWidget(&parent),
@@ -73,8 +74,7 @@ bool ViewWidget::accept_drag() const
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
 		[](const shared_ptr<TimeItem> &i) { return i->selected(); });
 
-	if (any_row_items_selected && !any_time_items_selected)
-	{
+	if (any_row_items_selected && !any_time_items_selected) {
 		// Check all the drag items share a common owner
 		TraceTreeItemOwner *item_owner = nullptr;
 		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
@@ -86,9 +86,7 @@ bool ViewWidget::accept_drag() const
 			}
 
 		return true;
-	}
-	else if (any_time_items_selected && !any_row_items_selected)
-	{
+	} else if (any_time_items_selected && !any_row_items_selected) {
 		return true;
 	}
 
@@ -212,8 +210,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 
 	if (item_dragging_)
 		view_.restack_all_trace_tree_items();
-	else
-	{
+	else {
 		if (!ctrl_pressed) {
 			for (shared_ptr<ViewItem> i : items)
 				if (mouse_down_item_ != i)
@@ -227,9 +224,10 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 	item_dragging_ = false;
 }
 
-bool ViewWidget::touch_event(QTouchEvent *e)
+bool ViewWidget::touch_event(QTouchEvent *event)
 {
-	(void)e;
+	(void)event;
+
 	return false;
 }
 
@@ -271,18 +269,16 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 	mouse_down_item_ = nullptr;
 }
 
-void ViewWidget::mouseMoveEvent(QMouseEvent *e)
+void ViewWidget::mouseMoveEvent(QMouseEvent *event)
 {
-	assert(e);
-	mouse_point_ = e->pos();
-
-	if (!e->buttons())
-		item_hover(get_mouse_over_item(e->pos()));
-	else if (e->buttons() & Qt::LeftButton)
-	{
-		if (!item_dragging_)
-		{
-			if ((e->pos() - mouse_down_point_).manhattanLength() <
+	assert(event);
+	mouse_point_ = event->pos();
+
+	if (!event->buttons())
+		item_hover(get_mouse_over_item(event->pos()));
+	else if (event->buttons() & Qt::LeftButton) {
+		if (!item_dragging_) {
+			if ((event->pos() - mouse_down_point_).manhattanLength() <
 				QApplication::startDragDistance())
 				return;
 
@@ -293,9 +289,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 		}
 
 		// Do the drag
-		drag_items(e->pos() - mouse_down_point_);
-
-		update();
+		drag_items(event->pos() - mouse_down_point_);
 	}
 }
 
@@ -305,5 +299,6 @@ void ViewWidget::leaveEvent(QEvent*)
 	update();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv