X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=564b331cf99e6157c92f857f8126a80700c5efc4;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hp=9e136664f5078b1510dbef92d57c972b61d981ba;hpb=838d0522bf01d4e7550f8c124135debd452f0cac;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 9e13666..564b331 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -32,6 +32,8 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 using std::abs;
 using std::back_inserter;
 using std::copy;
@@ -45,7 +47,8 @@ using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 Viewport::Viewport(View &parent) :
 	ViewWidget(parent),
@@ -202,26 +205,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 		view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
-	assert(e);
+	assert(event);
 
-	if (e->orientation() == Qt::Vertical) {
-		if (e->modifiers() & Qt::ControlModifier) {
+	if (event->orientation() == Qt::Vertical) {
+		if (event->modifiers() & Qt::ControlModifier) {
 			// Vertical scrolling with the control key pressed
 			// is intrepretted as vertical scrolling
 			view_.set_v_offset(-view_.owner_visual_v_offset() -
-				(e->delta() * height()) / (8 * 120));
+				(event->delta() * height()) / (8 * 120));
 		} else {
 			// Vertical scrolling is interpreted as zooming in/out
-			view_.zoom(e->delta() / 120, e->x());
+			view_.zoom(event->delta() / 120, event->x());
 		}
-	} else if (e->orientation() == Qt::Horizontal) {
+	} else if (event->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-			e->delta() * view_.scale() + view_.offset());
+			event->delta() * view_.scale() + view_.offset());
 	}
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv