Rearrange to enable code that does not directly rely on lcms.

[inkscape.git] / src / dom / xmlreader.h

diff --git a/src/dom/xmlreader.h b/src/dom/xmlreader.h
old mode 100755 (executable)
new mode 100644 (file)
index 4b80081..3f97d87
--- a/src/dom/xmlreader.h
+++ b/src/dom/xmlreader.h
@@ -13,7 +13,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -30,7 +30,6 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "dom.h"
 
 namespace org
@@ -64,27 +63,31 @@ public:
     /**
      *
      */
-    org::w3c::dom::Document *parse(const DOMString &buf,
+    org::w3c::dom::DocumentPtr parse(const DOMString &buf,
                             int offset, int length);
 
     /**
      *
      */
-    org::w3c::dom::Document *parse(const DOMString &buf);
+    org::w3c::dom::DocumentPtr parse(const DOMString &buf);
 
     /**
      *
      */
-    org::w3c::dom::Document *parseFile(char *fileName);
+    org::w3c::dom::DocumentPtr parseFile(const DOMString &fileName);
 
 
-protected:
+private:
 
-    void error(char *format, ...);
+    void error(const char *format, ...)
+    #ifdef G_GNUC_PRINTF
+    G_GNUC_PRINTF(2, 3)
+    #endif
+    ;
 
     int  get(int ch);
     int  peek(int ch);
-    bool match(int pos, char *str);
+    bool match(int pos, char const *str);
 
     int  skipwhite(int ch);
     int  getWord(int pos, DOMString &result);
@@ -97,15 +100,15 @@ protected:
     int parseVersion(int pos);
     int parseDoctype(int pos);
 
-    int parseCDATA  (int pos, CDATASection *cdata);
-    int parseComment(int pos, Comment *comment);
-    int parseText(int pos, Text *test);
+    int parseCDATA  (int pos, CDATASectionPtr cdata);
+    int parseComment(int pos, CommentPtr comment);
+    int parseText(int pos, TextPtr text);
 
     int parseEntity(int pos, DOMString &buf);
 
-    int parseAttributes(int p0, Node *node, bool *quickClose);
+    int parseAttributes(int p0, NodePtr node, bool *quickClose);
 
-    int parseNode(int p0, Node *node, int depth);
+    int parseNode(int p0, NodePtr node, int depth);
 
     bool       keepGoing;
     bool       parseAsData;
@@ -113,12 +116,12 @@ protected:
     int        len;   //length of parsed region
     DOMString  parsebuf;
 
-    DOMString  loadFile(char *fileName);
+    DOMString  loadFile(const DOMString &fileName);
 
     int        lineNr;
     int        colNr;
 
-    Document *document;
+    DocumentPtr document;
 
 };