compilation fixes (KviStr.replaceAll())

added dcc voice/zoundcard.h support check on cmakefiles
some other fix

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1783 17fca916-40b9-46aa-a4ea-0a15b648b75c

6 files changed, 8 insertions, 16 deletions

diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 580661763..bfa5cb63f 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -533,7 +533,7 @@ namespace KviQString
 				case 's': // char * string
 				{
 					argString = kvi_va_arg(list,char *);
-					if(!argString)argString = "[!NULL!]";
+					if(!argString)argString = (char*) "[!NULL!]";
 					QString str(argString);
 					if(str.isEmpty())continue;
 					int len = str.length();
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 61f5bed81..4c54c66f7 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2120,7 +2120,7 @@ KviStr & KviStr::replaceAll(const 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 290a4e767..b4b878507 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -315,7 +315,7 @@ public:
 	//Replaces all occurences of char c with the string str
 	KviStr & replaceAll(const 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/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 86346795d..01acd75a9 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -309,7 +309,7 @@ private:
 	void setupFileAssociations();
 
 	bool checkUriAssociations(const char * proto);
-	void setupUriAssociations(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 c57ad37e2..8418367e8 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -348,7 +348,7 @@ bool KviApp::checkUriAssociations(const char * proto)
 }
 
 
-void KviApp::setupUriAssociations(char * proto)
+void KviApp::setupUriAssociations(const char * proto)
 {
 #ifdef COMPILE_ON_WINDOWS
 	HKEY hKey;
@@ -579,9 +579,7 @@ void KviApp::findGlobalKvircDirectory()
 		for(int i=0;usualKvircGlobalDir[i] != 0;i++){
 			m_szGlobalKvircDir = usualKvircGlobalPrePath[j];
 			m_szGlobalKvircDir+= usualKvircGlobalDir[i];
-			#warning you must change back hardcoded 4.0 to VERSION_BRANCH
-			//m_szGlobalKvircDir+= VERSION_BRANCH;
-			m_szGlobalKvircDir+= "4.0/";
+			m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
 			if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 		}
 	}
@@ -590,9 +588,7 @@ void KviApp::findGlobalKvircDirectory()
 	for(int k=0;usualKvircGlobalDir[k] != 0;k++){
 		m_szGlobalKvircDir = QDir::homeDirPath();
 		m_szGlobalKvircDir+= usualKvircGlobalDir[k];
-		#warning you must change back hardcoded 4.0 to VERSION_BRANCH
-		//m_szGlobalKvircDir+= VERSION_BRANCH;
-		m_szGlobalKvircDir+= "4.0/";
+		m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
 		if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 	}
 
@@ -601,9 +597,7 @@ void KviApp::findGlobalKvircDirectory()
 			m_szGlobalKvircDir = QDir::homeDirPath();
 			m_szGlobalKvircDir+= "/.kde";
 			m_szGlobalKvircDir+= usualKvircGlobalDir[k];
-			#warning you must change back hardcoded 4.0 to VERSION_BRANCH
-			//m_szGlobalKvircDir+= VERSION_BRANCH;
-			m_szGlobalKvircDir+= "4.0/";
+			m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
 			if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 		}
 	#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index aa5020d78..c5b41b4aa 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -286,8 +286,6 @@ void KviScriptManagementDialog::installScript()
 

 	szFileName.replace("\\","\\\\");

 

-	QString szError;

-

 	// Switch between script and addon

 	if(szFileName.endsWith(".kvs"))

 	{