Author: cazfi
Date: Fri Nov  6 22:10:26 2015
New Revision: 30451

URL: http://svn.gna.org/viewcvs/freeciv?rev=30451&view=rev
Log:
Fixed shadow warning from the ruledit.

Reported by Jacob Nevins <jtn>

See patch #6542

Modified:
    trunk/tools/ruledit/ruledit_qt.cpp
    trunk/tools/ruledit/ruledit_qt.h

Modified: trunk/tools/ruledit/ruledit_qt.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.cpp?rev=30451&r1=30450&r2=30451&view=diff
==============================================================================
--- trunk/tools/ruledit/ruledit_qt.cpp  (original)
+++ trunk/tools/ruledit/ruledit_qt.cpp  Fri Nov  6 22:10:26 2015
@@ -292,11 +292,11 @@
 /**************************************************************************
   User clicked windows close button.
 **************************************************************************/
-void ruledit_main::closeEvent(QCloseEvent *event)
+void ruledit_main::closeEvent(QCloseEvent *cevent)
 {
   // Handle quit via confirmation dialog.
   popup_quit_dialog();
 
   // Do not handle quit here, but let user to answer to confirmation dialog.
-  event->ignore();
-}
+  cevent->ignore();
+}

Modified: trunk/tools/ruledit/ruledit_qt.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.h?rev=30451&r1=30450&r2=30451&view=diff
==============================================================================
--- trunk/tools/ruledit/ruledit_qt.h    (original)
+++ trunk/tools/ruledit/ruledit_qt.h    Fri Nov  6 22:10:26 2015
@@ -47,7 +47,7 @@
   QWidget *central;
 
 protected:
-  void closeEvent(QCloseEvent *event);
+  void closeEvent(QCloseEvent *cevent);
 };
 
 class ruledit_gui : public QObject


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to