fix 1243587 and misc fixes

[inkscape.git] / src / dom / io / domstream.h

diff --git a/src/dom/io/domstream.h b/src/dom/io/domstream.h
index 05862f9449b2af99eba34aa7076af38de57c638a..273782b6776872aa3660300d5fb4f3ad05f0ac77 100644 (file)
--- a/src/dom/io/domstream.h
+++ b/src/dom/io/domstream.h
@@ -12,7 +12,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-2007 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -215,7 +215,7 @@ public:
     /**
      * Send one byte to the destination stream.
      */
-    virtual void put(XMLCh ch) = 0;
+    virtual int put(XMLCh ch) = 0;
 
 
 }; // class OutputStream
@@ -238,7 +238,7 @@ public:
 
     virtual void flush();
 
-    virtual void put(XMLCh ch);
+    virtual int put(XMLCh ch);
 
 protected:
 
@@ -264,8 +264,8 @@ public:
     void flush()
         { }
 
-    void put(XMLCh ch)
-        {  putchar(ch); }
+    int put(XMLCh ch)
+        {  putchar(ch); return 1; }
 
 };
 
@@ -489,10 +489,10 @@ public:
 
     virtual void flush() = 0;
 
-    virtual void put(XMLCh ch) = 0;
+    virtual int put(XMLCh ch) = 0;
 
     /* Formatted output */
-    virtual Writer& printf(char *fmt, ...) = 0;
+    virtual Writer& printf(const DOMString &fmt, ...) = 0;
 
     virtual Writer& writeChar(char val) = 0;
 
@@ -539,12 +539,12 @@ public:
 
     virtual void flush();
 
-    virtual void put(XMLCh ch);
+    virtual int put(XMLCh ch);
 
 
 
     /* Formatted output */
-    virtual Writer &printf(char *fmt, ...);
+    virtual Writer &printf(const DOMString &fmt, ...);
 
     virtual Writer& writeChar(char val);
 
@@ -626,7 +626,7 @@ public:
 
     virtual void flush();
 
-    virtual void put(XMLCh ch);
+    virtual int put(XMLCh ch);
 
 
 private:
@@ -654,7 +654,7 @@ public:
     virtual void flush();
 
 
-    virtual void put(XMLCh ch);
+    virtual int put(XMLCh ch);
 
 
 private: