2 files changed, 105 insertions, 1 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
new file mode 100644
index 0000000..cd6a21d
--- /dev/null
+++ b/src/kvilib/CMakeLists.txt
@@ -0,0 +1,104 @@
+
+# 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}
+  ${X11_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${X11_LIBRARY_DIRS}
+)
+
+if( WITH_TDE )
+  set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
+else( )
+  set( LINK_LIBRARIES ${TQT_LIBRARIES} ${X11_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} ${CMAKE_DL_LIBS} ${SSL_LIBRARIES} ${ZLIB_LIBRARIES}
+  VERSION 3.0.0
+  DESTINATION ${LIB_INSTALL_DIR}
+  DEPENDENCIES tde-includes
+)
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index d7e8475..5617c45 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -96,7 +96,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool
 inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy)
 {
 	if(bDeepCopy)
-		kvi_free(szKey);
+		kvi_free((void*)szKey);
 }
 
 inline const char * & kvi_hash_key_default(const char **)