Mercurial > octave-nkf

diff libgui/graphics/Panel.cc @ 19650:709f3a77685d gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/Panel.cc	Fri Jan 23 14:37:43 2015 -0500
+++ b/libgui/graphics/Panel.cc	Fri Jan 23 14:53:10 2015 -0500
@@ -144,13 +144,13 @@
 {
 }
 
-bool Panel::eventFilter (QObject* watched, QEvent* event)
+bool Panel::eventFilter (QObject* watched, QEvent* ev)
 {
   if (! m_blockUpdates)
     {
       if (watched == qObject ())
 	{
-	  switch (event->type ())
+	  switch (ev->type ())
 	    {
 	    case QEvent::Resize:
 		{
@@ -179,7 +179,7 @@
 	      break;
 	    case QEvent::MouseButtonPress:
 		{
-		  QMouseEvent* m = dynamic_cast<QMouseEvent*> (event);
+		  QMouseEvent* m = dynamic_cast<QMouseEvent*> (ev);
 
 		  if (m->button () == Qt::RightButton)
 		    {
@@ -195,7 +195,7 @@
 	}
       else if (watched == m_container)
 	{
-	  switch (event->type ())
+	  switch (ev->type ())
 	    {
 	    case QEvent::Resize:
 	      if (qWidget<QWidget> ()->isVisible ())