Fix 'ISO C++11 forbids converting a string constant to char*' warnings

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 16 insertions, 16 deletions

diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index a477527b..b3b22e7b 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -487,7 +487,7 @@ namespace KviTQString
 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
 		//TQChar * p = (TQChar *)s.unicode();
 
-		char *argString;
+		const char *argString;
 		long argValue;
 		unsigned long argUValue;
 	
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 9e491ccb..72d69516 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2118,7 +2118,7 @@ KviStr & KviStr::replaceAll(char c,const char *str)
 	return (*this);
 }
 
-KviStr & KviStr::replaceAll(char *toFind,const char *str,bool bCaseS)
+KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS)
 {
 	int len = (int)strlen(toFind);
 	int idx = findFirstIdx(toFind,bCaseS);
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index a42f6e22..4b7e09a3 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -314,7 +314,7 @@ public:
 	//Replaces all occurences of char c with the string str
 	KviStr & replaceAll(char c,const char *str);
 	//same as above but with a string
-	KviStr & replaceAll(char *toFind,const char *str,bool bCaseS = true);
+	KviStr & replaceAll(const char *toFind,const char *str,bool bCaseS = true);
 	
 	KviStr & transliterate(const char * szToFind,const char * szReplacement);
 
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h
index 599aec41..d8e5b5a1 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/kvi_locale.h
@@ -40,10 +40,10 @@ namespace KviLocale
 {
 	typedef struct _EncodingDescription
 	{
-		char * szName;
+		const char *szName;
 		char   bSmart; // is it a smart codec ?
 		char   bSendUtf8; // does it send utf8 or the local charset ?
-		char * szDescription;
+		const char *szDescription;
 	} EncodingDescription;
 
 	// you MUST start iterating from 0 and terminate when
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 3f928087..a0824b23 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -309,8 +309,8 @@ private:
 	bool checkFileAssociations();
 	void setupFileAssociations();
 
-	bool checkUriAssociations(char * proto);
-	void setupUriAssociations(char * proto);
+	bool checkUriAssociations(const char *proto);
+	void setupUriAssociations(const char *proto);
 
 	void saveKvircDirectory();
 
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index b860b4fd..7cf75830 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -258,7 +258,7 @@ bool KviApp::checkFileAssociations()
 }
 
 
-bool KviApp::checkUriAssociations(char * proto)
+bool KviApp::checkUriAssociations(const char *proto)
 {
 #ifdef COMPILE_ON_WINDOWS
 #define QUERY_BUFFER 2048
@@ -353,7 +353,7 @@ bool KviApp::checkUriAssociations(char * proto)
 }
 
 
-void KviApp::setupUriAssociations(char * proto)
+void KviApp::setupUriAssociations(const char *proto)
 {
 #ifdef COMPILE_ON_WINDOWS
 	HKEY hKey;
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp
index 61c9f165..87d7726c 100644
--- a/src/kvirc/kernel/kvi_internalcmd.cpp
+++ b/src/kvirc/kernel/kvi_internalcmd.cpp
@@ -26,7 +26,7 @@
 
 // FIXME: #warning "LOCALIZE THIS!"
 
-static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]=
+static const char *internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]=
 {
 	"echo INTERNAL COMMAND ERROR: INDEX OUT OF RANGE",
 	"help.open -n -m index.html",
@@ -71,7 +71,7 @@ static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]=
 };
 
 
-char * kvi_getInternalCommandBuffer(int idx)
+const char* kvi_getInternalCommandBuffer(int idx)
 {
 	if(idx > 0 && idx < KVI_NUM_INTERNAL_COMMANDS)
 	{
diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h
index 533dfc05..6e6f34c2 100644
--- a/src/kvirc/kernel/kvi_internalcmd.h
+++ b/src/kvirc/kernel/kvi_internalcmd.h
@@ -67,6 +67,6 @@
 
 #define KVI_NUM_INTERNAL_COMMANDS 40
 
-extern KVIRC_API char * kvi_getInternalCommandBuffer(int idx);
+extern KVIRC_API const char* kvi_getInternalCommandBuffer(int idx);
 
 #endif //_KVI_INTERNALCMD_H_
diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc
index c35fc173..6e5c0b16 100644
--- a/src/modules/about/abouttext.inc
+++ b/src/modules/about/abouttext.inc
@@ -1,4 +1,4 @@
-static char * g_szAboutText = "" \
+static const char *g_szAboutText = "" \
 "<html>" \
 "<head>" \
 "<title>Honor and glory</title>" \
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index ac8ce39d..75cbc55b 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -42,7 +42,7 @@
 
 
 //->Tables for Text Format
-static char * const mod_tbl[] =	{
+static const char *const mod_tbl[] =	{
 					"PlainText",
 					"RichText",
 					"AutoText",
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index e372f75a..d4161539 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1085,8 +1085,8 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 	KVSM_PARAMETERS_END(c)
 	
-	char * toReplace[]={" ", "#", "$",  "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"};
-	char * newStr[]={"%20", "%23", "%24", "&amp;", "%2F", "%3A", "&lt;", "%3D", "&gt;", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"};
+	const char *toReplace[]={" ", "#", "$",  "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"};
+	const char *newStr[]={"%20", "%23", "%24", "&amp;", "%2F", "%3A", "&lt;", "%3D", "&gt;", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"};
 
 	/*
 	for(int idx=0,idx<22,idx++)