Author: cazfi
Date: Fri Nov 6 22:10:32 2015
New Revision: 30452
URL: http://svn.gna.org/viewcvs/freeciv?rev=30452&view=rev
Log:
Fixed shadow warning from the ruledit.
Reported by Jacob Nevins <jtn>
See patch #6542
Modified:
branches/S2_6/tools/ruledit/ruledit_qt.cpp
branches/S2_6/tools/ruledit/ruledit_qt.h
Modified: branches/S2_6/tools/ruledit/ruledit_qt.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/ruledit_qt.cpp?rev=30452&r1=30451&r2=30452&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/ruledit_qt.cpp (original)
+++ branches/S2_6/tools/ruledit/ruledit_qt.cpp Fri Nov 6 22:10:32 2015
@@ -286,11 +286,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: branches/S2_6/tools/ruledit/ruledit_qt.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/ruledit_qt.h?rev=30452&r1=30451&r2=30452&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/ruledit_qt.h (original)
+++ branches/S2_6/tools/ruledit/ruledit_qt.h Fri Nov 6 22:10:32 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
