trivial: Address some g++-4.2 writable-strings warnings.

diff --git a/src/dom/cssparser.cpp b/src/dom/cssparser.cpp
index d6aaac13d51d55b4adc85eea25493d782b8f2d91..7aed0dd22716bb360079a6dcf995de68623d925f 100644 (file)
--- a/src/dom/cssparser.cpp
+++ b/src/dom/cssparser.cpp
@@ -76,7 +76,7 @@ void CssParser::getColumnAndRow(int p, int &colResult, int &rowResult, int &last
 /**
  *
  */
-void CssParser::error(char *fmt, ...)
+void CssParser::error(char const *fmt, ...)
 {
     int lineNr;
     int colNr;

diff --git a/src/dom/cssparser.h b/src/dom/cssparser.h
index f03b243da5230c8dc9ae428dcc5308757ed78dc2..6c7db16f9151ddf263d5beccaef02274f696cf69 100644 (file)
--- a/src/dom/cssparser.h
+++ b/src/dom/cssparser.h
@@ -81,7 +81,7 @@ private:
     /**
      *
      */
-    void error(char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif

diff --git a/src/dom/lsimpl.cpp b/src/dom/lsimpl.cpp
index 84d12ddfb0f4dd1db8e44d7815ed8efca3a874e1..40b4648145d2710c84f5034436ea362283096fbc 100644 (file)
--- a/src/dom/lsimpl.cpp
+++ b/src/dom/lsimpl.cpp
@@ -272,7 +272,7 @@ void LSSerializerImpl::spaces()
 /**
  *
  */
-void LSSerializerImpl::po(char *fmt, ...)
+void LSSerializerImpl::po(char const *fmt, ...)
 {
     char str[257];
     va_list args;

diff --git a/src/dom/lsimpl.h b/src/dom/lsimpl.h
index 0dd0dc62cb38b658c5d6a443a7112fefd23fc445..2375a1d49b0bc0b7fa8070f2aef58a609d15a32c 100644 (file)
--- a/src/dom/lsimpl.h
+++ b/src/dom/lsimpl.h
@@ -236,7 +236,7 @@ private:
 
     void spaces();
 
-    void po(char *fmt, ...)
+    void po(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif

diff --git a/src/dom/svg/svgparser.cpp b/src/dom/svg/svgparser.cpp
index a6e0171104c4c4e53c29d7e40e31138038aaf773..350277f47d1610bc5a92d46db2771eeebe3957e6 100644 (file)
--- a/src/dom/svg/svgparser.cpp
+++ b/src/dom/svg/svgparser.cpp
@@ -89,7 +89,7 @@ XMLCh SvgParser::get(int p)
  *  Test if the given substring exists at the given position
  *  in parsebuf.  Use get() in case of out-of-bounds
  */
-bool SvgParser::match(int pos, char *str)
+bool SvgParser::match(int pos, char const *str)
 {
     while (*str)
        {

diff --git a/src/dom/svg/svgparser.h b/src/dom/svg/svgparser.h
index 548077dd5f2a78ac17a0be47c8e9340229573424..2b7119040ba92e7da7f2ad797d66535554cc057d 100644 (file)
--- a/src/dom/svg/svgparser.h
+++ b/src/dom/svg/svgparser.h
@@ -88,7 +88,7 @@ private:
      *  Test if the given substring exists at the given position
      *  in parsebuf.  Use get() in case of out-of-bounds
      */
-    bool match(int pos, char *str);
+    bool match(int pos, char const *str);
 
     /**
      *

diff --git a/src/dom/svg/svgtypes.h b/src/dom/svg/svgtypes.h
index bb169885d7ccf22fde8eed31376fd5b11f5732a4..59fe38ab5e9aebc869c9abcb5d758a65c747baf6 100644 (file)
--- a/src/dom/svg/svgtypes.h
+++ b/src/dom/svg/svgtypes.h
@@ -4013,7 +4013,7 @@ protected:
 ###########################################################################
 #########################################################################*/
 
-static char *pathSegLetters[] =
+static char const *const pathSegLetters[] =
 {
     "@", // PATHSEG_UNKNOWN,
     "z", // PATHSEG_CLOSEPATH
@@ -4091,7 +4091,7 @@ public:
         int typ = type;
         if (typ<0 || typ>PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL)
             typ = PATHSEG_UNKNOWN;
-        char *ch = pathSegLetters[typ];
+        char const *ch = pathSegLetters[typ];
         DOMString letter = ch;
         return letter;
         }

diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp
index 9eff6b8b0c0142f396f415b67b4e84d2efef8041..e68caf898a375b48b477e673e71d658648b19e75 100644 (file)
--- a/src/dom/uri.cpp
+++ b/src/dom/uri.cpp
@@ -49,7 +49,7 @@ namespace dom
 typedef struct
 {
     int  ival;
-    char *sval;
+    char const *sval;
     int  port;
 } LookupEntry;
 
@@ -572,7 +572,7 @@ int URI::peek(int p)
 
 
 
-int URI::match(int p0, char *key)
+int URI::match(int p0, char const *key)
 {
     int p = p0;
     while (p < parselen)

diff --git a/src/dom/uri.h b/src/dom/uri.h
index 87a287b39b476fc9425e58dceded57ade800ac88..10d13365c12331ee042ff8afa41132aa34ca4e61 100644 (file)
--- a/src/dom/uri.h
+++ b/src/dom/uri.h
@@ -70,23 +70,23 @@ public:
     /**
      *
      */
-    URI(const DOMString &str);
+    URI(DOMString const &str);
 
 
     /**
      *
      */
-    URI(const char *str);
+    URI(char const *str);
 
     /**
      * Copy constructor
      */
-    URI(const URI &other);
+    URI(URI const &other);
 
     /**
      *  Assignment
      */
-    URI &operator=(const URI &other);
+    URI &operator=(URI const &other);
 
     /**
      *
@@ -96,7 +96,7 @@ public:
     /**
      *
      */
-    virtual bool parse(const DOMString &str);
+    virtual bool parse(DOMString const &str);
 
     /**
      *
@@ -162,7 +162,7 @@ public:
     /**
      *
      */
-    virtual URI resolve(const URI &other) const;
+    virtual URI resolve(URI const &other) const;
 
     /**
      *
@@ -174,7 +174,7 @@ private:
     void init();
 
     //assign values of other to this. used by copy constructor
-    void assign(const URI &other);
+    void assign(URI const &other);
 
     int scheme;
 
@@ -196,13 +196,13 @@ private:
 
     std::vector<int> fragment;
 
-    void error(const char *fmt, ...)
+    void error(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
     ;
 
-    void trace(const char *fmt, ...)
+    void trace(char const *fmt, ...)
     #ifdef G_GNUC_PRINTF
     G_GNUC_PRINTF(2, 3)
     #endif
@@ -210,7 +210,7 @@ private:
 
     int peek(int p);
 
-    int match(int p, char *key);
+    int match(int p, char const *key);
 
     int parseHex(int p, int &result);