Massive update for smart pointers. Rework js dom binding to be smarter. Placeholder for dom binding, finish later.

(bzr r1692)

4 files changed, 19 insertions, 21 deletions

diff --git a/src/dom/work/testdom.cpp b/src/dom/work/testdom.cpp
index d3e8d99f3..bd6cf6bfb 100644
--- a/src/dom/work/testdom.cpp
+++ b/src/dom/work/testdom.cpp
@@ -57,7 +57,7 @@ bool doTest(char *filename)
     input.setStringData(buf);
 
     printf("######## PARSE ######################################\n");
-    Document *doc = parser.parse(input);
+    DocumentPtr doc = parser.parse(input);
 
     if (!doc)
         {
@@ -80,14 +80,11 @@ bool doTest(char *filename)
     printf("Nodes:%d\n", nodeCount);
     for (int i=0; i<nodeCount ; i++)
         {
-        Node *node = list.item(i);
+        NodePtr node = list.item(i);
         serializer.write(node, output);
         }
 
 
-
-
-    delete doc;
     return 1;
 }
 
diff --git a/src/dom/work/testjs.cpp b/src/dom/work/testjs.cpp
index 7532da423..aba4ce97c 100644
--- a/src/dom/work/testjs.cpp
+++ b/src/dom/work/testjs.cpp
@@ -59,7 +59,7 @@ bool doTest1()
     input.setStringData(buf);
 
     printf("######## PARSE ######################################\n");
-    Document *doc = parser.parse(input);
+    DocumentPtr doc = parser.parse(input);
 
     if (!doc)
         {
@@ -82,11 +82,10 @@ bool doTest1()
     printf("Nodes:%d\n", nodeCount);
     for (int i=0; i<nodeCount ; i++)
         {
-        Node *node = list.item(i);
+        NodePtr node = list.item(i);
         serializer.write(node, output);
         }
 
-    delete doc;
     return true;
 }
 
diff --git a/src/dom/work/testsvg.cpp b/src/dom/work/testsvg.cpp
index f3ab46a64..b347d2415 100644
--- a/src/dom/work/testsvg.cpp
+++ b/src/dom/work/testsvg.cpp
@@ -57,7 +57,7 @@ bool doTest(char *filename)
     input.setStringData(buf);
 
     printf("######## PARSE ######################################\n");
-    Document *doc = parser.parse(input);
+    DocumentPtr doc = parser.parse(input);
 
     if (!doc)
         {
@@ -74,7 +74,6 @@ bool doTest(char *filename)
     serializer.write(doc, output);
 
 
-    delete doc;
     return 1;
 }
 
diff --git a/src/dom/work/testxpath.cpp b/src/dom/work/testxpath.cpp
index 380dc77e1..626176920 100644
--- a/src/dom/work/testxpath.cpp
+++ b/src/dom/work/testxpath.cpp
@@ -36,16 +36,18 @@
 #include <stdio.h>
 
 
-typedef org::w3c::dom::Node      Node;
-typedef org::w3c::dom::NodeList  NodeList;
-typedef org::w3c::dom::DOMString DOMString;
-typedef org::w3c::dom::Document  Document;
+typedef org::w3c::dom::Node          Node;
+typedef org::w3c::dom::NodePtr       NodePtr;
+typedef org::w3c::dom::NodeList      NodeList;
+typedef org::w3c::dom::DOMString     DOMString;
+typedef org::w3c::dom::Document      Document;
+typedef org::w3c::dom::DocumentPtr   DocumentPtr;
 typedef org::w3c::dom::io::StdWriter StdWriter;
 typedef org::w3c::dom::ls::DOMImplementationLSImpl DOMImplementationLSImpl;
 typedef org::w3c::dom::ls::LSSerializer LSSerializer;
-typedef org::w3c::dom::ls::LSOutput LSOutput;
-typedef org::w3c::dom::ls::LSInput LSInput;
-typedef org::w3c::dom::ls::LSParser LSParser;
+typedef org::w3c::dom::ls::LSOutput  LSOutput;
+typedef org::w3c::dom::ls::LSInput   LSInput;
+typedef org::w3c::dom::ls::LSParser  LSParser;
 typedef org::w3c::dom::xpath::XPathParser XPathParser;
 
 
@@ -1355,7 +1357,7 @@ bool doStringTests()
     return true;
 }
 
-void dumpDoc(Document *doc)
+bool dumpDoc(DocumentPtr doc)
 {
     DOMImplementationLSImpl domImpl;
     LSSerializer &serializer = domImpl.createLSSerializer();
@@ -1363,6 +1365,8 @@ void dumpDoc(Document *doc)
     StdWriter writer;
     output.setCharacterStream(&writer);
     serializer.write(doc, output);
+
+    return true;
 }
 
 
@@ -1375,7 +1379,7 @@ bool doXmlTest(XpathTest *xpt)
     LSInput input = domImpl.createLSInput();
     LSParser &parser = domImpl.createLSParser(0, "");
     input.setStringData(xpt->xml);
-    Document *doc = parser.parse(input);
+    DocumentPtr doc = parser.parse(input);
 
     //### XPATH
     XPathParser xp;
@@ -1385,13 +1389,12 @@ bool doXmlTest(XpathTest *xpt)
     NodeList list = xp.evaluate(doc, xpathStr);
     for (unsigned int i=0 ; i<list.getLength() ; i++)
         {
-        Node *n = list.item(i);
+        NodePtr n = list.item(i);
         printf("@@ node: %s\n", n->getNodeName().c_str());
         }
 
     //dumpDoc(doc);
 
-    delete doc;
     return true;
 }