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

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 30d96eb3..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),
@@ -223,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;
 }
 
@@ -267,16 +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();
+	assert(event);
+	mouse_point_ = event->pos();
 
-	if (!e->buttons())
-		item_hover(get_mouse_over_item(e->pos()));
-	else if (e->buttons() & Qt::LeftButton) {
+	if (!event->buttons())
+		item_hover(get_mouse_over_item(event->pos()));
+	else if (event->buttons() & Qt::LeftButton) {
 		if (!item_dragging_) {
-			if ((e->pos() - mouse_down_point_).manhattanLength() <
+			if ((event->pos() - mouse_down_point_).manhattanLength() <
 				QApplication::startDragDistance())
 				return;
 
@@ -287,7 +289,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 		}
 
 		// Do the drag
-		drag_items(e->pos() - mouse_down_point_);
+		drag_items(event->pos() - mouse_down_point_);
 	}
 }
 
@@ -297,5 +299,6 @@ void ViewWidget::leaveEvent(QEvent*)
 	update();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv