Mercurial > octave-nkf

diff libgui/graphics/GLCanvas.cc @ 19657:6b2d7a5dc62a gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use xevent instead of ev to avoid shadowed warnings
author John W. Eaton <jwe@octave.org>
date Fri, 23 Jan 2015 16:30:26 -0500
parents 709f3a77685d
children 2f4406e9dad6 5d1c7e967742
line wrap: on
line diff
--- a/libgui/graphics/GLCanvas.cc	Fri Jan 23 16:24:46 2015 -0500
+++ b/libgui/graphics/GLCanvas.cc	Fri Jan 23 16:30:26 2015 -0500
@@ -119,31 +119,31 @@
   canvasPaintEvent ();
 }
 
-void GLCanvas::mouseMoveEvent (QMouseEvent* ev)
+void GLCanvas::mouseMoveEvent (QMouseEvent* xevent)
 {
-  canvasMouseMoveEvent (ev);
+  canvasMouseMoveEvent (xevent);
 }
 
-void GLCanvas::mousePressEvent (QMouseEvent* ev)
+void GLCanvas::mousePressEvent (QMouseEvent* xevent)
 {
-  canvasMousePressEvent (ev);
+  canvasMousePressEvent (xevent);
 }
 
-void GLCanvas::mouseReleaseEvent (QMouseEvent* ev)
+void GLCanvas::mouseReleaseEvent (QMouseEvent* xevent)
 {
-  canvasMouseReleaseEvent (ev);
+  canvasMouseReleaseEvent (xevent);
 }
 
-void GLCanvas::keyPressEvent (QKeyEvent* ev)
+void GLCanvas::keyPressEvent (QKeyEvent* xevent)
 {
-  if (! canvasKeyPressEvent (ev))
-    QGLWidget::keyPressEvent (ev);
+  if (! canvasKeyPressEvent (xevent))
+    QGLWidget::keyPressEvent (xevent);
 }
 
-void GLCanvas::keyReleaseEvent (QKeyEvent* ev)
+void GLCanvas::keyReleaseEvent (QKeyEvent* xevent)
 {
-  if (! canvasKeyReleaseEvent (ev))
-    QGLWidget::keyReleaseEvent (ev);
+  if (! canvasKeyReleaseEvent (xevent))
+    QGLWidget::keyReleaseEvent (xevent);
 }
 
 }; // namespace QtHandles