Ticket #1831: kml_variable_fixes.diff

ogr/ogrsf_frmts/kml/kmlnode.cpp

@@ -112 +112 @@
-}
-
-KMLnode::~KMLnode() {
-
+
+
-    {
-z
+nCount
-    }
-    delete(this->pvpoChildren);
-    delete(this->pvsContent);
-unsigned short z = 0; z < this->pvoAttributes->size();z
+nCount = 0; nCount < this->pvoAttributes->size(); nCount
-    {
-z
+nCount
-    }
-    delete(this->pvoAttributes);
-    if(this->psExtent != NULL)
@@ -129 +130 @@
-
-void KMLnode::print(unsigned int what) {
-    std::string indent("");
-
+
+
-        indent += " ";
-    if(this->nLevel > 0) {
-        if(this->nLayerNumber > -1)
@@ -157 +159 @@
-            indent.c_str(), this->sName.c_str(), Nodetype2String(this->eType).c_str(), this->nLevel, this->pvpoChildren->size(), 
-            this->pvsContent->size(), this->pvoAttributes->size());
-    if(what == 1 || what == 3)
-unsigned int z = 0; z < this->pvsContent->size(); z
-z
+nCount = 0; nCount < this->pvsContent->size(); nCount
+nCount
-    if(what == 2 || what == 3)
-unsigned int z = 0; z < this->pvoAttributes->size(); z
-z)->sName.c_str(), this->pvoAttributes->at(z
-unsigned int z = 0; z < this->pvpoChildren->size(); z
-z
+nCount = 0; nCount < this->pvoAttributes->size(); nCount
+nCount)->sName.c_str(), this->pvoAttributes->at(nCount
+nCount = 0; nCount < this->pvpoChildren->size(); nCount
+nCount
-}
-
-void KMLnode::classify(KML *kmlclass) {
@@ -171 +173 @@
-    
-    CPLDebug("KML", "Start -- sName: %s\tnLevel: %d\t", this->sName.c_str(), this->nLevel);
-
-z = 0; z < this->pvpoChildren->size(); z
+nCount = 0; nCount < this->pvpoChildren->size(); nCount
-        // Leafs are ignored
-z
+nCount
-            continue;
-        // Classify pvpoChildren
-z
+nCount
-
-        if(kmlclass->isContainer(this->sName))
-z
+nCount
-        else if(kmlclass->isFeatureContainer(this->sName)) {
-z
-z
+nCount
+nCount
-                    curr = Point;
-z
+nCount
-                    curr = LineString;
-z
+nCount
-                    curr = Polygon;
-            } else if(kmlclass->isContainer(this->sName))
-z
+nCount
-        } else if(kmlclass->isFeature(this->sName) || kmlclass->isRest(this->sName))
-            curr = Empty;
-            
@@ -211 +213 @@
-}
-
-void KMLnode::eliminateEmpty(KML *kmlclass) {
-z = 0; z < this->pvpoChildren->size(); z
-z
-z
-z
-z)->sName.c_str(), Nodetype2String(this->pvpoChildren->at(z)->eType).c_str(), this->pvpoChildren->at(z
-z
-z
-z
+nCount = 0; nCount < this->pvpoChildren->size(); nCount
+nCount
+nCount
+nCount
+nCount)->sName.c_str(), Nodetype2String(this->pvpoChildren->at(nCount)->eType).c_str(), this->pvpoChildren->at(nCount
+nCount
+nCount
+nCount
-        } else
-z
+nCount
-    }
-    this->calcExtent(kmlclass);
-}