New Dutch calligraphy and interpolate tutorial

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

diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp
index c6234d462e652a7b46384af026d203777c098b03..b38dd532920f606145bc78f01b3661d610c431bc 100644 (file)
--- a/src/dom/io/domstream.cpp
+++ b/src/dom/io/domstream.cpp
@@ -10,7 +10,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-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
@@ -34,11 +34,12 @@
  *
  */
 
+#include <cstdio>
 #include <math.h>
 #include <stdarg.h>
 
 #include "domstream.h"
-#include "dom/charclass.h"
+#include "dom/ucd.h"
 
 namespace org
 {
@@ -72,11 +73,11 @@ void pipeStream(InputStream &source, OutputStream &dest)
 //# F O R M A T T E D    P R I N T I N G
 //#########################################################################
 
-static char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+static char const *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 static int dprintInt(Writer &outs,
                      long arg, int base,
-                     int flag, int width, int precision)
+                     int flag, int width, int /*precision*/)
 {
 
     DOMString buf;
@@ -217,7 +218,7 @@ static int dprintDouble(Writer &outs, double val,
  * XML entities.
  */
 static int dprintString(Writer &outs, const DOMString &str,
-                        int flags, int width, int precision)
+                        int flags, int /*width*/, int /*precision*/)
 {
     int len = str.size();
     if (flags == '#')
@@ -598,7 +599,7 @@ DOMString BasicReader::readWord()
     while (available() > 0)
         {
         XMLCh ch = get();
-        if (isWhitespace(ch))
+        if (uni_is_space(ch))
             break;
         str.push_back(ch);
         }
@@ -896,7 +897,7 @@ int BasicWriter::put(XMLCh ch)
  * Provide printf()-like formatting
  */
 /*
-Writer &BasicWriter::printf(char *fmt, ...)
+Writer &BasicWriter::printf(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);