TEMP: cmakefeat/cmake-conversion

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

17 files changed, 181 insertions, 56 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
new file mode 100644
index 0000000..670332a
--- /dev/null
+++ b/src/kvilib/CMakeLists.txt
@@ -0,0 +1,102 @@
+
+# prepare includes
+
+file( GLOB_RECURSE _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h )
+list( SORT _includes )
+tde_process_includes( ${_includes} DESTINATION ${PROJECT_NAME} )
+
+
+##### kvilib (shared)
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+if( WITH_TDE )
+  set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
+else( )
+  set( LINK_LIBRARIES ${TQT_LIBRARIES} )
+endif( )
+
+tde_add_library( kvilib SHARED AUTOMOC
+  SOURCES
+    core/kvi_error.cpp
+    core/kvi_heapobject.cpp
+    core/kvi_malloc.cpp
+    core/kvi_memmove.cpp
+    core/kvi_qstring.cpp
+    core/kvi_string.cpp
+    core/kvi_stringarray.cpp
+    ext/kvi_cmdformatter.cpp
+    ext/kvi_config.cpp
+    ext/kvi_crypt.cpp
+    ext/kvi_databuffer.cpp
+    ext/kvi_dcophelper.cpp
+    ext/kvi_doublebuffer.cpp
+    ext/kvi_garbage.cpp
+    ext/kvi_osinfo.cpp
+    ext/kvi_imagelib.cpp
+    ext/kvi_md5.cpp
+    ext/kvi_mediatype.cpp
+    ext/kvi_miscutils.cpp
+    ext/kvi_msgtype.cpp
+    ext/kvi_parameterlist.cpp
+    ext/kvi_pixmap.cpp
+    ext/kvi_proxydb.cpp
+    ext/kvi_regchan.cpp
+    ext/kvi_regusersdb.cpp
+    ext/kvi_sharedfiles.cpp
+    ext/kvi_stringconversion.cpp
+    file/kvi_file.cpp
+    file/kvi_fileutils.cpp
+    file/kvi_packagefile.cpp
+    irc/kvi_avatar.cpp
+    irc/kvi_avatarcache.cpp
+    irc/kvi_ircmask.cpp
+    irc/kvi_ircserver.cpp
+    irc/kvi_ircserverdb.cpp
+    irc/kvi_ircuserdb.cpp
+    irc/kvi_mirccntrl.cpp
+    irc/kvi_nickserv.cpp
+    irc/kvi_useridentity.cpp
+    net/kvi_dns.cpp
+    net/kvi_http.cpp
+    net/kvi_netutils.cpp
+    net/kvi_socket.cpp
+    net/kvi_ssl.cpp
+    net/kvi_url.cpp
+    system/kvi_env.cpp
+    system/kvi_locale.cpp
+    system/kvi_thread.cpp
+    system/kvi_time.cpp
+    tal/kvi_tal_application.cpp
+    tal/kvi_tal_filedialog.cpp
+    tal/kvi_tal_grid.cpp
+    tal/kvi_tal_groupbox.cpp
+    tal/kvi_tal_hbox.cpp
+    tal/kvi_tal_iconview.cpp
+    tal/kvi_tal_listbox.cpp
+    tal/kvi_tal_listview.cpp
+    tal/kvi_tal_mainwindow.cpp
+    tal/kvi_tal_menubar.cpp
+    tal/kvi_tal_popupmenu.cpp
+    tal/kvi_tal_scrollview.cpp
+    tal/kvi_tal_tabdialog.cpp
+    tal/kvi_tal_textedit.cpp
+    tal/kvi_tal_toolbar.cpp
+    tal/kvi_tal_tooltip.cpp
+    tal/kvi_tal_vbox.cpp
+    tal/kvi_tal_widgetstack.cpp
+    tal/kvi_tal_wizard.cpp
+  LINK ${LINK_LIBRARIES}
+  VERSION 3.0.0
+  DESTINATION ${LIB_INSTALL_DIR}
+  DEPENDENCIES tde-includes
+)
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 283bbba..beb87de 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -69,8 +69,13 @@
 		#endif
 	#endif
 
-	#define KVILIB_API
-	#define KVIRC_API
+	#ifdef __TDE_HAVE_GCC_VISIBILITY
+		#define KVILIB_API __attribute__ ((visibility("default")))
+		#define KVIRC_API  __attribute__ ((visibility("default")))
+	#else
+		#define KVILIB_API
+		#define KVIRC_API
+	#endif
 
 	#ifndef VERSION
 		#define VERSION "?.?.?"
diff --git a/src/kvilib/core/kvi_memmove.cpp b/src/kvilib/core/kvi_memmove.cpp
index 504cf6c..1d477a2 100644
--- a/src/kvilib/core/kvi_memmove.cpp
+++ b/src/kvilib/core/kvi_memmove.cpp
@@ -37,7 +37,7 @@
 	#ifdef COMPILE_ix86_ASM
 
 
-		void *kvi_memmove(void * dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void *kvi_memmove(void * dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -98,7 +98,7 @@
 			return dst_ptr; //asm("   movl 8(%ebp),%eax"); <-- gcc will put that (AFTER THE OPTIMISATION PASS!)
 		}
 	
-		void *kvi_memmoveodd(void * dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void *kvi_memmoveodd(void * dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -169,7 +169,7 @@
 		//
 		//
 	
-		void *kvi_memmove(void *dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void *kvi_memmove(void *dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -188,7 +188,7 @@
 		    return dst_ptr;
 		}
 	
-		void *kvi_memmoveodd(void *dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void *kvi_memmoveodd(void *dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -216,7 +216,7 @@
 		    return dst_ptr;
 		}
 		
-		void kvi_fastmove(void *dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void kvi_fastmove(void *dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -226,7 +226,7 @@
 			while(len--)*dst++ = *src++;
 		}
 	
-		void kvi_fastmoveodd(void *dst_ptr,const void *src_ptr,int len)
+		KVILIB_API void kvi_fastmoveodd(void *dst_ptr,const void *src_ptr,int len)
 		{
 			__range_valid(dst_ptr);
 			__range_valid(src_ptr);
@@ -242,7 +242,7 @@
 
 	#endif // !COMPILE_ix86_ASM
 	
-	void kvi_memset(void *dst_ptr,char c,int len)
+	KVILIB_API void kvi_memset(void *dst_ptr,char c,int len)
 	{
 		__range_valid(dst_ptr);
 		__range_valid(len >= 0);
diff --git a/src/kvilib/core/kvi_memmove.h b/src/kvilib/core/kvi_memmove.h
index d1319a4..d04cd6f 100644
--- a/src/kvilib/core/kvi_memmove.h
+++ b/src/kvilib/core/kvi_memmove.h
@@ -59,7 +59,7 @@
 
 			// WE WANT repnz; movsq\n"!!!
 
-			inline void kvi_fastmove(void * dst_ptr,const void *src_ptr,int len)
+			KVILIB_API inline void kvi_fastmove(void * dst_ptr,const void *src_ptr,int len)
 			{
 				__asm__ __volatile__(
 					"	cld\n"
@@ -77,7 +77,7 @@
 				);
 			}
 
-			inline void kvi_fastmoveodd(void * dst_ptr,const void *src_ptr,int len)
+			KVILIB_API inline void kvi_fastmoveodd(void * dst_ptr,const void *src_ptr,int len)
 			{
 				__asm__ __volatile__(
 					"	cld\n"
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 829b673..6f7e8f7 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -51,7 +51,7 @@ namespace KviTQString
 	// The global empty (and null) string
 	const TQString empty;
 
-	bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len)
+	KVILIB_API bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
 		const TQChar * c1 = sz1.unicode();
@@ -71,7 +71,7 @@ namespace KviTQString
 		return (c1 == c1e);
 	}
 
-	bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
+	KVILIB_API bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
 		const TQChar * c1 = sz1.unicode();
@@ -91,7 +91,7 @@ namespace KviTQString
 		return (c1 == c1e);
 	}
 
-	bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len)
+	KVILIB_API bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
 		const TQChar * c1 = sz1.unicode();
@@ -110,7 +110,7 @@ namespace KviTQString
 		return (c1 == c1e);
 	}
 
-	bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len)
+	KVILIB_API bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
 		const TQChar * c1 = sz1.unicode();
@@ -130,7 +130,7 @@ namespace KviTQString
 	}
 
 	// sz2 is assumed to be null terminated, sz1 is not!
-	bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len)
+	KVILIB_API bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
 		const TQChar * c1 = sz1.unicode();
@@ -149,7 +149,7 @@ namespace KviTQString
 		return (c1 == c1e);
 	}
 
-	TQString makeSizeReadable(size_t bytes)
+	KVILIB_API TQString makeSizeReadable(size_t bytes)
 	{
 		double size = bytes;
 		if(size<900)
@@ -173,7 +173,7 @@ namespace KviTQString
 		return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3);
 	}
 
