[Scummvm-cvs-logs] SF.net SVN: scummvm:[48275] scummvm/trunk/gui

[fingolfin at users.sourceforge.net]

Revision: 48275
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48275&view=rev
Author:   fingolfin
Date:     2010-03-18 15:04:15 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
GUI: Make GuiObject::_name const, init all members in constructor

Modified Paths:
--------------
    scummvm/trunk/gui/object.cpp
    scummvm/trunk/gui/object.h

Modified: scummvm/trunk/gui/object.cpp
===================================================================
--- scummvm/trunk/gui/object.cpp	2010-03-17 20:29:26 UTC (rev 48274)
+++ scummvm/trunk/gui/object.cpp	2010-03-18 15:04:15 UTC (rev 48275)
@@ -30,8 +30,8 @@
 
 namespace GUI {
 
-GuiObject::GuiObject(const Common::String &name) : _firstWidget(0) {
-	_name = name;
+GuiObject::GuiObject(const Common::String &name)
+	: _x(-1000), _y(-1000), _w(0), _h(0), _name(name), _firstWidget(0) {
 	reflowLayout();
 }
 

Modified: scummvm/trunk/gui/object.h
===================================================================
--- scummvm/trunk/gui/object.h	2010-03-17 20:29:26 UTC (rev 48274)
+++ scummvm/trunk/gui/object.h	2010-03-18 15:04:15 UTC (rev 48275)
@@ -62,7 +62,7 @@
 protected:
 	int16		_x, _y;
 	uint16		_w, _h;
-	Common::String _name;
+	const Common::String _name;
 
 	Widget		*_firstWidget;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.