[Scummvm-cvs-logs] SF.net SVN: scummvm:[45637] scummvm/trunk/engines/sci/gui/gui_menu.h
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Nov 3 21:47:10 CET 2009
Revision: 45637
http://scummvm.svn.sourceforge.net/scummvm/?rev=45637&view=rev
Author: fingolfin
Date: 2009-11-03 20:47:10 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
SCI: Fix warning (declaration of 'FOO' shadows a member of 'this')
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui_menu.h
Modified: scummvm/trunk/engines/sci/gui/gui_menu.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_menu.h 2009-11-03 20:13:14 UTC (rev 45636)
+++ scummvm/trunk/engines/sci/gui/gui_menu.h 2009-11-03 20:47:10 UTC (rev 45637)
@@ -46,8 +46,8 @@
uint16 id;
Common::String text;
- GuiMenuEntry(uint16 id)
- : id(id) { }
+ GuiMenuEntry(uint16 id_)
+ : id(id_) { }
};
typedef Common::List<GuiMenuEntry *> GuiMenuList;
@@ -63,8 +63,8 @@
Common::String text;
Common::String textRightAligned;
- GuiMenuItemEntry(uint16 menuId, uint16 id)
- : menuId(menuId), id(id),
+ GuiMenuItemEntry(uint16 menuId_, uint16 id_)
+ : menuId(menuId_), id(id_),
enabled(true), tag(0), keyPress(0), keyModifier(0), separatorLine(false) { }
};
typedef Common::List<GuiMenuItemEntry *> GuiMenuItemList;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list