diff options
| author | Peter Moulder <peter.moulder@monash.edu> | 2007-10-11 13:46:40 +0000 |
|---|---|---|
| committer | pjrm <pjrm@users.sourceforge.net> | 2007-10-11 13:46:40 +0000 |
| commit | c3899dac849638c01931b598ff7e4a4c4a484d93 (patch) | |
| tree | 35e8e08fcf85ab1db7750a79509f900eb9baee2e /src/io | |
| parent | Fix g_return_if_fail failure: It can validly happen that fit_canvas_to_select... (diff) | |
| download | inkscape-c3899dac849638c01931b598ff7e4a4c4a484d93.tar.gz inkscape-c3899dac849638c01931b598ff7e4a4c4a484d93.zip | |
Avoid string literal char* warnings on g++-4.2: change some functions to take char const* rather than char*.
(bzr r3874)
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/inkscapestream.cpp | 4 | ||||
| -rw-r--r-- | src/io/inkscapestream.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp index e527101f6..c89dd70fc 100644 --- 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 9c624af8f..4388a2815 100644 --- 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); |
