Mercurial > octave-nkf

diff libgui/graphics/ToolBar.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 fb96b7f55242
children af0399a5aae0
line wrap: on
line diff
--- a/libgui/graphics/ToolBar.cc	Fri Jan 23 14:37:43 2015 -0500
+++ b/libgui/graphics/ToolBar.cc	Fri Jan 23 14:53:10 2015 -0500
@@ -118,21 +118,21 @@
     }
 }
 
-bool ToolBar::eventFilter (QObject* watched, QEvent* event)
+bool ToolBar::eventFilter (QObject* watched, QEvent* ev)
 {
   if (watched == qObject ())
     {
-      switch (event->type ())
+      switch (ev->type ())
 	{
 	case QEvent::ActionAdded:
 	case QEvent::ActionRemoved:
 	    {
-	      QActionEvent* ae = dynamic_cast<QActionEvent*> (event);
+	      QActionEvent* ae = dynamic_cast<QActionEvent*> (ev);
 	      QToolBar* bar = qWidget<QToolBar> ();
 
 	      if (ae->action () != m_empty)
 		{
-		  if (event->type () == QEvent::ActionAdded)
+		  if (ev->type () == QEvent::ActionAdded)
 		    {
 		      if (bar->actions ().size () == 2)
 			QTimer::singleShot (0, this, SLOT (hideEmpty (void)));