-	bool equalCS(const TQString &sz1,const TQString &sz2)
+	KVILIB_API bool equalCS(const TQString &sz1,const TQString &sz2)
 	{
 		if(sz1.length() != sz2.length())return false;
 
@@ -192,7 +192,7 @@ namespace KviTQString
 		return (c1 == c1e);
 	}
 
-	bool equalCI(const TQString &sz1,const TQString &sz2)
+	KVILIB_API bool equalCI(const TQString &sz1,const TQString &sz2)
 	{
 		if(sz1.length() != sz2.length())return false;
 
@@ -212,7 +212,7 @@ namespace KviTQString
 	}
 
 	// sz2 is assumed to be null terminated, sz1 is not!
-	bool equalCI(const TQString &sz1,const TQChar *sz2)
+	KVILIB_API bool equalCI(const TQString &sz1,const TQChar *sz2)
 	{
 		const TQChar * c1 = sz1.unicode();
 		const TQChar * c1e = c1 + sz1.length();
@@ -229,7 +229,7 @@ namespace KviTQString
 		return (c1 == c1e) && (!sz2->unicode());
 	}
 
-	bool equalCS(const TQString &sz1,const char * sz2)
+	KVILIB_API bool equalCS(const TQString &sz1,const char * sz2)
 	{
 		const TQChar * c1 = sz1.unicode();
 		const TQChar * c1e = c1 + sz1.length();
@@ -245,7 +245,7 @@ namespace KviTQString
 		return ((c1 == c1e) && (*sz2 == '\0'));
 	}
 
-	bool equalCI(const TQString &sz1,const char * sz2)
+	KVILIB_API bool equalCI(const TQString &sz1,const char * sz2)
 	{
 		const TQChar * c1 = sz1.unicode();
 		const TQChar * c1e = c1 + sz1.length();
@@ -261,7 +261,7 @@ namespace KviTQString
 		return ((c1 == c1e) && (*sz2 == '\0'));
 	}
 
-	int cmpCS(const TQString &sz1,const TQString &sz2)
+	KVILIB_API int cmpCS(const TQString &sz1,const TQString &sz2)
 	{
 		const TQChar * c1 = sz1.unicode();
 		const TQChar * c2 = sz2.unicode();
@@ -295,7 +295,7 @@ namespace KviTQString
 		return 0; // never here
 	}
 
-	int cmpCI(const TQString &sz1,const TQString &sz2)
+	KVILIB_API int cmpCI(const TQString &sz1,const TQString &sz2)
 	{
 		const TQChar * c1 = sz1.unicode();
 		const TQChar * c2 = sz2.unicode();
@@ -328,7 +328,7 @@ namespace KviTQString
 		return 0; // never here
 	}
 
-	int cmpCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
+	KVILIB_API int cmpCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
 	{
 		if(len == 0)return 0; // assume equal
 		unsigned int l1 = MY_MIN(len,sz1.length());
@@ -356,12 +356,12 @@ namespace KviTQString
 		return diff;
 	}
 
-	void ensureLastCharIs(TQString &szString,const TQChar &c)
+	KVILIB_API void ensureLastCharIs(TQString &szString,const TQChar &c)
 	{
 		if(!lastCharIs(szString,c))szString.append(c);
 	}
 
