From: pjrm Date: Thu, 5 Jun 2008 06:34:50 +0000 (+0000) Subject: address some cast-away-const warnings. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3315993e8f21e481d720443d84531af481d17a29;p=inkscape.git address some cast-away-const warnings. --- 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; }