[Scummvm-cvs-logs] SF.net SVN: scummvm:[34950] scummvm/trunk/common/xmlparser.h

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Nov 9 13:37:19 CET 2008


Revision: 34950
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34950&view=rev
Author:   fingolfin
Date:     2008-11-09 12:37:19 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
Removed unused XML_GLOBAL_PROP functionality (saves some kilobytes)

Modified Paths:
--------------
    scummvm/trunk/common/xmlparser.h

Modified: scummvm/trunk/common/xmlparser.h
===================================================================
--- scummvm/trunk/common/xmlparser.h	2008-11-09 12:16:51 UTC (rev 34949)
+++ scummvm/trunk/common/xmlparser.h	2008-11-09 12:37:19 UTC (rev 34950)
@@ -56,9 +56,7 @@
 		lay->callback = (&kLocalParserName::parserCallback_##keyName);\
 		layout.top()->children[#keyName] = lay;\
 		layout.push(lay); \
-		_layoutList.push_back(lay);\
-		for (Common::List<XMLKeyLayout::XMLKeyProperty>::const_iterator p = globalProps.begin(); p != globalProps.end(); ++p){\
-			layout.top()->properties.push_back(*p);}
+		_layoutList.push_back(lay);
 		
 #define XML_KEY_RECURSIVE(keyName) {\
 			layout.top()->children[#keyName] = layout.top();\
@@ -72,11 +70,7 @@
 		prop.required = req; \
 		layout.top()->properties.push_back(prop); }
 		
-#define XML_GLOBAL_PROP(propName, req) {\
-		prop.name = #propName; \
-		prop.required = req;\
-		globalProps.push_back(prop); }
-		
+
 	
 #define CUSTOM_XML_PARSER(parserName) \
 	protected: \
@@ -90,7 +84,6 @@
 		Common::Stack<XMLKeyLayout*> layout; \
 		CustomXMLKeyLayout *lay = 0; \
 		XMLKeyLayout::XMLKeyProperty prop; \
-		Common::List<XMLKeyLayout::XMLKeyProperty> globalProps; \
 		_XMLkeys = new CustomXMLKeyLayout; \
 		layout.push(_XMLkeys);
 	
@@ -161,7 +154,9 @@
 		virtual ~XMLKeyLayout() {
 			properties.clear();
 		}
-	} *_XMLkeys;
+	};
+	
+	XMLKeyLayout *_XMLkeys;
 
 	/** Struct representing a parsed node */
 	struct ParserNode {


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