-	TQString getToken(TQString &szString,const TQChar &sep)
+	KVILIB_API TQString getToken(TQString &szString,const TQChar &sep)
 	{
 		unsigned int i=0;
 		while(i < szString.length())
@@ -387,7 +387,7 @@ namespace KviTQString
 		return ret;
 	}
 
-	void stripRightWhiteSpace(TQString &s)
+	KVILIB_API void stripRightWhiteSpace(TQString &s)
 	{
 		unsigned int iRemove = 0;
 		while(iRemove < s.length())
@@ -398,7 +398,7 @@ namespace KviTQString
 		if(iRemove > 0)s.remove(s.length() - iRemove,iRemove);
 	}
 
-	void stripRight(TQString &s,const TQChar &c)
+	KVILIB_API void stripRight(TQString &s,const TQChar &c)
 	{
 		unsigned int iRemove = 0;
 		while(iRemove < s.length())
@@ -409,7 +409,7 @@ namespace KviTQString
 		if(iRemove > 0)s.remove(s.length() - iRemove,iRemove);
 	}
 
-	void stripLeft(TQString &s,const TQChar &c)
+	KVILIB_API void stripLeft(TQString &s,const TQChar &c)
 	{
 		unsigned int iRemove = 0;
 		while(iRemove < s.length())
@@ -422,53 +422,53 @@ namespace KviTQString
 		if(iRemove > 0)s.remove(0,iRemove);
 	}
 
-	void detach(TQString &sz)
+	KVILIB_API void detach(TQString &sz)
 	{
 		sz.setLength(sz.length());
 	}
 
-	const TQChar * nullTerminatedArray(const TQString &sz)
+	KVILIB_API const TQChar * nullTerminatedArray(const TQString &sz)
 	{
 		//sz.setLength(sz.length()); // detach!
 		return (const TQChar *)sz.ucs2(); // MAY BE NULL!
 	}
 	
-	void appendNumber(TQString &s,double dReal)
+	KVILIB_API void appendNumber(TQString &s,double dReal)
 	{
 		char buffer[512];
 		::sprintf(buffer,"%f",dReal);
 		s.append(buffer);
 	}
 	
-	void appendNumber(TQString &s,int iInteger)
+	KVILIB_API void appendNumber(TQString &s,int iInteger)
 	{
 		char buffer[64];
 		::sprintf(buffer,"%d",iInteger);
 		s.append(buffer);
 	}
 
-	void appendNumber(TQString &s,kvi_i64_t iInteger)
+	KVILIB_API void appendNumber(TQString &s,kvi_i64_t iInteger)
 	{
 		char buffer[64];
 		::sprintf(buffer,"%ld",iInteger);
 		s.append(buffer);
 	}
 	
-	void appendNumber(TQString &s,kvi_u64_t uInteger)
+	KVILIB_API void appendNumber(TQString &s,kvi_u64_t uInteger)
 	{
 		char buffer[64];
 		::sprintf(buffer,"%lu",uInteger);
 		s.append(buffer);
 	}
 	
-	void appendNumber(TQString &s,unsigned int uInteger)
+	KVILIB_API void appendNumber(TQString &s,unsigned int uInteger)
 	{
 		char buffer[64];
 		::sprintf(buffer,"%u",uInteger);
 		s.append(buffer);
 	}
 
-	void vsprintf(TQString &s,const TQString &szFmt,kvi_va_list list)
+	KVILIB_API void vsprintf(TQString &s,const TQString &szFmt,kvi_va_list list)
 	{
 #define MEMINCREMENT 32
 
@@ -690,7 +690,7 @@ namespace KviTQString
 	}
 
 
-	TQString & sprintf(TQString &s,const TQString &szFmt,...)
+	KVILIB_API TQString & sprintf(TQString &s,const TQString &szFmt,...)
 	{
 		kvi_va_list list;
 		kvi_va_start_by_reference(list,szFmt);
@@ -700,7 +700,7 @@ namespace KviTQString
 		return s;
 	}
 
-	void appendFormatted(TQString &s,const TQString &szFmt,...)
+	KVILIB_API void appendFormatted(TQString &s,const TQString &szFmt,...)
 	{
 		TQString tmp;
 		kvi_va_list list;
@@ -711,7 +711,7 @@ namespace KviTQString
 		s.append(tmp);
 	}
 
