Enable icon disk cache by default.

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

diff --git a/src/dom/xmlreader.h b/src/dom/xmlreader.h
index f616fd1e12c8712e22262e7538252c255f54afde..3f97d87c9c6a4b2a7be2baaa8c786966e3bd127e 100644 (file)
--- 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,8 +30,6 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <glib.h>
-
 #include "dom.h"
 
 namespace org
@@ -76,16 +74,20 @@ public:
     /**
      *
      */
-    org::w3c::dom::DocumentPtr parseFile(char *fileName);
+    org::w3c::dom::DocumentPtr parseFile(const DOMString &fileName);
 
 
-protected:
+private:
 
-    void error(char *format, ...) G_GNUC_PRINTF(2,3);
+    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);
@@ -114,7 +116,7 @@ protected:
     int        len;   //length of parsed region
     DOMString  parsebuf;
 
-    DOMString  loadFile(char *fileName);
+    DOMString  loadFile(const DOMString &fileName);
 
     int        lineNr;
     int        colNr;