compilation fixes

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

7 files changed, 24 insertions, 10 deletions

diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index c2cdf93cd..61f5bed81 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2102,7 +2102,7 @@ KviStr & KviStr::hexDecode(const char * pFrom)
 	return (*this);
 }
 
-KviStr & KviStr::replaceAll(char c,const char *str)
+KviStr & KviStr::replaceAll(const char c,const char *str)
 {
 	int idx = findFirstIdx(c);
 	KviStr tmp;
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 62fd63d8e..fc56acfac 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -308,7 +308,7 @@ private:
 	bool checkFileAssociations();
 	void setupFileAssociations();
 
-	bool checkUriAssociations(char * proto);
+	bool checkUriAssociations(const char * proto);
 	void setupUriAssociations(char * proto);
 
 	void saveKvircDirectory();
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 41013b61a..c57ad37e2 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -253,7 +253,7 @@ bool KviApp::checkFileAssociations()
 }
 
 
-bool KviApp::checkUriAssociations(char * proto)
+bool KviApp::checkUriAssociations(const char * proto)
 {
 #ifdef COMPILE_ON_WINDOWS
 #define QUERY_BUFFER 2048
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp
index e175b215f..367503796 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 d279a97f0..082dc1505 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/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 902f886f6..b3e9bf40d 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -43,7 +43,7 @@
 
 
 //->Tables for Text Format
-static char * const mod_tbl[] =	{
+static const char * const mod_tbl[] =	{
 					"PlainText",
 					"RichText",
 					"AutoText",
diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt
index bd0e5bd39..c0434d2c0 100644
--- a/src/modules/trayicon/CMakeLists.txt
+++ b/src/modules/trayicon/CMakeLists.txt
@@ -8,6 +8,20 @@ SET(kvitrayicon_SRCS
 	libkvitrayicon.cpp
 )
 
+SET(unixFiles
+	kvi_dock.png
+	kvi_dock_part-0.png
+	kvi_dock_part-1.png
+	kvi_dock_part-2.png
+)
+
+SET(win32Files
+	kvi_dock_win32.png
+	kvi_dock_win32-0.png
+	kvi_dock_win32-1.png
+	kvi_dock_win32-2.png
+)
+
 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
@@ -18,11 +32,11 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
 
 IF(UNIX)
 	IF(APPLE)
-		INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/)
+		INSTALL(FILES ${unixFiles} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/)
 	ELSE()
 		# Assume linux
-		INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
+		INSTALL(FILES ${unixFiles} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
 	ENDIF()
 ELSEIF(WIN32)
-	#INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/)
+	#INSTALL(FILES ${win32Files} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/)
 ENDIF()
\ No newline at end of file