Mercurial > octave-nkf
diff libgui/graphics/BaseControl.cc @ 19650: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 | 1f8ce7be9c00 |
| children | af0399a5aae0 |
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc Fri Jan 23 14:37:43 2015 -0500 +++ b/libgui/graphics/BaseControl.cc Fri Jan 23 14:53:10 2015 -0500 @@ -147,9 +147,9 @@ } } -bool BaseControl::eventFilter (QObject* watched, QEvent* event) +bool BaseControl::eventFilter (QObject* watched, QEvent* ev) { - switch (event->type ()) + switch (ev->type ()) { case QEvent::Resize: if (m_normalizedFont) @@ -164,7 +164,7 @@ { gh_manager::auto_lock lock; - QMouseEvent* m = dynamic_cast<QMouseEvent*> (event); + QMouseEvent* m = dynamic_cast<QMouseEvent*> (ev); graphics_object go = object (); uicontrol::properties& up = Utils::properties<uicontrol> (go); graphics_object fig = go.get_ancestor ("figure"); @@ -200,7 +200,7 @@ { gh_manager::auto_lock lock; - QMouseEvent* m = dynamic_cast<QMouseEvent*> (event); + QMouseEvent* m = dynamic_cast<QMouseEvent*> (ev); graphics_object go = object (); graphics_object fig = go.get_ancestor ("figure"); @@ -215,7 +215,7 @@ gh_manager::auto_lock lock; octave_scalar_map keyData = - Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (event)); + Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (ev)); graphics_object fig = object ().get_ancestor ("figure"); gh_manager::post_set (fig.get_handle (), "currentcharacter", @@ -226,7 +226,7 @@ default: break; } - return Object::eventFilter (watched, event); + return Object::eventFilter (watched, ev); } }; // namespace QtHandles