summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPeter Moulder <peter.moulder@monash.edu>2008-06-05 06:34:50 +0000
committerpjrm <pjrm@users.sourceforge.net>2008-06-05 06:34:50 +0000
commit955a0d1c0aa807fa77f326515d631eb678ea5491 (patch)
treee116a71e870de5a97a98271c9aba015c11c42fb2 /src
parentaddress a warning (diff)
downloadinkscape-955a0d1c0aa807fa77f326515d631eb678ea5491.tar.gz
inkscape-955a0d1c0aa807fa77f326515d631eb678ea5491.zip
address some cast-away-const warnings.
(bzr r5814)
Diffstat (limited to 'src')
-rw-r--r--src/pedro/pedrodom.cpp2
-rw-r--r--src/pedro/pedrodom.h2
-rw-r--r--src/pedro/pedroxmpp.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/pedro/pedrodom.cpp b/src/pedro/pedrodom.cpp
index 7a66a50d5..1131e66b8 100644
--- a/src/pedro/pedrodom.cpp
+++ b/src/pedro/pedrodom.cpp
@@ -246,7 +246,7 @@ void Parser::getLineAndColumn(long pos, long *lineNr, long *colNr)
}
-void Parser::error(char *fmt, ...)
+void Parser::error(char const *fmt, ...)
{
long lineNr;
long colNr;
diff --git a/src/pedro/pedrodom.h b/src/pedro/pedrodom.h
index e82115ede..91ad21da2 100644
--- a/src/pedro/pedrodom.h
+++ b/src/pedro/pedrodom.h
@@ -320,7 +320,7 @@ private:
void getLineAndColumn(long pos, long *lineNr, long *colNr);
- void error(char *fmt, ...) G_GNUC_PRINTF(2,3);
+ void error(char const *fmt, ...) G_GNUC_PRINTF(2,3);
int peek(long pos);
diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index 2b8719002..3baeeee06 100644
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -1162,7 +1162,7 @@ bool XmppClient::processIq(Element *root)
"IQ set does not contain a 'from' address because "
"the entity is not registered with the server");
}
- error("%s",(char *)errMsg.c_str());
+ error("%s", errMsg.c_str());
}
else if (id.find("regcancel") != id.npos)
@@ -1201,7 +1201,7 @@ bool XmppClient::processIq(Element *root)
"IQ set does not contain a 'from' address because "
"the entity is not registered with the server");
}
- error("%s",(char *)errMsg.c_str());
+ error("%s", errMsg.c_str());
}
return true;
@@ -1394,7 +1394,7 @@ bool XmppClient::inBandRegistrationNew()
{
errMsg.append("some registration information was not provided");
}
- error("%s",(char *)errMsg.c_str());
+ error("%s", errMsg.c_str());
delete elem;
return false;
}