clean up tabs and DOS-ishness

[inkscape.git] / src / io / inkscapestream.h

diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index ad213dad95234b72dbd876356c677fc6d0f5f628..67c51cc7fa0bf33d463e2c29dd27e39814bc711d 100644 (file)
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -27,7 +27,7 @@ public:
         { reason = theReason; }
     StreamException(Glib::ustring &theReason) throw()
         { reason = theReason; }
-    ~StreamException() throw()
+    virtual ~StreamException() throw()
         {  }
     char const *what() const throw()
         { return reason.c_str(); }
@@ -424,7 +424,7 @@ public:
 
     StdReader();
 
-    ~StdReader();
+    virtual ~StdReader();
     
     /*Overload these 3 for your implementation*/
     virtual int available();
@@ -475,7 +475,7 @@ public:
     virtual void put(gunichar ch) = 0;
     
     /* Formatted output */
-    virtual Writer& printf(char *fmt, ...) = 0;
+    virtual Writer& printf(char const *fmt, ...) G_GNUC_PRINTF(2,3) = 0;
 
     virtual Writer& writeChar(char val) = 0;
 
@@ -531,7 +531,7 @@ public:
     
     
     /* Formatted output */
-    virtual Writer &printf(char *fmt, ...);
+    virtual Writer &printf(char const *fmt, ...) G_GNUC_PRINTF(2,3);
 
     virtual Writer& writeChar(char val);
 
@@ -579,7 +579,7 @@ Writer& operator<< (Writer &writer, Glib::ustring &val);
 
 Writer& operator<< (Writer &writer, std::string &val);
 
-Writer& operator<< (Writer &writer, char *val);
+Writer& operator<< (Writer &writer, char const *val);
 
 Writer& operator<< (Writer &writer, bool val);
 
@@ -636,7 +636,7 @@ class StdWriter : public BasicWriter
 public:
     StdWriter();
 
-    ~StdWriter();
+    virtual ~StdWriter();
 
 
     virtual void close();