Mercurial > octave-libgccjit
diff libgui/graphics/TextEdit.cc @ 18931:dbb207d10d7c
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 |
line wrap: on
line diff
--- a/libgui/graphics/TextEdit.cc Thu Jul 17 09:33:27 2014 -0400 +++ b/libgui/graphics/TextEdit.cc Thu Jul 17 10:27:24 2014 -0400 @@ -31,20 +31,20 @@ namespace QtHandles { -void TextEdit::focusOutEvent (QFocusEvent* event) +void TextEdit::focusOutEvent (QFocusEvent* xevent) { - QTextEdit::focusOutEvent (event); + QTextEdit::focusOutEvent (xevent); emit editingFinished (); } -void TextEdit::keyPressEvent (QKeyEvent* event) +void TextEdit::keyPressEvent (QKeyEvent* xevent) { - QTextEdit::keyPressEvent (event); + QTextEdit::keyPressEvent (xevent); - if ((event->key () == Qt::Key_Return - || event->key () == Qt::Key_Enter) - && event->modifiers () == Qt::ControlModifier) + if ((xevent->key () == Qt::Key_Return + || xevent->key () == Qt::Key_Enter) + && xevent->modifiers () == Qt::ControlModifier) emit editingFinished (); }