-	bool matchWildExpressionsCI(const TQString &szM1,const TQString &szM2)
+	KVILIB_API bool matchWildExpressionsCI(const TQString &szM1,const TQString &szM2)
 	{
 		//Matches two regular expressions containging wildcards (* and ?)
 	
@@ -804,7 +804,7 @@ namespace KviTQString
 		return (!(m2->unicode()));           //m1 surely finished , so for the match , m2 must be finished too
 	}
 
-	bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
+	KVILIB_API bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
 	{
 		TQString szWildcard;
 		TQChar* ptr=(TQChar*)szExp.ucs2();
@@ -826,7 +826,7 @@ namespace KviTQString
 		return re.search(szStr) != -1;
 	}
 
-	bool matchStringCS(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
+	KVILIB_API bool matchStringCS(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
 	{
 		TQString szWildcard;
 		TQChar* ptr=(TQChar*)szExp.ucs2();
@@ -848,21 +848,21 @@ namespace KviTQString
 		return re.search(szStr) != -1;
 	}
 
-	void cutFromFirst(TQString &s,const TQChar &c,bool bIncluded)
+	KVILIB_API void cutFromFirst(TQString &s,const TQChar &c,bool bIncluded)
 	{
 		int idx = s.find(c);
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + 1);
 	}
 
-	void cutFromLast(TQString &s,const TQChar &c,bool bIncluded)
+	KVILIB_API void cutFromLast(TQString &s,const TQChar &c,bool bIncluded)
 	{
 		int idx = s.findRev(c);
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + 1);
 	}
 	
-	void cutToFirst(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound)
+	KVILIB_API void cutToFirst(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound)
 	{
 		int idx = s.find(c);
 		if(idx == -1)
@@ -873,7 +873,7 @@ namespace KviTQString
 		s.remove(0,bIncluded ? idx + 1 : idx);
 	}
 	
-	void cutToLast(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound)
+	KVILIB_API void cutToLast(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound)
 	{
 		int idx = s.findRev(c);
 		if(idx == -1)
@@ -884,21 +884,21 @@ namespace KviTQString
 		s.remove(0,bIncluded ? idx + 1 : idx);
 	}
 
-	void cutFromFirst(TQString &s,const TQString &c,bool bIncluded)
+	KVILIB_API void cutFromFirst(TQString &s,const TQString &c,bool bIncluded)
 	{
 		int idx = s.find(c);
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + c.length());
 	}
 
-	void cutFromLast(TQString &s,const TQString &c,bool bIncluded)
+	KVILIB_API void cutFromLast(TQString &s,const TQString &c,bool bIncluded)
 	{
 		int idx = s.findRev(c);
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + c.length());
 	}
 	
-	void cutToFirst(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound)
+	KVILIB_API void cutToFirst(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound)
 	{
 		int idx = s.find(c);
 		if(idx == -1)
@@ -909,7 +909,7 @@ namespace KviTQString
 		s.remove(0,bIncluded ? idx + c.length() : idx);
 	}
 	
-	void cutToLast(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound)
+	KVILIB_API void cutToLast(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound)
 	{
 		int idx = s.findRev(c);
 		if(idx == -1)
@@ -920,7 +920,7 @@ namespace KviTQString
 		s.remove(0,bIncluded ? idx + c.length() : idx);
 	}
 
-	TQString upperISO88591(const TQString &szSrc)
+	KVILIB_API TQString upperISO88591(const TQString &szSrc)
 	{
 		const TQChar * c = nullTerminatedArray(szSrc);
 		if(!c)
@@ -946,7 +946,7 @@ namespace KviTQString
 		return ret;
 	}
 	
-	TQString lowerISO88591(const TQString &szSrc)
+	KVILIB_API TQString lowerISO88591(const TQString &szSrc)
 	{
 		const TQChar * c = nullTerminatedArray(szSrc);
 		if(!c)
@@ -973,7 +973,7 @@ namespace KviTQString
 		return ret;
 	}
 
