Changeset 12915 for issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp

Timestamp:

08/06/12 15:34:22 (13 years ago)

Author:

jschierm

Message:

Implementation of xNew and xDelete in KML classes.

File:

• issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp

@@ -38 +38 @@
         if (list) {
 //              delete list;
-                if (list      ) xfree((void**)&list);
                 list      =NULL;
         }
         if (balloon) {
 //              delete balloon;
-                if (balloon   ) xfree((void**)&balloon);
                 balloon   =NULL;
         }
@@ -56 +54 @@
         if (label) {
 //              delete label;
-                if (label     ) xfree((void**)&label);
                 label     =NULL;
         }
         if (icon) {
 //              delete icon;
-                if (icon      ) xfree((void**)&icon);
                 icon      =NULL;
         }
@@ -189 +185 @@
                                                           &ncom,&pcom)) {
                 if      (!strncmp(kstri,"</Style", 7)) {
-                        xfree((void**)&kstri);
+                        xDelete<char>(kstri);
                         break;
                 }
@@ -230 +226 @@
                         KML_StyleSelector::Read(fid,kstri);
 
-                xfree((void**)&kstri);
+                xDelete<char>(kstri);
         }
 
@@ -236 +232 @@
 
         for (ncom; ncom>0; ncom--)
-                xfree((void**)&(pcom[ncom-1]));
-        xfree((void**)&pcom);
-
-        return;
-}
-/*}}}*/
+                xDelete<char>(pcom[ncom-1]);
+        xDelete<char*>(pcom);
+
+        return;
+}
+/*}}}*/