Mercurial > octave-libgccjit

comparison libgui/graphics/GLCanvas.cc @ 18931:dbb207d10d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate some shadowed variable declaration warnings * BaseControl.cc, Container.cc, ContextMenu.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, GenericEventNotify.h, Menu.cc, MouseModeActionGroup.cc, Panel.cc, TextEdit.cc, TextEdit.h, ToolBar.cc: Avoid shadowed variable declaration warnings.
author John W. Eaton <jwe@octave.org>
date Thu, 17 Jul 2014 10:27:24 -0400
parents 523878f76518
children
comparison
equal deleted inserted replaced
18930:f1edad3b4106 18931:dbb207d10d7c
35 #include "gl-select.h" 35 #include "gl-select.h"
36 36
37 namespace QtHandles 37 namespace QtHandles
38 { 38 {
39 39
40 GLCanvas::GLCanvas (QWidget* parent, const graphics_handle& handle) 40 GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& xhandle)
41 : QGLWidget (parent), Canvas (handle) 41 : QGLWidget (xparent), Canvas (xhandle)
42 { 42 {
43 setFocusPolicy (Qt::ClickFocus); 43 setFocusPolicy (Qt::ClickFocus);
44 } 44 }
45 45
46 GLCanvas::~GLCanvas (void) 46 GLCanvas::~GLCanvas (void)
47 { 47 {
48 } 48 }
49 49
50 void GLCanvas::draw (const graphics_handle& handle) 50 void GLCanvas::draw (const graphics_handle& xhandle)
51 { 51 {
52 graphics_object go = gh_manager::get_object (handle); 52 graphics_object go = gh_manager::get_object (xhandle);
53 53
54 if (go) 54 if (go)
55 { 55 {
56 opengl_renderer r; 56 opengl_renderer r;
57 57
117 void GLCanvas::paintGL (void) 117 void GLCanvas::paintGL (void)
118 { 118 {
119 canvasPaintEvent (); 119 canvasPaintEvent ();
120 } 120 }
121 121
122 void GLCanvas::mouseMoveEvent (QMouseEvent* event) 122 void GLCanvas::mouseMoveEvent (QMouseEvent* xevent)
123 { 123 {
124 canvasMouseMoveEvent (event); 124 canvasMouseMoveEvent (xevent);
125 } 125 }
126 126
127 void GLCanvas::mousePressEvent (QMouseEvent* event) 127 void GLCanvas::mousePressEvent (QMouseEvent* xevent)
128 { 128 {
129 canvasMousePressEvent (event); 129 canvasMousePressEvent (xevent);
130 } 130 }
131 131
132 void GLCanvas::mouseReleaseEvent (QMouseEvent* event) 132 void GLCanvas::mouseReleaseEvent (QMouseEvent* xevent)
133 { 133 {
134 canvasMouseReleaseEvent (event); 134 canvasMouseReleaseEvent (xevent);
135 } 135 }
136 136
137 void GLCanvas::keyPressEvent (QKeyEvent* event) 137 void GLCanvas::keyPressEvent (QKeyEvent* xevent)
138 { 138 {
139 if (! canvasKeyPressEvent (event)) 139 if (! canvasKeyPressEvent (xevent))
140 QGLWidget::keyPressEvent (event); 140 QGLWidget::keyPressEvent (xevent);
141 } 141 }
142 142
143 void GLCanvas::keyReleaseEvent (QKeyEvent* event) 143 void GLCanvas::keyReleaseEvent (QKeyEvent* xevent)
144 { 144 {
145 if (! canvasKeyReleaseEvent (event)) 145 if (! canvasKeyReleaseEvent (xevent))
146 QGLWidget::keyReleaseEvent (event); 146 QGLWidget::keyReleaseEvent (xevent);
147 } 147 }
148 148
149 }; // namespace QtHandles 149 }; // namespace QtHandles