Mercurial > octave-libgccjit

comparison libgui/graphics/BaseControl.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 fe0e34be5576
children
comparison
equal deleted inserted replaced
18930:f1edad3b4106 18931:dbb207d10d7c
145 default: 145 default:
146 break; 146 break;
147 } 147 }
148 } 148 }
149 149
150 bool BaseControl::eventFilter (QObject* watched, QEvent* event) 150 bool BaseControl::eventFilter (QObject* watched, QEvent* xevent)
151 { 151 {
152 switch (event->type ()) 152 switch (xevent->type ())
153 { 153 {
154 case QEvent::Resize: 154 case QEvent::Resize:
155 if (m_normalizedFont) 155 if (m_normalizedFont)
156 { 156 {
157 gh_manager::auto_lock lock; 157 gh_manager::auto_lock lock;
162 break; 162 break;
163 case QEvent::MouseButtonPress: 163 case QEvent::MouseButtonPress:
164 { 164 {
165 gh_manager::auto_lock lock; 165 gh_manager::auto_lock lock;
166 166
167 QMouseEvent* m = dynamic_cast<QMouseEvent*> (event); 167 QMouseEvent* m = dynamic_cast<QMouseEvent*> (xevent);
168 graphics_object go = object (); 168 graphics_object go = object ();
169 uicontrol::properties& up = Utils::properties<uicontrol> (go); 169 uicontrol::properties& up = Utils::properties<uicontrol> (go);
170 graphics_object fig = go.get_ancestor ("figure"); 170 graphics_object fig = go.get_ancestor ("figure");
171 171
172 if (m->button () != Qt::LeftButton 172 if (m->button () != Qt::LeftButton
198 case QEvent::MouseMove: 198 case QEvent::MouseMove:
199 if (qWidget<QWidget> ()->hasMouseTracking ()) 199 if (qWidget<QWidget> ()->hasMouseTracking ())
200 { 200 {
201 gh_manager::auto_lock lock; 201 gh_manager::auto_lock lock;
202 202
203 QMouseEvent* m = dynamic_cast<QMouseEvent*> (event); 203 QMouseEvent* m = dynamic_cast<QMouseEvent*> (xevent);
204 graphics_object go = object (); 204 graphics_object go = object ();
205 graphics_object fig = go.get_ancestor ("figure"); 205 graphics_object fig = go.get_ancestor ("figure");
206 206
207 gh_manager::post_set (fig.get_handle (), "currentpoint", 207 gh_manager::post_set (fig.get_handle (), "currentpoint",
208 Utils::figureCurrentPoint (fig, m), false); 208 Utils::figureCurrentPoint (fig, m), false);
213 if (m_keyPressHandlerDefined) 213 if (m_keyPressHandlerDefined)
214 { 214 {
215 gh_manager::auto_lock lock; 215 gh_manager::auto_lock lock;
216 216
217 octave_scalar_map keyData = 217 octave_scalar_map keyData =
218 Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (event)); 218 Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (xevent));
219 graphics_object fig = object ().get_ancestor ("figure"); 219 graphics_object fig = object ().get_ancestor ("figure");
220 220
221 gh_manager::post_set (fig.get_handle (), "currentcharacter", 221 gh_manager::post_set (fig.get_handle (), "currentcharacter",
222 keyData.getfield ("Character"), false); 222 keyData.getfield ("Character"), false);
223 gh_manager::post_callback (m_handle, "keypressfcn", keyData); 223 gh_manager::post_callback (m_handle, "keypressfcn", keyData);
224 } 224 }
225 break; 225 break;
226 default: break; 226 default: break;
227 } 227 }
228 228
229 return Object::eventFilter (watched, event); 229 return Object::eventFilter (watched, xevent);
230 } 230 }
231 231
232 }; // namespace QtHandles 232 }; // namespace QtHandles