Avoid string literal char* warnings on g++-4.2: change some functions to take char...

diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp
index c6234d462e652a7b46384af026d203777c098b03..c35a3d148d19fb83fc0293c700a102b8b22f4d44 100644 (file)
--- a/src/dom/io/domstream.cpp
+++ b/src/dom/io/domstream.cpp
@@ -896,7 +896,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);

diff --git a/src/dom/svg/svgparser.cpp b/src/dom/svg/svgparser.cpp
index 350277f47d1610bc5a92d46db2771eeebe3957e6..e263f1481b89c77c7e9056284015f0a5a8f42be6 100644 (file)
--- a/src/dom/svg/svgparser.cpp
+++ b/src/dom/svg/svgparser.cpp
@@ -54,7 +54,7 @@ namespace svg
 /**
  *
  */
-void SvgParser::error(char *fmt, ...)
+void SvgParser::error(char const *fmt, ...)
 {
     va_list args;
     fprintf(stderr, "SvgParser:error:");

diff --git a/src/dom/svg/svgparser.h b/src/dom/svg/svgparser.h
index 2b7119040ba92e7da7f2ad797d66535554cc057d..bd230c4e667ac04c489a552261ed9628df72dc88 100644 (file)
--- a/src/dom/svg/svgparser.h
+++ b/src/dom/svg/svgparser.h
@@ -122,7 +122,7 @@ private:
     /**
      *
      */
-    void error(char *format, ...)
+    void error(char const *format, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif

diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp
index fc4c7bad4ada74b5c186aaf2266c6977b1fe1812..a51d12986978f8ea48c38fd0e3a41887f2ea4bc2 100644 (file)
--- a/src/dom/util/ziptool.cpp
+++ b/src/dom/util/ziptool.cpp
@@ -231,7 +231,7 @@ private:
     /**
      *
      */
-    void error(char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
@@ -240,7 +240,7 @@ private:
     /**
      *
      */
-    void trace(char *fmt, ...)
+    void trace(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
@@ -314,7 +314,7 @@ Inflater::~Inflater()
 /**
  *
  */
-void Inflater::error(char *fmt, ...)
+void Inflater::error(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -327,7 +327,7 @@ void Inflater::error(char *fmt, ...)
 /**
  *
  */
-void Inflater::trace(char *fmt, ...)
+void Inflater::trace(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -844,13 +844,13 @@ public:
 private:
 
     //debug messages
-    void error(char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
     ;
 
-    void trace(char *fmt, ...)
+    void trace(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
@@ -982,7 +982,7 @@ bool Deflater::deflate(std::vector<unsigned char> &dest,
 /**
  *  Print error messages
  */
-void Deflater::error(char *fmt, ...)
+void Deflater::error(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -995,7 +995,7 @@ void Deflater::error(char *fmt, ...)
 /**
  *  Print trace messages
  */
-void Deflater::trace(char *fmt, ...)
+void Deflater::trace(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -1427,7 +1427,7 @@ GzipFile::~GzipFile()
 /**
  *  Print error messages
  */
-void GzipFile::error(char *fmt, ...)
+void GzipFile::error(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -1440,7 +1440,7 @@ void GzipFile::error(char *fmt, ...)
 /**
  *  Print trace messages
  */
-void GzipFile::trace(char *fmt, ...)
+void GzipFile::trace(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -2172,7 +2172,7 @@ std::vector<ZipEntry *> &ZipFile::getEntries()
 //# M E S S A G E S
 //#####################################
 
-void ZipFile::error(char *fmt, ...)
+void ZipFile::error(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -2182,7 +2182,7 @@ void ZipFile::error(char *fmt, ...)
     va_end(args);
 }
 
-void ZipFile::trace(char *fmt, ...)
+void ZipFile::trace(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);

diff --git a/src/dom/util/ziptool.h b/src/dom/util/ziptool.h
index f8cf01cc84b9268ed669ccf705490603feb2e33f..6cef266cff00779fc023e31ac6a270ad336d95db 100644 (file)
--- a/src/dom/util/ziptool.h
+++ b/src/dom/util/ziptool.h
@@ -203,13 +203,13 @@ private:
     std::string fileName;
 
     //debug messages
-    void error(char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
     ;
 
-    void trace(char *fmt, ...)
+    void trace(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
@@ -478,12 +478,12 @@ public:
 private:
 
     //debug messages
-    void error(char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
     ;
-    void trace(char *fmt, ...)
+    void trace(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif

diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index e233515c96243c62b3741ce89f478011756e253f..58d19be325fa79740dee78654349ec22e983febf 100644 (file)
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -884,12 +884,12 @@ int SingularValueDecomposition::rank()
 /**
  * Get the value of a node/attribute pair
  */
-static Glib::ustring getAttribute( Inkscape::XML::Node *node, char *attrName)
+static Glib::ustring getAttribute( Inkscape::XML::Node *node, char const *attrName)
 {
     Glib::ustring val;
-    char *valstr = (char *)node->attribute(attrName);
+    char const *valstr = node->attribute(attrName);
     if (valstr)
-        val = (const char *)valstr;
+        val = valstr;
     return val;
 }
 
@@ -1175,7 +1175,7 @@ bool OdfOutput::writeManifest(ZipFile &zf)
         else if (ext == ".jpg")
             outs.printf("image/jpeg");
         outs.printf("\" manifest:full-path=\"");
-        outs.printf((char *)newName.c_str());
+        outs.printf(newName.c_str());
         outs.printf("\"/>\n");
         }
     outs.printf("</manifest:manifest>\n");

diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index e527101f6e54626d41aacab9c485cdf361f22281..c89dd70fcddf6e196224e5822ee6dac1260f7c1a 100644 (file)
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -509,7 +509,7 @@ void BasicWriter::put(gunichar ch)
 /**
  * Provide printf()-like formatting
  */ 
-Writer &BasicWriter::printf(char *fmt, ...)
+Writer &BasicWriter::printf(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
@@ -708,7 +708,7 @@ Writer& operator<< (Writer &writer, Glib::ustring &val)
 Writer& operator<< (Writer &writer, std::string &val)
     { return writer.writeStdString(val); }
 
-Writer& operator<< (Writer &writer, char *val)
+Writer& operator<< (Writer &writer, char const *val)
     { return writer.writeString(val); }
 
 Writer& operator<< (Writer &writer, bool val)

diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index 9c624af8f222696322d2aff3d608a0fdce49f643..4388a281567285d7d9c53814678438dc7be0c8db 100644 (file)
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -475,7 +475,7 @@ public:
     virtual void put(gunichar ch) = 0;
     
     /* Formatted output */
-    virtual Writer& printf(char *fmt, ...) G_GNUC_PRINTF(2,3) = 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, ...) G_GNUC_PRINTF(2,3);
+    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);