Mercurial > octave
diff libgui/graphics/GLCanvas.cc @ 19616:709f3a77685d gui-release
avoid shadowed variable warnings in libgui sources
* BaseControl.cc, BaseControl.h, Container.cc, ContextMenu.cc,
Figure.cc, FigureWindow.cc, GLCanvas.cc, GenericEventNotify.h,
Menu.cc, MouseModeActionGroup.cc, Panel.cc, TextEdit.cc, TextEdit.h,
ToolBar.cc: Rename local variables to avoid shadowing class members or
functions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 23 Jan 2015 14:53:10 -0500 |
| parents | 523878f76518 |
| children | 6b2d7a5dc62a |
line wrap: on
line diff
--- a/libgui/graphics/GLCanvas.cc Fri Jan 23 14:37:43 2015 -0500 +++ b/libgui/graphics/GLCanvas.cc Fri Jan 23 14:53:10 2015 -0500 @@ -37,8 +37,8 @@ namespace QtHandles { -GLCanvas::GLCanvas (QWidget* parent, const graphics_handle& handle) - : QGLWidget (parent), Canvas (handle) +GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& gh) + : QGLWidget (xparent), Canvas (gh) { setFocusPolicy (Qt::ClickFocus); } @@ -47,9 +47,9 @@ { } -void GLCanvas::draw (const graphics_handle& handle) +void GLCanvas::draw (const graphics_handle& gh) { - graphics_object go = gh_manager::get_object (handle); + graphics_object go = gh_manager::get_object (gh); if (go) { @@ -119,31 +119,31 @@ canvasPaintEvent (); } -void GLCanvas::mouseMoveEvent (QMouseEvent* event) +void GLCanvas::mouseMoveEvent (QMouseEvent* ev) { - canvasMouseMoveEvent (event); + canvasMouseMoveEvent (ev); } -void GLCanvas::mousePressEvent (QMouseEvent* event) +void GLCanvas::mousePressEvent (QMouseEvent* ev) { - canvasMousePressEvent (event); + canvasMousePressEvent (ev); } -void GLCanvas::mouseReleaseEvent (QMouseEvent* event) +void GLCanvas::mouseReleaseEvent (QMouseEvent* ev) { - canvasMouseReleaseEvent (event); + canvasMouseReleaseEvent (ev); } -void GLCanvas::keyPressEvent (QKeyEvent* event) +void GLCanvas::keyPressEvent (QKeyEvent* ev) { - if (! canvasKeyPressEvent (event)) - QGLWidget::keyPressEvent (event); + if (! canvasKeyPressEvent (ev)) + QGLWidget::keyPressEvent (ev); } -void GLCanvas::keyReleaseEvent (QKeyEvent* event) +void GLCanvas::keyReleaseEvent (QKeyEvent* ev) { - if (! canvasKeyReleaseEvent (event)) - QGLWidget::keyReleaseEvent (event); + if (! canvasKeyReleaseEvent (ev)) + QGLWidget::keyReleaseEvent (ev); } }; // namespace QtHandles