summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPeter Moulder <peter.moulder@monash.edu>2008-04-13 11:28:59 +0000
committerpjrm <pjrm@users.sourceforge.net>2008-04-13 11:28:59 +0000
commitff7e02ab10911493c1252e9b5475168b3ab3105e (patch)
tree22540e7e5476c9b02413eee585d6ae3ddec389de /src
parentRewrote code to get rid of 32/64 bit problems, and to make is more stream-lik... (diff)
downloadinkscape-ff7e02ab10911493c1252e9b5475168b3ab3105e.tar.gz
inkscape-ff7e02ab10911493c1252e9b5475168b3ab3105e.zip
address some char* string literal warnings.
(bzr r5414)
Diffstat (limited to 'src')
-rw-r--r--src/dom/xmlreader.cpp2
-rw-r--r--src/dom/xmlreader.h2
-rw-r--r--src/registrytool.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dom/xmlreader.cpp b/src/dom/xmlreader.cpp
index c6eae8ba3..825851479 100644
--- a/src/dom/xmlreader.cpp
+++ b/src/dom/xmlreader.cpp
@@ -156,7 +156,7 @@ int XmlReader::peek(int p)
* Test if the given substring exists at the given position
* in parsebuf. Use peek() in case of out-of-bounds
*/
-bool XmlReader::match(int pos, char *str)
+bool XmlReader::match(int pos, char const *str)
{
while (*str)
{
diff --git a/src/dom/xmlreader.h b/src/dom/xmlreader.h
index 16ab883a0..fbd62c179 100644
--- a/src/dom/xmlreader.h
+++ b/src/dom/xmlreader.h
@@ -87,7 +87,7 @@ private:
int get(int ch);
int peek(int ch);
- bool match(int pos, char *str);
+ bool match(int pos, char const *str);
int skipwhite(int ch);
int getWord(int pos, DOMString &result);
diff --git a/src/registrytool.cpp b/src/registrytool.cpp
index 7f6ff8a9a..84af86eff 100644
--- a/src/registrytool.cpp
+++ b/src/registrytool.cpp
@@ -167,8 +167,8 @@ void testReg()
RegistryTool rt;
char *key =
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\inkscape.exe";
- char *name = "";
- char *value = "c:\\inkscape\\inkscape.exe";
+ char const *name = "";
+ char const *value = "c:\\inkscape\\inkscape.exe";
if (!rt.setStringValue(key, name, value))
{
printf("Test failed\n");