remove VC6 scoping hacks

2004-09-21 07:53:39 +00:00
parent f97eaed01d
commit 03fbb915f3
55 changed files with 162 additions and 266 deletions
@@ -154,25 +154,15 @@ XNode::~XNode()

 void XNode::Close()
 {
-    unsigned i;
-
-	for( i = 0 ; i < childs.size(); i ++)
+    for( unsigned i = 0 ; i < childs.size(); i ++)
 	{
-		XNode *p = childs[i];
-		if( p )
-		{
-			delete p; childs[i] = NULL;
-		}
+		SAFE_DELETE( childs[i] );
 	}
 	childs.clear();
 	
-	for( i = 0 ; i < attrs.size(); i ++)
+	for( unsigned i = 0 ; i < attrs.size(); i ++)
 	{
-		XAttr *p = attrs[i];
-		if( p )
-		{
-			delete p; attrs[i] = NULL;
-		}
+		SAFE_DELETE( attrs[i] );
 	}
 	attrs.clear();
 }