-	void transliterate(TQString &s,const TQString &szToFind,const TQString &szReplacement)
+	KVILIB_API void transliterate(TQString &s,const TQString &szToFind,const TQString &szReplacement)
 	{
 		int i=0;
 		int il = MY_MIN(szToFind.length(),szReplacement.length());
@@ -992,7 +992,7 @@ namespace KviTQString
 	
 	static char hexdigits[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
 	
-	void bufferToHex(TQString &szRetBuffer,const unsigned char * buffer,unsigned int len)
+	KVILIB_API void bufferToHex(TQString &szRetBuffer,const unsigned char * buffer,unsigned int len)
 	{
 		szRetBuffer.setLength(len * 2);
 		unsigned int i=0;
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index bbeffa2..4ed8fc7 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -238,3 +238,5 @@
 	}
 
 #endif //COMPILE_CRYPT_SUPPORT
+
+#include "kvi_crypt.moc"
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 4d79b48..56f6557 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -146,3 +146,4 @@ void KviGarbageCollector::cleanup()
 	}
 }
 
+#include "kvi_garbage.moc"
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index f447c31..5b4e755 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -51,7 +51,7 @@ public:
 	void removeProperty(const char * name){ m_pPropertyDict->remove(name); };
 };
 
-typedef KVILIB_API KviPointerList<KviRegisteredChannel> KviRegisteredChannelList;
+typedef KviPointerList<KviRegisteredChannel> KviRegisteredChannelList;
 
 class KVILIB_API KviRegisteredChannelDataBase
 {
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 87ce9b6..8ab9aa2 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -737,3 +737,5 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
 	}
 	
 }
+
+#include "kvi_regusersdb.moc"
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 69a2525..2e6da61 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -384,3 +384,4 @@ void KviSharedFilesManager::save(const TQString &filename)
 	cfg.writeEntry("NEntries",idx);
 }
 
+#include "kvi_sharedfiles.moc"
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
index beb4ed3..a5e66d9 100644
--- a/src/kvilib/irc/kvi_ircuserdb.cpp
+++ b/src/kvilib/irc/kvi_ircuserdb.cpp
@@ -283,3 +283,5 @@ void KviIrcUserDataBase::registeredDatabaseCleared()
 		it.current()->m_bNotFoundRegUserLoockup=false;
 	}
 }
+
+#include "kvi_ircuserdb.moc"
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index d537e3f..c6f2612 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -448,3 +448,4 @@ bool KviDns::event(TQEvent *e)
 	return TQObject::event(e);
 }
 
+#include "kvi_dns.moc"
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 81587fa..67adc38 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -1435,3 +1435,4 @@ void KviHttpRequestThread::runInternal()
 	}
 }
 
+#include "kvi_http.moc"
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index e8a0e5b..0f456f4 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -1151,3 +1151,5 @@ static TQString fake_translations_table[]=
 }
 
 #endif
+
+#include "kvi_locale.moc"
diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp
index f8404bb..017e789 100644
--- a/src/kvilib/system/kvi_thread.cpp
+++ b/src/kvilib/system/kvi_thread.cpp
@@ -642,3 +642,4 @@ void KviSensitiveThread::terminate()
 //	tqDebug("Exiting KviSensitiveThread::terminate (this=%d)",this);
 }
 
+#include "kvi_thread.moc"
diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/kvi_tal_popupmenu.cpp
index 2033453..af17183 100644
--- a/src/kvilib/tal/kvi_tal_popupmenu.cpp
+++ b/src/kvilib/tal/kvi_tal_popupmenu.cpp
@@ -1,3 +1,6 @@
+#ifndef _KVI_TAL_POPUPMENU_H_
+#define _KVI_TAL_POPUPMENU_H_
+
 //=============================================================================
 //
 //   File : kvi_tal_popupmenu.cpp
@@ -27,3 +30,4 @@
 
 	#include "kvi_tal_popupmenu_qt3.moc"
 
+#endif // _KVI_TAL_POPUPMENU_H_
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index 4ea3f0e..210e98d 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -534,3 +534,4 @@ TQPushButton * KviTalWizard::backButton()
 	return m_p->pBackButton;
 }
 
+#include "kvi_tal_wizard.moc"