conversion to the cmake building system.feat/cmakeUpgrade

Signed-off-by: gregory guy <gregory-tde@laposte.net>

148 files changed, 2407 insertions, 267 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78055bab..8fd6cbf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,17 +15,17 @@ cmake_minimum_required( VERSION 2.8 )
 ##### general package setup #####################
 
 project( tdewebdev )
+set( VERSION R14.1.0 )
 
 
 ##### include essential cmake modules ###########
 
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
 include( CheckCXXSourceCompiles )
-include( CheckFunctionExists )
-include( CheckIncludeFileCXX )
-include( CheckStructHasMember )
-include( CheckSymbolExists )
-include( CheckTypeSize )
-include( FindPkgConfig )
 
 
 ##### include our cmake modules #################
@@ -40,18 +40,30 @@ include( TDESetupPaths )
 tde_setup_paths( )
 
 
-##### optional stuff ############################
+##### optional stuff
 
-# option( WITH_LIBVISUAL "Enable libvisual support" OFF )
-# option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
-# option( WITH_XINE "Enable xine-engine support" OFF )
-# option( WITH_LIBGPOD "Enable iPod support from libgpod" OFF )
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF
+                                          )
+option( WITH_GCC_VISIBILITY  "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_OTHER_EDITORS   "Build with other editors than kate"                ${WITH_ALL_OPTIONS} )
 
 
-##### user requested modules ####################
+##### user requested modules
 
-option( BUILD_ALL "Build all" OFF )
-option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} )
+option( BUILD_ALL "Build all" ON )
+
+option( BUILD_QUANTA          "Build quanta"          ${BUILD_ALL} )
+option( BUILD_KXSLDBG         "Build kxsldbg"         ${BUILD_ALL} )
+option( BUILD_KOMMANDER       "Build Kommander"       ${BUILD_ALL} )
+option( BUILD_KLINKSTATUS     "Build klinkstatus"     ${BUILD_ALL} )
+option( BUILD_KIMAGEMAPEDITOR "Build kimagemapeditor" ${BUILD_ALL} )
+option( BUILD_DOC             "Build documentation"   ${BUILD_ALL} )
+
+
+##### user defined options
+
+option( USE_DOCS_MACRO  "Alternative xsldbg's documentation path" OFF )
+set( XSLDBG_BIN "xsldbg" CACHE STRING "Name of the xsldbg executable" )
 
 
 ##### configure checks ##########################
@@ -61,23 +73,22 @@ include( ConfigureChecks.cmake )
 
 ###### global compiler settings #################
 
-add_definitions(
-  -DHAVE_CONFIG_H
-  ${TQT_CFLAGS_OTHER}
-)
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
 set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### source directories ########################
 
-if( BUILD_QUANTA )
-  add_subdirectory( lib )
-endif( )
-
-tde_conditional_add_subdirectory( BUILD_QUANTA quanta )
+add_subdirectory( lib )
+tde_conditional_add_subdirectory( BUILD_QUANTA          quanta          )
+tde_conditional_add_subdirectory( BUILD_KXSLDBG         kxsldbg         )
+tde_conditional_add_subdirectory( BUILD_KOMMANDER       kommander       )
+tde_conditional_add_subdirectory( BUILD_KLINKSTATUS     klinkstatus     )
+tde_conditional_add_subdirectory( BUILD_KIMAGEMAPEDITOR kimagemapeditor )
+tde_conditional_add_subdirectory( BUILD_DOC             doc             )
 
 
 ##### write configure files #####################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b7d6dc10..e7ebe90a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,43 +9,134 @@
 #
 #################################################
 
-##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+
+##### check for gcc visibility support
 
 if( WITH_GCC_VISIBILITY )
   if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
+    tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" )
   endif( NOT UNIX )
   set( __KDE_HAVE_GCC_VISIBILITY 1 )
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-endif( )
+endif( WITH_GCC_VISIBILITY )
 
 
-# libxml-2.0
-if( BUILD_QUANTA )
-  pkg_search_module( LIBXML libxml-2.0 )
-  if( LIBXML_FOUND )
+##### find X11 stuff
+
+find_package( X11)
+
+
+if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) )
+
+##### check for libxml-2.0
+
+pkg_search_module( LIBXML libxml-2.0 )
+
+if( NOT LIBXML_FOUND )
+    tde_message_fatal( "libxml-2.0 is required but was not found on your system" )
+ else()
     if( ${LIBXML_VERSION} VERSION_LESS "2.6" )
-      tde_message_fatal( "libxml-2.0 version must be at least 2.6" )
-    endif( )
+        tde_message_fatal( "libxml-2.0 version must be, at least, up to 2.6" )
+     else()
+        set( LIBXML_2_5 1 )
+    endif()
+endif( NOT LIBXML_FOUND )
+
+
+##### check for libxslt
+
+pkg_search_module( LIBXSLT libxslt )
+if( NOT LIBXSLT_FOUND )
+  tde_message_fatal( "libxslt are required, but not found on your system" )
+endif()
+endif( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) )
+
+
+if( BUILD_KXSLDBG )
+find_package( Threads )
+
+##### check for libexslt
+
+pkg_search_module( LIBEXSLT libexslt )
+if( NOT LIBEXSLT_FOUND )
+  tde_message_fatal( "libexlt is required but was not found on your system" )
+endif( NOT LIBEXSLT_FOUND )
+
+
+##### check for readline and ncurses
+
+find_path( READLINE_INCLUDE_DIR
+    NAMES "readline/readline.h" "readline/history.h"
+    HINTS "/usr/include" "/usr/local/include"
+    DOC "Looking for readline header's path"
+)
+find_library( READLINE_LIBRARY
+    NAMES readline history
+    DOC "Looking for readline libraries"
+)
+
+if( (READLINE_INCLUDE_DIR) AND ( READLINE_LIBRARY ) )
+   set( HAVE_READLINE 1 )
+   set( HAVE_HISTORY  1 )
+   set( READLINE_LIBRARIES ${READLINE_LIBRARY}        )
+   set( READLINE_INCLUDE_DIRS ${READLINE_INCLUDE_DIR} )
   else( )
-    tde_message_fatal( "libxml-2.0 are required, but not found on your system" )
-  endif( )
+   tde_message_fatal( "readline is required but was not found on your system" )
 endif( )
 
 
-# libxslt
-if( BUILD_QUANTA )
-  pkg_search_module( LIBXSLT libxslt )
-  if( NOT LIBXSLT_FOUND )
-    tde_message_fatal( "libxslt are required, but not found on your system" )
-  endif( )
+##### look for Curses
+
+find_package( Curses )
+if( NOT CURSES_FOUND )
+  tde_message_fatal( "(n)curses is required but was not found on your system" )
 endif( )
 
 
-# required stuff
-find_package( Qt )
-find_package( TQt )
-find_package( TDE )
+##### check for headers
+
+check_include_file( unistd.h HAVE_UNISTD_H )
+check_include_file( string.h HAVE_STRING_H )
+check_include_file( sys/time.h HAVE_SYS_TIME_H )
+check_include_file( sys/stat.h HAVE_SYS_STAT_H )
+check_include_file( stdlib.h HAVE_STDLIB_H )
+check_include_file( stdarg.h HAVE_STDARG_H )
+check_include_file( time.h HAVE_TIME_H )
+#check_include_file( locale.h LOCALE_PREFIX )
+check_include_file( pthread.h USE_XSLDBG_AS_THREAD )
+
+##### check for functions
+
+check_function_exists( gettimeofday HAVE_GETTIMEOFDAY )
+check_function_exists( usleep HAVE_USLEEP )
+check_function_exists( stat HAVE_STAT )
+
+if( USE_DOCS_MACRO )
+  set( DOCS_PATH "${CMAKE_INSTALL_PREFIX}/doc/xsldbg" CACHE STRING "xsldbg's documentation path" )
+endif()
+endif( BUILD_KXSLDBG )
+
+
+if( WITH_OTHER_EDITORS )
+    set( ENABLE_EDITORS 1 )
+endif( WITH_OTHER_EDITORS )
+
+if( BUILD_QUANTA )
+    find_file( CVSSERVIVE_HEADERS NAMES repository_stub.h cvsservice_stub.h cvsjob_stub.h )
+
+    if( CVSSERVIVE_HEADERS )
+        set( ENABLE_CVSSERVICE 1 )
+        set( BUILD_CVSSERVICE  1 )
+        set( CVSSERVICE_LIBRARIES "cvsservice-static;cvsservice" CACHE INTERNAL "tdesdk and embedded cvssercice libs" FORCE)
+    endif()
+endif( BUILD_QUANTA )
diff --git a/config.h.cmake b/config.h.cmake
index e69de29b..3b18f8f5 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -0,0 +1,63 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#cmakedefine HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#cmakedefine HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#cmakedefine HAVE_TIME_H 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#cmakedefine USE_XSLDBG_AS_THREAD 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+//#cmakedefine LOCALE_PREFIX 1
+
+/* Define to 1 if you have the <readline/readline.h> header file. */
+#cmakedefine HAVE_READLINE @HAVE_READLINE@
+
+/* Define to 1 if you have the 'gettimeofday' function */
+#cmakedefine HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the 'usleep' function */
+#cmakedefine HAVE_USLEEP 1
+
+/* Define to 1 if you have the 'stat' function */
+#cmakedefine HAVE_STAT 1
+
+/* Define to 1 if you have the <readline/history.h> header file. */
+#cmakedefine HAVE_HISTORY @HAVE_HISTORY@
+
+/* Define the name of the xsldbg executable */
+#cmakedefine XSLDBG_BIN "@XSLDBG_BIN@"
+
+/* Defined if you build build for other editors than Kate */
+#cmakedefine ENABLE_EDITORS 1
+
+/* Defined if you build with cvsservice */
+#cmakedefine ENABLE_CVSSERVICE 1
+#cmakedefine BUILD_CVSSERVICE 1
+
+/* Defined if libxml-2.0 is up to 2.6 */
+#cmakedefine LIBXML_2_5 1
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index dc6bb770..27232392 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,12 +1,8 @@
-#################################################
-#
-#  (C) 2012 Golubev Alexander
-#  fatzer2 (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+add_subdirectory( man )
 
-tde_auto_add_subdirectories( )
+tde_conditional_add_subdirectory( BUILD_QUANTA          quanta          )
+tde_conditional_add_subdirectory( BUILD_KXSLDBG         kxsldbg         )
+tde_conditional_add_subdirectory( BUILD_KXSLDBG         xsldbg          )
+tde_conditional_add_subdirectory( BUILD_KOMMANDER       kommander       )
+tde_conditional_add_subdirectory( BUILD_KLINKSTATUS     klinkstatus     )
+tde_conditional_add_subdirectory( BUILD_KIMAGEMAPEDITOR kimagemapeditor )
diff --git a/doc/kimagemapeditor/CMakeLists.txt b/doc/kimagemapeditor/CMakeLists.txt
new file mode 100644
index 00000000..cd7e12b9
--- /dev/null
+++ b/doc/kimagemapeditor/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION kimagemapeditor )
diff --git a/doc/klinkstatus/CMakeLists.txt b/doc/klinkstatus/CMakeLists.txt
new file mode 100644
index 00000000..39be9f18
--- /dev/null
+++ b/doc/klinkstatus/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION klinkstatus )
diff --git a/doc/kommander/CMakeLists.txt b/doc/kommander/CMakeLists.txt
new file mode 100644
index 00000000..fabb11a5
--- /dev/null
+++ b/doc/kommander/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION kommander )
diff --git a/doc/kxsldbg/CMakeLists.txt b/doc/kxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..10326ba8
--- /dev/null
+++ b/doc/kxsldbg/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION kxsldbg )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 00000000..13caef20
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+tde_conditional_add_subdirectory( BUILD_QUANTA          quanta          )
+tde_conditional_add_subdirectory( BUILD_KXSLDBG         kxsldbg         )
+tde_conditional_add_subdirectory( BUILD_KOMMANDER       kommander       )
+tde_conditional_add_subdirectory( BUILD_KLINKSTATUS     klinkstatus     )
+tde_conditional_add_subdirectory( BUILD_KIMAGEMAPEDITOR kimagemapeditor )
diff --git a/doc/man/kimagemapeditor/CMakeLists.txt b/doc/man/kimagemapeditor/CMakeLists.txt
new file mode 100644
index 00000000..bf2486b8
--- /dev/null
+++ b/doc/man/kimagemapeditor/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kimagemapeditor.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kimagemapeditor/kimagemapeditor.1 b/doc/man/kimagemapeditor/kimagemapeditor.1
new file mode 100644
index 00000000..681db952
--- /dev/null
+++ b/doc/man/kimagemapeditor/kimagemapeditor.1
@@ -0,0 +1,47 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KIMAGEMAPEDITOR 1 "October 19, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kimagemapeditor \- an HTML image map editor for TDE
+.SH SYNOPSIS
+.B kimagemapeditor
+[ \fIgeneric-options\fP ]
+[ \fB\-c, \-\-stdout\fP ]
+[ \fIfile\fP ... ]
+.SH DESCRIPTION
+\fBKImageMapEditor\fP is a tool that allows you to edit image maps in
+HTML files.  As well as providing a standalone application,
+KImageMapEditor makes itself available as a KPart for embedding into
+larger applications.
+.PP
+The files passed on the command line may be either HTML files or image
+files.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+Below are the kimagemapeditor-specific options.
+For a full summary of options, run \fIkimagemapeditor \-\-help\fP.
+.TP
+\fB\-c, \-\-stdout\fP
+Write the resulting HTML code to standard output when exiting.
+.SH SEE ALSO
+.BR quanta (1).
+.SH AUTHOR
+KImageMapEditor was written by Jan Schafer <janschaefer@users.sourceforge.net>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/klinkstatus/CMakeLists.txt b/doc/man/klinkstatus/CMakeLists.txt
new file mode 100644
index 00000000..555edb4f
--- /dev/null
+++ b/doc/man/klinkstatus/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES klinkstatus.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/klinkstatus/klinkstatus.1 b/doc/man/klinkstatus/klinkstatus.1
new file mode 100644
index 00000000..c1b2b61b
--- /dev/null
+++ b/doc/man/klinkstatus/klinkstatus.1
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KLINKSTATUS 1 "October 19, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+klinkstatus \- a web link validity checker for TDE
+.SH SYNOPSIS
+.B klinkstatus
+[ \fIgeneric-options\fP ]
+[ \fIURL\fP ]
+.SH DESCRIPTION
+\fBKLinkStatus\fP is a web link validity checker for TDE.  It allows you to
+search internal and external links throughout your web site.  Simply
+point it to a single page and choose the depth to search.
+.PP
+You can also check local files, or files over ftp:, fish: or any other
+KIO protocols.  For performance, links can be checked simultaneously.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIklinkstatus \-\-help\fP.
+.SH SEE ALSO
+.BR quanta (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/klinkstatus/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/klinkstatus/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/klinkstatus/\fP.
+.SH AUTHOR
+KLinkStatus was written by Paulo Moura Guedes <moura@tdewebdev.org>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kommander/CMakeLists.txt b/doc/man/kommander/CMakeLists.txt
new file mode 100644
index 00000000..92110a2d
--- /dev/null
+++ b/doc/man/kommander/CMakeLists.txt
@@ -0,0 +1,11 @@
+INSTALL(
+    FILES
+        kmdr2po.1
+        kmdr-executor.1
+        extractkmdr.1
+        kmdr-editor.1
+        kmdr-plugins.1
+
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kommander/extractkmdr.1 b/doc/man/kommander/extractkmdr.1
new file mode 100644
index 00000000..5dfad28d
--- /dev/null
+++ b/doc/man/kommander/extractkmdr.1
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH EXTRACTKMDR 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+extractkmdr \- extract message strings from Kommander dialogs
+.SH SYNOPSIS
+.B extractkmdr
+[ \fB\-\-tag=\fP\fIname\fP ... ]
+[ \fB\-\-context=\fP\fIname\fP ]
+\fIfile\fP ...
+.SH DESCRIPTION
+\fBextractkmdr\fP finds all text tags and other message strings within the
+given Kommander dialog (.kmdr) files.  It then writes the corresponding
+\fIi18n()\fP calls to standard output (usually redirected to rc.cpp)
+so that xgettext can parse them.
+.PP
+To create a complete gettext message file (PO-file) from a Kommander
+dialog, the
+.BR kmdr2po (1)
+utility is more convenient.
+.PP
+This utility is part of the TDE web development module.
+.SH OPTIONS
+.TP
+\fB\-\-tag=\fP\fIname\fP
+Extract also the contents of the tag \fIname\fP.
+This option may be used multiple times
+(e.g., \-\-tag=tag_one \-\-tag=tag_two).
+.TP
+\fB\-\-context=\fP\fIname\fP
+Give all i18n() calls the given context: i18n("\fIname\fP", ...).
+.SH SEE ALSO
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1).
+.SH AUTHOR
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kommander/kmdr-editor.1 b/doc/man/kommander/kmdr-editor.1
new file mode 100644
index 00000000..5ecb637c
--- /dev/null
+++ b/doc/man/kommander/kmdr-editor.1
@@ -0,0 +1,70 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KMDR-EDITOR 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kmdr-editor \- editor for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-editor
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+More specifically, Kommander is a set of tools that allow you to create
+dynamic GUI dialogs that generate, based on their state, a piece of text.
+The piece of text can be a command line to a program, any piece of code,
+business documents that contain a lot of repititious or templated text and so
+on.  The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of.  The best part of it all?  You aren't required to write a single
+line of code!
+.PP
+This editor (\fBkmdr-editor\fP) allows you to lay out your entire dialog
+through a graphical
+user interface.  Once a dialog has been created by the editor, it is
+saved as a file with extension \fI.kmdr\fP.  The dialog that this XML file
+represents can then be run instantly with the executor (\fBkmdr-executor\fP).
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkmdr-editor \-\-help\fP.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume@optusnet.com.au>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
+Andras Mantia <amantia@kde.org> and Trolltech.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kommander/kmdr-executor.1 b/doc/man/kommander/kmdr-executor.1
new file mode 100644
index 00000000..cc197d69
--- /dev/null
+++ b/doc/man/kommander/kmdr-executor.1
@@ -0,0 +1,87 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KMDR-EXECUTOR 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kmdr-executor \- executor for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-executor
+[ \fIgeneric-options\fP ]
+[ \fB\-c\fP \fIcatalog\fP ]
+{ \fB\-\-stdin\fP | \fIfile\fP }
+[ \fIarg\fP ... ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+More specifically, Kommander is a set of tools that allow you to
+create dynamic GUI dialogs
+that generate, based on their state, a piece of text.  The piece of text
+can be a command line to a program, any piece of code, business
+documents that contain a lot of repititious or templated text and so on.
+The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of.  The best part of it all?  You aren't required to write a single
+line of code!
+.PP
+This executor (\fBkmdr-executor\fP) is used to run a dialog that has
+been created by the
+dialog editor (\fBkmdr-editor\fP).  Either the dialog file (generally
+a \fI.kmdr\fP file) should be passed on
+the command-line, or else the option \-\-stdin should be passed and the
+dialog description should be supplied as XML on standard input.
+Additional arguments for the dialog itself may also be supplied.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+Below are the kommander-specific options.
+For a full summary of options, run \fIkmdr-editor \-\-help\fP.
+.TP
+\fB\-c\fP \fIcatalog\fP
+Use the given catalog for translation.
+.TP
+\fB\-\-stdin\fP
+Read the XML dialog description from standard input instead of passing
+a \fI.kmdr\fP file on the command-line.
+.TP
+\fIarg\fP ...
+Additional arguments to be passed on to the dialog itself.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume@optusnet.com.au>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
+Andras Mantia <amantia@kde.org> and Trolltech.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kommander/kmdr-plugins.1 b/doc/man/kommander/kmdr-plugins.1
new file mode 100644
index 00000000..5a8d222b
--- /dev/null
+++ b/doc/man/kommander/kmdr-plugins.1
@@ -0,0 +1,71 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KMDR-PLUGINS 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kmdr-plugins \- plugin manager for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-plugins
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+It is possible to extend Kommander by writing your own plugins.  The
+plugin manager
+.B kmdr-plugins
+is a simple user interface to Kommander's configuration file, and
+can be used to select which external plugins Kommander should load.
+Closing the plugin manager will automatically save any changes.
+.PP
+By loading a plugin, the custom widgets that it defines
+will become available in Kommander's menus and toolbars, and these
+custom widgets can be used in Kommander dialogs.
+.PP
+See
+.BR kmdr-editor (1)
+and
+.BR kmdr-executor (1)
+for a more detailed description of Kommander.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume@optusnet.com.au>,
+Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
+Andras Mantia <amantia@kde.org> and Trolltech.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kommander/kmdr2po.1 b/doc/man/kommander/kmdr2po.1
new file mode 100644
index 00000000..4693644e
--- /dev/null
+++ b/doc/man/kommander/kmdr2po.1
@@ -0,0 +1,47 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KMDR2PO 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kmdr2po \- create a PO-file from a Kommander dialog
+.SH SYNOPSIS
+.B kmdr2po
+.I dialog
+.SH DESCRIPTION
+\fBkmdr2po\fP creates a gettext message file (PO-file) from the given
+Kommander dialog (.kmdr) file.  It does this by using
+.BR extractkmdr (1)
+to extract all text tags and other message strings, and then running
+.BR xgettext (1)
+to create the corresponding PO-file.
+.PP
+The final PO-file will be created in the current directory.  Its name
+will be derived from the dialog filename by replacing the suffix
+\fI.kmdr\fP with \fI.po\fP.
+.PP
+This utility is part of the TDE web development module.
+.SH WARNING
+A temporary file named \fI_from_rc.cc\fP in the current directory
+will be created and subsequently removed.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR xgettext (1).
+.SH AUTHOR
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kxsldbg/CMakeLists.txt b/doc/man/kxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..bcba60ea
--- /dev/null
+++ b/doc/man/kxsldbg/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES kxsldbg.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kxsldbg/kxsldbg.1 b/doc/man/kxsldbg/kxsldbg.1
new file mode 100644
index 00000000..11b551f6
--- /dev/null
+++ b/doc/man/kxsldbg/kxsldbg.1
@@ -0,0 +1,54 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KXSLDBG 1 "October 19, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kxsldbg \- a graphical XSLT debugger for TDE
+.SH SYNOPSIS
+.B kxsldbg
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKXSLDbg\fP is a graphical debugger for XSLT scripts.  It provides
+a graphical front-end to the text-based debugger
+.BR xsldbg (1).
+KXSLDbg can be run as a standalone application or as an embedded TDE part.
+.PP
+XSLT is an XML language for defining transformations of XML files from
+XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
+using standard XSLT stylesheets.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkxsldbg \-\-help\fP.
+.SH SEE ALSO
+.BR quanta (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/kxsldbg/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kxsldbg/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/kxsldbg/\fP.
+.SH AUTHOR
+KXSLDbg was written by Keith Isdale <k_isdale@tpg.com.au>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/quanta/CMakeLists.txt b/doc/man/quanta/CMakeLists.txt
new file mode 100644
index 00000000..de356ee8
--- /dev/null
+++ b/doc/man/quanta/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES quanta.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/quanta/quanta.1 b/doc/man/quanta/quanta.1
new file mode 100644
index 00000000..5640297b
--- /dev/null
+++ b/doc/man/quanta/quanta.1
@@ -0,0 +1,71 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH QUANTA 1 "October 19, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+quanta \- a web development environment for TDE
+.SH SYNOPSIS
+.B quanta
+[ \fIgeneric-options\fP ] [ \fB\-\-unique\fP ]
+[ \fB\-\-nologo\fP ] [ \fIfile\fP ]
+.SH DESCRIPTION
+\fBQuanta Plus\fP is a web development environment for working with HTML
+and associated languages.  It strives to be neutral and transparent
+to all markup languages, while supporting popular web-based scripting
+languages, CSS and other emerging W3C recommendations.
+.PP
+Quanta Plus supports many external components, debuggers and other tools
+for web development, several of which are shipped with the TDE web development
+module.
+.PP
+Quanta Plus is not in any way affiliated with any commercial versions
+of Quanta.  The primary coders from the original team left the GPLed
+version to produce a commercial product.
+.PP
+This application is part of the official TDE web development module.
+.SH OPTIONS
+Below are the quanta-specific options.  For a full summary of options,
+run \fIquanta \-\-help\fP.
+.TP
+\fB\-\-unique\fP
+Run as a one-instance application.
+.TP
+\fB\-\-nologo\fP
+Do not show the logo during startup.
+.SH SEE ALSO
+.BR kimagemapeditor (1),
+.BR klinkstatus (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kxsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+You can also enter the URL
+\fIhelp:/quanta/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/quanta/\fP'
+from the command-line.
+.PP
+If the TDE Help Centre is not installed then you can install the package
+\fItdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/opt/trinity/share/doc/tde/HTML/en/quanta/\fP.
+.SH AUTHOR
+Quanta was written by Eric Laffoon <sequitur@kde.org>, Andras Mantia
+<amantia@kde.org> and others including inactive authors
+Dmitry Poplavsky <dima@kde.org> and Alexander Yakovlev <yshurik@kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/quanta/CMakeLists.txt b/doc/quanta/CMakeLists.txt
new file mode 100644
index 00000000..d6073c36
--- /dev/null
+++ b/doc/quanta/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION quanta )
diff --git a/doc/xsldbg/CMakeLists.txt b/doc/xsldbg/CMakeLists.txt
new file mode 100644
index 00000000..7e2659fe
--- /dev/null
+++ b/doc/xsldbg/CMakeLists.txt
@@ -0,0 +1,7 @@
+tde_create_handbook( DESTINATION xsldbg )
+
+install(
+    FILES xsldbghelp.xml
+    DESTINATION ${HTML_INSTALL_DIR}/en/xsldbg
+)
+#DESTINATION ${DOCS_PATH}
diff --git a/kimagemapeditor/CMakeLists.txt b/kimagemapeditor/CMakeLists.txt
new file mode 100644
index 00000000..ff1e4b12
--- /dev/null
+++ b/kimagemapeditor/CMakeLists.txt
@@ -0,0 +1,83 @@
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kimagemapeditorcommon (static)
+
+tde_add_library( kimagemapeditorcommon STATIC_PIC AUTOMOC
+
+  SOURCES
+        qextfileinfo.cpp
+        areacreator.cpp
+        kimearea.cpp
+        kimecommands.cpp
+        kimedialogs.cpp
+        kimagemapeditor.cpp
+        drawzone.cpp
+        arealistview.cpp
+        imageslistview.cpp
+        mapslistview.cpp
+)
+
+
+##### libkimagemapeditor (kpart)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_kpart( libkimagemapeditor AUTOMOC
+
+  SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+  LINK
+     tdehtml-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kimagemapeditor (executable)
+
+tde_add_executable( kimagemapeditor AUTOMOC
+
+  SOURCES
+        main.cpp
+        kimeshell.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdehtml-shared
+     kimagemapeditorcommon-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kimagemapeditorui.rc kimagemapeditorpartui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor
+)
+
+install(
+    FILES kimagemapeditor.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES kimagemapeditorpart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kimagemapeditor/dummy.cpp b/kimagemapeditor/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/kimagemapeditor/dummy.cpp
+++ /dev/null
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 0cbcd542..942320ef 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -245,14 +245,14 @@ void KimeShell::optionsConfigureKeys() {
 }
 
 void KimeShell::optionsConfigureToolbars()
-{
+{ 
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
     saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
     saveMainWindowSettings(TDEGlobal::config() );
 # endif
-#else
+#else 
     saveMainWindowSettings(TDEGlobal::config() );
 #endif
 
@@ -264,14 +264,14 @@ void KimeShell::optionsConfigureToolbars()
 }
 
 void KimeShell::applyNewToolbarConfig()
-{
+{ 
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
     applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
     applyMainWindowSettings(TDEGlobal::config());
 # endif
-#else
+#else 
     applyMainWindowSettings(TDEGlobal::config());
 #endif
 }
diff --git a/kimagemapeditor/pics/CMakeLists.txt b/kimagemapeditor/pics/CMakeLists.txt
new file mode 100644
index 00000000..b9146679
--- /dev/null
+++ b/kimagemapeditor/pics/CMakeLists.txt
@@ -0,0 +1,14 @@
+tde_install_icons( kimagemapeditor )
+
+
+##### other data
+
+install(
+    FILES
+        addpointcursor.png
+        freehandcursor.png
+        polygoncursor.png
+        removepointcursor.png
+
+  DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor
+)
diff --git a/klinkstatus/CMakeLists.txt b/klinkstatus/CMakeLists.txt
new file mode 100644
index 00000000..2b6debcb
--- /dev/null
+++ b/klinkstatus/CMakeLists.txt
@@ -0,0 +1,4 @@
+# tdewebdev/klinkstatus
+
+add_subdirectory( data )
+add_subdirectory( src  )
diff --git a/klinkstatus/data/CMakeLists.txt b/klinkstatus/data/CMakeLists.txt
new file mode 100644
index 00000000..cd3f59d8
--- /dev/null
+++ b/klinkstatus/data/CMakeLists.txt
@@ -0,0 +1,4 @@
+# tdewebdev/klinkstatus/data
+
+add_subdirectory( icons  )
+add_subdirectory( styles )
diff --git a/klinkstatus/data/icons/16x16/CMakeLists.txt b/klinkstatus/data/icons/16x16/CMakeLists.txt
new file mode 100644
index 00000000..e9c42cf9
--- /dev/null
+++ b/klinkstatus/data/icons/16x16/CMakeLists.txt
@@ -0,0 +1,10 @@
+# tdewebdev/klinkstatus/data/icons/16x16
+
+##### icons
+
+install(
+    FILES 304.png
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart/pics
+)
+
+tde_install_icons()
diff --git a/klinkstatus/data/icons/CMakeLists.txt b/klinkstatus/data/icons/CMakeLists.txt
new file mode 100644
index 00000000..d5036621
--- /dev/null
+++ b/klinkstatus/data/icons/CMakeLists.txt
@@ -0,0 +1,8 @@
+# tdewebdev/klinkstatus/data/icons
+
+add_subdirectory( 16x16 )
+
+
+##### icons
+
+tde_install_icons( klinkstatus )
diff --git a/klinkstatus/data/styles/CMakeLists.txt b/klinkstatus/data/styles/CMakeLists.txt
new file mode 100644
index 00000000..7370d82e
--- /dev/null
+++ b/klinkstatus/data/styles/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+    FILES results_stylesheet.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatus/styles
+)
diff --git a/klinkstatus/src/CMakeLists.txt b/klinkstatus/src/CMakeLists.txt
new file mode 100644
index 00000000..27427a80
--- /dev/null
+++ b/klinkstatus/src/CMakeLists.txt
@@ -0,0 +1,90 @@
+add_subdirectory( cfg    )
+add_subdirectory( engine )
+add_subdirectory( parser )
+add_subdirectory( utils  )
+add_subdirectory( ui     )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/ui
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/ui/settings
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libklinkstatuspart (kpart)
+
+tde_add_kpart( libklinkstatuspart AUTOMOC
+
+  SOURCES
+        klinkstatus_part.cpp
+        global.cpp
+        actionmanager.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     settings-static
+     ui-static
+     engine-static
+     klinkstatus-parser-static
+     utils-static
+     
+  DEPENDENCIES
+     ui-static
+     settings-static
+     engine-static
+     klinkstatus-parser-static
+     utils-static
+     
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### klinkstatus (executable)
+
+tde_add_executable( klinkstatus AUTOMOC
+
+  SOURCES
+        klinkstatus.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeparts-shared
+     klinkstatus-parser-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES klinkstatus_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatus
+)
+
+install(
+    FILES klinkstatus.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES klinkstatus_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES klinkstatus_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart
+)
diff --git a/klinkstatus/src/cfg/CMakeLists.txt b/klinkstatus/src/cfg/CMakeLists.txt
new file mode 100644
index 00000000..c714c5eb
--- /dev/null
+++ b/klinkstatus/src/cfg/CMakeLists.txt
@@ -0,0 +1,34 @@
+# tdewebdev/klinkstatus/src/cfg
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### cfg (static)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_library( cfg STATIC_PIC AUTOMOC
+
+  SOURCES
+        klsconfig.kcfgc
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+)
+
+
+##### other data
+
+install(
+    FILES klinkstatus.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/klinkstatus/src/cfg/dummy.cpp b/klinkstatus/src/cfg/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/klinkstatus/src/cfg/dummy.cpp
+++ /dev/null
diff --git a/klinkstatus/src/engine/CMakeLists.txt b/klinkstatus/src/engine/CMakeLists.txt
new file mode 100644
index 00000000..466f74c3
--- /dev/null
+++ b/klinkstatus/src/engine/CMakeLists.txt
@@ -0,0 +1,29 @@
+# klinkstatus/src/engine
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src/ui
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### engine (static)
+
+tde_add_library( engine STATIC_PIC AUTOMOC
+
+  SOURCES
+        linkchecker.cpp
+        linkstatus.cpp
+        searchmanager.cpp
+        linkfilter.cpp
+  LINK
+     tdehtml-shared
+)
diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h
index 1d2e3bdf..8d4e82ab 100644
--- a/klinkstatus/src/klinkstatus.h
+++ b/klinkstatus/src/klinkstatus.h
@@ -22,7 +22,7 @@
 #define _KLINKSTATUS_H_
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <tdeapplication.h>
diff --git a/klinkstatus/src/parser/CMakeLists.txt b/klinkstatus/src/parser/CMakeLists.txt
new file mode 100644
index 00000000..4ec69659
--- /dev/null
+++ b/klinkstatus/src/parser/CMakeLists.txt
@@ -0,0 +1,27 @@
+# tdewebdev/klinkstatus/src/parser
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### parser (static)
+
+tde_add_library( klinkstatus-parser STATIC_PIC AUTOMOC
+
+  SOURCES
+        htmlparser.cpp
+        http.cpp
+        mstring.cpp
+        node.cpp
+        url.cpp
+)
diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt
new file mode 100644
index 00000000..d434e32a
--- /dev/null
+++ b/klinkstatus/src/ui/CMakeLists.txt
@@ -0,0 +1,37 @@
+# tdewebdev/klinkstatus/src/ui
+
+add_subdirectory( settings )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ui (static)
+
+tde_add_library( ui STATIC_PIC AUTOMOC
+
+  SOURCES
+        sessionwidgetbase.ui
+        sessionwidget.cpp tabwidgetsession.cpp
+        klshistorycombo.cpp resultview.cpp
+        treeview.cpp resultssearchbar.cpp
+        documentrootdialog.cpp
+  LINK
+     cfg-static
+     
+  DEPENDENCIES
+     cfg-static
+)
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 53cdd510..19f3679c 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -591,12 +591,12 @@
     <slot specifier="pure virtual">slotClearComboUrl()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klshistorycombo.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>resultssearchbar.h</includehint>
-    <includehint>treeview.h</includehint>
-    <includehint>kprogress.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klshistorycombo.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">resultssearchbar.h</include>
+	<include location="global" impldecl="in implementation">treeview.h</include>
+	<include location="global" impldecl="in implementation">kprogress.h</include>
+	<include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt
new file mode 100644
index 00000000..3541d185
--- /dev/null
+++ b/klinkstatus/src/ui/settings/CMakeLists.txt
@@ -0,0 +1,34 @@
+# klinkstatus/src/ui/settings
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### settings (static)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_library( settings STATIC_PIC AUTOMOC
+
+  SOURCES
+        configsearchdialog.ui
+        configresultsdialog.ui
+        configidentificationdialogui.ui
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+        configidentificationdialog.cpp
+        
+  DEPENDENCIES
+        cfg-static
+)
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 87b73fbf..8b30ed58 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -127,8 +127,8 @@
     <tabstop>buttonDefault</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 72c420ca..097c08fc 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -344,10 +344,7 @@
     <tabstop>kcfg_RememberCheckSettings</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/dummy.cpp b/klinkstatus/src/ui/settings/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/klinkstatus/src/ui/settings/dummy.cpp
+++ /dev/null
diff --git a/klinkstatus/src/utils/CMakeLists.txt b/klinkstatus/src/utils/CMakeLists.txt
new file mode 100644
index 00000000..b25320c9
--- /dev/null
+++ b/klinkstatus/src/utils/CMakeLists.txt
@@ -0,0 +1,34 @@
+# tdewebdev/klinkstatus/src/utils
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+add_definitions( "${ICU_CXXFLAGS}" )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### utils (static)
+
+tde_add_library( utils STATIC_PIC AUTOMOC
+
+  SOURCES
+        utils.cpp
+        xsl.cpp
+  LINK
+     ${LIBXSLT_LIBRARIES}
+)
diff --git a/klinkstatus/src/utils/ConfigureChecks.cmake b/klinkstatus/src/utils/ConfigureChecks.cmake
new file mode 100644
index 00000000..edc884d0
--- /dev/null
+++ b/klinkstatus/src/utils/ConfigureChecks.cmake
@@ -0,0 +1,10 @@
+##### check for icu's c++ standard
+
+include( TDEMacros )
+find_package(PkgConfig)
+pkg_search_module( ICU_UC icu-uc )
+
+tde_execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+    OUTPUT_VARIABLE ICU_CXXFLAGS
+)
diff --git a/kommander/CMakeLists.txt b/kommander/CMakeLists.txt
new file mode 100644
index 00000000..a98d76a0
--- /dev/null
+++ b/kommander/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_subdirectory( icons         )
+add_subdirectory( pluginmanager )
+add_subdirectory( plugin        )
+add_subdirectory( factory       )
+add_subdirectory( widget        )
+add_subdirectory( widgets       )
+add_subdirectory( editor        )
+add_subdirectory( executor      )
+add_subdirectory( part          )
+add_subdirectory( working       )
+add_subdirectory( examples      )
+add_subdirectory( kmdrtools     )
+
+
+##### other data
+
+install(
+    FILES x-kommander.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+)
diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt
new file mode 100644
index 00000000..8cf77ee3
--- /dev/null
+++ b/kommander/editor/CMakeLists.txt
@@ -0,0 +1,88 @@
+# tdewebdev/kommander/editor
+
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/widgets
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_definitions( -DKOMMANDER -DTQT_NO_SQL -DDESIGNER )
+ 
+
+##### kmdr-editor (executable)
+
+tde_add_executable( kmdr-editor AUTOMOC
+
+  SOURCES
+        actioneditor.ui assoctexteditor.ui
+        connectioneditor.ui createtemplate.ui
+        formsettings.ui iconvieweditor.ui
+        listboxeditor.ui listeditor.ui
+        listvieweditor.ui multilineeditor.ui
+        newform.ui paletteeditor.ui
+        paletteeditoradvanced.ui pixmapfunction.ui
+        preferences.ui previewwidget.ui
+        tableeditor.ui wizardeditor.ui
+        choosewidget.ui functions.ui
+        actiondnd.cpp actioneditorimpl.cpp
+        assoctexteditorimpl.cpp actionlistview.cpp
+        asciivalidator.cpp assistproc.cpp
+        command.cpp connectioneditorimpl.cpp
+        defs.cpp filechooser.cpp
+        formfile.cpp formsettingsimpl.cpp
+        formwindow.cpp hierarchyview.cpp
+        iconvieweditorimpl.cpp layout.cpp
+        listboxeditorimpl.cpp listvieweditorimpl.cpp
+        main.cpp mainwindow.cpp
+        mainwindowactions.cpp metadatabase.cpp
+        multilineeditorimpl.cpp newformimpl.cpp
+        orderindicator.cpp paletteeditoradvancedimpl.cpp
+        paletteeditorimpl.cpp parser.cpp
+        pixmapchooser.cpp previewframe.cpp
+        previewwidgetimpl.cpp propertyeditor.cpp
+        qcompletionedit.cpp resource.cpp
+        sizehandle.cpp styledbutton.cpp
+        tableeditorimpl.cpp widgetdatabase.cpp
+        widgetfactory.cpp wizardeditorimpl.cpp
+        workspace.cpp choosewidgetimpl.cpp
+        functionsimpl.cpp messagelog.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     tdetexteditor-shared
+     kommanderwidget-shared
+     kommanderwidgets-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kommander.xml kommander-new.xml
+    DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax
+)
+
+install(
+    FILES kmdr-editor.desktop
+   DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index 558964c1..b5f74086 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -219,4 +219,7 @@
     <slot>AssocTextEditorBase_destroyed(TQObject*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 60b4ff69..b39a7e7b 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -144,7 +144,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 2f1683aa..0a20e4e6 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -404,15 +404,9 @@
     <slot access="protected">cancelClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index e6f7fc15..f0bad338 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -330,9 +330,8 @@
     <slot>okClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 005d2261..86d1b74a 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -696,27 +696,13 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 0c9d4643..644d0bd4 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -19,10 +19,6 @@
 
 #include "mainwindow.h"
 
-#ifdef TQT_NO_SQL
-#define TQT_NO_SQL
-#endif // TQT_NO_SQL
-
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqfileinfo.h>
diff --git a/kommander/editor/pics/CMakeLists.txt b/kommander/editor/pics/CMakeLists.txt
new file mode 100644
index 00000000..04f2e9ba
--- /dev/null
+++ b/kommander/editor/pics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+    FILES kommandersplash.png toolbox.png tdefontcombo.png
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/pics
+)
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 59085749..0d30f50d 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -18,6 +18,10 @@
 **
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdelocale.h>
 #include <kommanderfactory.h>
 
diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index 2341b676..97d227dc 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -168,7 +168,7 @@ private:
      bool mousePressed;
 };
 
-class EditorToolBox : public ToolBox
+class KDE_EXPORT EditorToolBox : public ToolBox
 {
     Q_OBJECT
   
diff --git a/kommander/examples/CMakeLists.txt b/kommander/examples/CMakeLists.txt
new file mode 100644
index 00000000..9af8ae8b
--- /dev/null
+++ b/kommander/examples/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory( current  )
+add_subdirectory( old      )
+add_subdirectory( tutorial )
diff --git a/kommander/examples/current/CMakeLists.txt b/kommander/examples/current/CMakeLists.txt
new file mode 100644
index 00000000..19a92c49
--- /dev/null
+++ b/kommander/examples/current/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kmdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kmdr )
+
+install(
+    FILES ${_kdmr}
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/current
+)
diff --git a/kommander/examples/old/CMakeLists.txt b/kommander/examples/old/CMakeLists.txt
new file mode 100644
index 00000000..de24f9ee
--- /dev/null
+++ b/kommander/examples/old/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kmdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kmdr )
+
+install(
+    FILES ${_kdmr}
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/old
+)
diff --git a/kommander/examples/tutorial/CMakeLists.txt b/kommander/examples/tutorial/CMakeLists.txt
new file mode 100644
index 00000000..1a0d56fc
--- /dev/null
+++ b/kommander/examples/tutorial/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kmdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kmdr )
+
+install(
+    FILES ${_kdmr}
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/tutorial
+)
diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt
new file mode 100644
index 00000000..33c6455e
--- /dev/null
+++ b/kommander/executor/CMakeLists.txt
@@ -0,0 +1,60 @@
+# tdewebdev/kommander/executor
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/widgets
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### instance (static)
+
+tde_add_library( instance STATIC_PIC AUTOMOC
+
+  SOURCES
+        instance.cpp
+        dcopkommanderif.skel
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kommanderplugin-shared
+)
+
+
+##### kmdr-executor (executable)
+
+tde_add_executable( kmdr-executor AUTOMOC
+
+  SOURCES
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     instance-static
+     kommanderwidget-shared
+     kommanderwidgets-shared
+     kommanderfactory-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kmdr-executor.desktop
+    DESTINATION ${APPS_INSTALL_DIR}/.hidden
+)
diff --git a/kommander/factory/CMakeLists.txt b/kommander/factory/CMakeLists.txt
new file mode 100644
index 00000000..c001cab2
--- /dev/null
+++ b/kommander/factory/CMakeLists.txt
@@ -0,0 +1,30 @@
+# tdewebdev/kommander/factory
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_definitions( -DTQT_NO_SQL )
+
+
+##### kommanderfactory (static)
+
+tde_add_library( kommanderfactory STATIC_PIC AUTOMOC
+
+  SOURCES
+        kommanderfactory.cpp
+        domtool.cpp
+  LINK
+     kommanderplugin-shared
+)
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 81549438..8c280d4d 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -25,10 +25,6 @@
 #include "kommanderfactory.h"
 #include <kommanderplugin.h>
 
-#ifdef TQT_NO_SQL
-#define TQT_NO_SQL
-#endif // TQT_NO_SQL
-
 #include <tqfeatures.h>
 #include "config.h"
 #ifndef TQT_NO_SQL
diff --git a/kommander/icons/CMakeLists.txt b/kommander/icons/CMakeLists.txt
new file mode 100644
index 00000000..8d93a0c3
--- /dev/null
+++ b/kommander/icons/CMakeLists.txt
@@ -0,0 +1,9 @@
+# tdewebdev/kommander/icons
+
+tde_install_icons( kommander )
+
+install(
+    FILES hi22-action-arrow.png
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/icons/hicolor/22x22/actions
+    RENAME arrow.png
+)
diff --git a/kommander/kmdrtools/CMakeLists.txt b/kommander/kmdrtools/CMakeLists.txt
new file mode 100644
index 00000000..07d9847b
--- /dev/null
+++ b/kommander/kmdrtools/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(
+    FILES dcoptool-oldparser.kmdr examples.kmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor
+)
+
diff --git a/kommander/part/CMakeLists.txt b/kommander/part/CMakeLists.txt
new file mode 100644
index 00000000..d01959c3
--- /dev/null
+++ b/kommander/part/CMakeLists.txt
@@ -0,0 +1,45 @@
+# tdewebdev/kommander/part
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/executor
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkommander_part (kpart)
+
+tde_add_kpart( libkommander_part AUTOMOC
+
+  SOURCES
+        kommander_part.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kjs-shared
+     tdeparts-shared
+     tdehtml-shared
+     kommanderwidget-shared
+     kommanderplugin-shared
+     instance-static  
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kommander_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kommander/plugin/CMakeLists.txt b/kommander/plugin/CMakeLists.txt
new file mode 100644
index 00000000..1737350b
--- /dev/null
+++ b/kommander/plugin/CMakeLists.txt
@@ -0,0 +1,30 @@
+# tdewebdev/kommander/plugin
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderplugin (shared)
+
+tde_add_library( kommanderplugin SHARED AUTOMOC
+
+  SOURCES
+        kommanderplugin.cpp
+        specialinformation.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index 0a80dd85..4a1d8903 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -12,7 +12,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
- 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "specials.h"
 #include "specialinformation.h"
 
@@ -63,7 +65,7 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr
 }
 
 
-TQString SpecialFunction::prototype(uint prototypeFlags) const
+TQString KDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const
 {
   if (!m_types.count())
     return m_function;
@@ -82,21 +84,21 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const
     return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
 }
 
-TQString SpecialFunction::argumentName(uint i) const
+TQString KDE_EXPORT SpecialFunction::argumentName(uint i) const
 {
   if (i < m_args.count())
     return m_args[i];
   return TQString();
 }
 
-TQString SpecialFunction::argumentType(uint i) const
+TQString KDE_EXPORT SpecialFunction::argumentType(uint i) const
 {
   if (i < m_types.count())
     return m_types[i];
   return TQString();
 }
 
-int SpecialFunction::argumentCount() const
+int KDE_EXPORT SpecialFunction::argumentCount() const
 {
   return m_types.count();
 }
@@ -104,7 +106,7 @@ int SpecialFunction::argumentCount() const
 
 
 
-int SpecialInformation::function(int group, const TQString& fname) 
+int KDE_EXPORT SpecialInformation::function(int group, const TQString& fname)
 {
   TQString f = fname.lower();
   if (m_functions.contains(group) && m_functions[group].contains(f))
@@ -114,13 +116,13 @@ int SpecialInformation::function(int group, const TQString& fname)
   return -1;
 }
   
-SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
+KDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
 {
   int gid = group(gname);
   return m_specials[gid][function(gid, fname)];
 }
 
-int SpecialInformation::group(const TQString& gname) 
+int KDE_EXPORT SpecialInformation::group(const TQString& gname)
 {
  if (m_groups.contains(gname))
     return m_groups[gname];
@@ -137,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname)
   return function(group(gname), fname) != -1;
 }
 
-bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
+bool KDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
 {
   return m_specials.contains(gname) && m_specials[gname].contains(fname)
     && m_specials[gname][fname].isSupported(p);
@@ -151,14 +153,14 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname,
   return f != -1 && m_specials[g][f].isSupported(p);
 }
 
-int SpecialInformation::minArg(int gname, int fname) 
+int KDE_EXPORT SpecialInformation::minArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].minArg();
   return -1;
 }
 
-int SpecialInformation::maxArg(int gname, int fname) 
+int KDE_EXPORT SpecialInformation::maxArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].maxArg();
@@ -186,7 +188,7 @@ TQString SpecialInformation::description(int gname, int fname)
   return TQString();
 }
 
-TQString SpecialInformation::prototype(int gname, int fname, uint flags)
+TQString KDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].prototype(flags);
@@ -246,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin
   }
 }
 
-TQString SpecialInformation::parserGroupName(const TQString& name)
+TQString KDE_EXPORT SpecialInformation::parserGroupName(const TQString& name)
 {
   if (m_parserGroups.contains(name))
     return m_parserGroups[name];
@@ -254,12 +256,12 @@ TQString SpecialInformation::parserGroupName(const TQString& name)
     return name;
 }
 
-TQStringList SpecialInformation::groups()
+TQStringList KDE_EXPORT SpecialInformation::groups()
 {
   return m_groups.keys();
 }
 
-TQStringList SpecialInformation::functions(const TQString& g)
+TQStringList KDE_EXPORT SpecialInformation::functions(const TQString& g)
 {
   int gid = group(g);
   if (gid == -1)
@@ -279,7 +281,7 @@ bool SpecialFunction::isSupported(ParserType p) const
   return (m_parserTypes & p);
 }
 
-void SpecialInformation::registerSpecials()
+void KDE_EXPORT SpecialInformation::registerSpecials()
 {
   insertGroup(Group::DCOP, "DCOP", "");
   insert(DCOP::addUniqueItem, "addUniqueItem(TQString widget, TQString item)",
diff --git a/kommander/pluginmanager/CMakeLists.txt b/kommander/pluginmanager/CMakeLists.txt
new file mode 100644
index 00000000..fb05a9ea
--- /dev/null
+++ b/kommander/pluginmanager/CMakeLists.txt
@@ -0,0 +1,32 @@
+# tdewebdev/kommander/pluginmanager
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmdr-plugins (executable)
+
+tde_add_executable( kmdr-plugins AUTOMOC
+
+  SOURCES
+        main.cpp
+        mainwindow.cpp
+        pluginmanager.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt
new file mode 100644
index 00000000..92cf9271
--- /dev/null
+++ b/kommander/widget/CMakeLists.txt
@@ -0,0 +1,38 @@
+# tdewebdev/kommander/widget
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidget (shared)
+
+tde_add_library( kommanderwidget SHARED AUTOMOC
+
+  SOURCES
+        expression.cpp function.cpp
+        functionlib.cpp invokeclass.cpp
+        kmdrmainwindow.cpp kommanderfunctions.cpp
+        kommanderwidget.cpp kommanderwindow.cpp
+        myprocess.cpp parsenode.cpp
+        parser.cpp parserdata.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 5805c58d..845cc905 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kmdrmainwindow.h"
 
 #include <tqtimer.h>
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 91be985d..cc1b57d3 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,7 +17,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KmdrMainWindow : public TDEMainWindow
+class KDE_EXPORT KmdrMainWindow : public TDEMainWindow
 {
 Q_OBJECT
   
diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt
new file mode 100644
index 00000000..f3d6c709
--- /dev/null
+++ b/kommander/widgets/CMakeLists.txt
@@ -0,0 +1,49 @@
+# tdewebdev/kommander/widgets
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidgets (shared)
+
+tde_add_library( kommanderwidgets SHARED AUTOMOC
+
+  SOURCES
+        aboutdialog.cpp buttongroup.cpp
+        checkbox.cpp closebutton.cpp
+        combobox.cpp datepicker.cpp dialog.cpp
+        execbutton.cpp fileselector.cpp
+        fontdialog.cpp groupbox.cpp
+        konsole.cpp label.cpp
+        lineedit.cpp listbox.cpp
+        pixmaplabel.cpp plugin.cpp
+        popupmenu.cpp progressbar.cpp
+        radiobutton.cpp richtexteditor.cpp
+        scriptobject.cpp slider.cpp
+        spinboxint.cpp statusbar.cpp
+        subdialog.cpp table.cpp
+        tabwidget.cpp textbrowser.cpp
+        textedit.cpp timer.cpp
+        toolbox.cpp treewidget.cpp
+        wizard.cpp
+  LINK
+     tdeio-shared
+     kommanderwidget-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index a9a8f77f..db473520 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqfile.h>
 #include "aboutdialog.h"
 
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index 440541c8..37dedec4 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -21,7 +21,7 @@ class TDEAboutData;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class AboutDialog : public TQLabel, public KommanderWidget
+class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 419fc8d2..59a1e372 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "fontdialog.h"
 
 #include "kommanderplugin.h"
diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h
index c9e9e7ba..375e6cea 100644
--- a/kommander/widgets/fontdialog.h
+++ b/kommander/widgets/fontdialog.h
@@ -20,7 +20,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class FontDialog : public TQLabel, public KommanderWidget
+class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 343526ae..7a570dd3 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "popupmenu.h"
 #include "specials.h"
 
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index 7d691ff0..4bf073b8 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class PopupMenu : public TQLabel, public KommanderWidget
+class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index 6dfc8b89..4df6b78e 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "toolbox.h"
 #include "kommanderplugin.h"
 #include "specials.h"
diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h
index 1d253c90..b1563c13 100644
--- a/kommander/widgets/toolbox.h
+++ b/kommander/widgets/toolbox.h
@@ -18,7 +18,8 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class ToolBox : public TQToolBox, public KommanderWidget
+
+class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/working/CMakeLists.txt b/kommander/working/CMakeLists.txt
new file mode 100644
index 00000000..d03e032a
--- /dev/null
+++ b/kommander/working/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory( plugintemplate )
+
+install(
+    PROGRAMS kmdr2po extractkmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/translating
+)
diff --git a/kommander/working/plugintemplate/CMakeLists.txt b/kommander/working/plugintemplate/CMakeLists.txt
new file mode 100644
index 00000000..e0b0430f
--- /dev/null
+++ b/kommander/working/plugintemplate/CMakeLists.txt
@@ -0,0 +1,17 @@
+# kommander/working/plugintemplate
+
+install(
+    FILES kommanderplugin.png
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard
+)
+
+install(
+    FILES kommanderplugin.tdevtemplate
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates
+)
+
+tde_create_tarball(
+    TARGET kommanderplugin.tar.gz
+    FILES src-Makefile.am plugin.cpp widget.h widget.cpp app.tdevelop
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates
+)
diff --git a/kxsldbg/CMakeLists.txt b/kxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..84d7a386
--- /dev/null
+++ b/kxsldbg/CMakeLists.txt
@@ -0,0 +1,97 @@
+# tdewebdev/kxsldbg
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+add_definitions( "${ICU_CXXFLAGS}" )
+
+
+add_subdirectory( kxsldbgpart )
+#add_subdirectory( data )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+  ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kxsldbg (executable)
+
+tde_add_executable( kxsldbg AUTOMOC
+
+  SOURCES
+        kxsldbg.cpp
+        main.cpp
+        kxsldbgif.skel
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     tqtnotfier-static
+     kxsldbgcommon-static
+     xsldbg-static
+     ${LIBXML_LIBRARIES}
+     ${LIBXSLT_LIBRARIES}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### xsldbg (executable)
+
+tde_add_executable( xsldbg AUTOMOC
+
+  SOURCES
+        xsldbgmain.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     xsldbg-static
+     ${LIBXML_LIBRARIES}
+     ${LIBXSLT_LIBRARIES}
+     ${LIBEXSLT_LIBRARIES}
+     ${READLINE_LIBRARIES}
+     ${CURSES_LIBRARIES}
+
+  DEPENDENCIES
+     xsldbg-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( kxsldbg )
+
+
+##### other data
+
+install(
+    FILES kxsldbg_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kxsldbg
+)
+
+install(
+    FILES xsldbg.desktop
+    DESTINATION ${APPS_INSTALL_DIR}/.hidden
+)
+
+install(
+    FILES kxsldbg.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/kxsldbg/ConfigureChecks.cmake b/kxsldbg/ConfigureChecks.cmake
new file mode 100644
index 00000000..edc884d0
--- /dev/null
+++ b/kxsldbg/ConfigureChecks.cmake
@@ -0,0 +1,10 @@
+##### check for icu's c++ standard
+
+include( TDEMacros )
+find_package(PkgConfig)
+pkg_search_module( ICU_UC icu-uc )
+
+tde_execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+    OUTPUT_VARIABLE ICU_CXXFLAGS
+)
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index a60805bd..1d3420ad 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -2,7 +2,7 @@
 #define KXSLDBG_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <tdeapplication.h>
diff --git a/kxsldbg/kxsldbgpart/CMakeLists.txt b/kxsldbg/kxsldbgpart/CMakeLists.txt
new file mode 100644
index 00000000..b1060f61
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/CMakeLists.txt
@@ -0,0 +1,107 @@
+# tdewebdev/kxsldbg/kxsldbgpart
+
+add_subdirectory( libtqtnotfier )
+add_subdirectory( libxsldbg     )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kxsldbgcommon (static)
+
+tde_add_library( kxsldbgcommon STATIC_PIC AUTOMOC
+
+  SOURCES
+        kxsldbg_partif.skel
+        xsldbgwalkspeed.ui
+        xsldbgtemplates.ui
+        xsldbgsources.ui
+        xsldbgmsgdialog.ui
+        xsldbglocalvariables.ui
+        xsldbgglobalvariables.ui
+        xsldbgentities.ui
+        xsldbgconfig.ui
+        xsldbgcallstack.ui
+        xsldbgbreakpoints.ui
+        xsldbgwalkspeedimpl.cpp
+        xsldbgtemplatesimpl.cpp
+        xsldbgtemplatelistitem.cpp
+        xsldbgsourcesimpl.cpp
+        xsldbgoutputview.cpp
+        xsldbglocalvariablesimpl.cpp
+        xsldbglocallistitem.cpp
+        xsldbglistitem.cpp
+        xsldbginspector.cpp
+        xsldbgglobalvariablesimpl.cpp
+        xsldbggloballistitem.cpp
+        xsldbgentitiesimpl.cpp
+        xsldbgdoc.cpp
+        xsldbgdialogbase.cpp
+        xsldbgdebugger.cpp
+        xsldbgconfigimpl.cpp
+        xsldbgcallstackimpl.cpp
+        xsldbgbreakpointsimpl.cpp
+        xsldbgbreakpointlistitem.cpp
+        qxsldbgdoc.cpp
+        kxsldbg_part.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     kjs-shared
+     xsldbg-static
+     tqtnotfier-static
+)
+
+
+##### libkxsldbgpart (kpart)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_kpart( libkxsldbgpart AUTOMOC
+
+  SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+  LINK
+     katepartinterfaces-shared
+     tdecore-shared
+     tdeui-shared
+     kjs-shared
+     tdeio-shared
+     tdeparts-shared
+     kxsldbgcommon-static
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+    FILES kxsldbg_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES kxsldbg_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kxsldbgpart
+)
+
diff --git a/kxsldbg/kxsldbgpart/dummy.cpp b/kxsldbg/kxsldbgpart/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/kxsldbg/kxsldbgpart/dummy.cpp
+++ /dev/null
diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
new file mode 100644
index 00000000..b2363d13
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
@@ -0,0 +1,33 @@
+# tdewebdev/kxsldbg/kxsldbgpart/libtqtnotfier
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+  ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tqtnotfier (static)
+
+tde_add_library( tqtnotfier STATIC_PIC AUTOMOC
+
+  SOURCES
+        xsldbgthread.cpp
+        xsldbgnotifier.cpp
+        xsldbgevent.cpp
+        xsldbgdebuggerbase.cpp
+        qtnotifier2.cpp
+  LINK
+     ${LIBXSLT_LIBRARIES}
+     ${CMAKE_THREAD_LIBS_INIT}
+)
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..e017ffb7
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
@@ -0,0 +1,55 @@
+# tdewebdev/kxsldbg/kxsldbgpart/libxsldbg
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+  ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_definitions( -DDOCS_PATH=\"${DOCS_PATH}\" )
+
+
+##### xsldbg (static)
+
+tde_add_library( xsldbg STATIC_PIC AUTOMOC
+
+  SOURCES
+        allmoc.cpp
+        xsldbgthread.cpp
+        xsldbg.cpp
+        xsldbgmsg.cpp
+        variable_cmds.cpp
+        utils.cpp
+        trace_cmds.cpp
+        template_cmds.cpp
+        search_cmds.cpp
+        search.cpp
+        param_cmds.cpp
+        os_cmds.cpp
+        options_unix.cpp
+        options.cpp
+        option_cmds.cpp
+        nodeview_cmds.cpp
+        help_unix.cpp
+        files_unix.cpp
+        files.cpp
+        file_cmds.cpp
+        debug.cpp
+        callstack.cpp
+        breakpoint_cmds.cpp
+        breakpoint.cpp
+        arraylist.cpp
+        debugXSL.cpp
+  LINK
+     ${LIBXSLT_LIBRARIES}
+)
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 8593ab6b..0bcd8edb 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -20,6 +20,14 @@
  * Uses docs/xsldoc.xsl docs/xsldoc.xml and xslproc to generate text
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef XSLDBG_BIN
+#define XSLDBG_BIN "xsldbg"
+#endif
+
 #include "xsldbg.h"
 #include "options.h"
 #include "utils.h"
@@ -28,7 +36,7 @@
 #include "files.h"
 #include <stdlib.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h> 
+#include <kstandarddirs.h>
 
 /**
  * helpTop:
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
index 68fcd7e1..6d30193d 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
@@ -7,6 +7,13 @@
     email                : k_isdale@tpg.com.au
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef XSLDBG_BIN
+#define XSLDBG_BIN "xsldbg"
+#endif
 
 #include "xsldbg.h"
 #include "debugXSL.h"
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index fb9b619d..5e0b35ef 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -33,7 +33,6 @@
 #include "kxsldbgpart/libxsldbg/xsldbg.h"
 #include "kxsldbgpart/libxsldbg/options.h"
 
-#include <libxslt/xsltutils.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aaa33883..a76ed738 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -21,3 +21,5 @@ include_directories(
 tde_add_library( quantamodule STATIC_PIC AUTOMOC
   SOURCES qextfileinfo.cpp ksavealldialog.cpp
 )
+
+add_subdirectory( compatibility )
diff --git a/lib/compatibility/CMakeLists.txt b/lib/compatibility/CMakeLists.txt
new file mode 100644
index 00000000..e879bf03
--- /dev/null
+++ b/lib/compatibility/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( tdemdi )
diff --git a/lib/compatibility/tdemdi/CMakeLists.txt b/lib/compatibility/tdemdi/CMakeLists.txt
new file mode 100644
index 00000000..c3973143
--- /dev/null
+++ b/lib/compatibility/tdemdi/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_subdirectory( qextmdi )
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantatdemdi STATIC_PIC AUTOMOC
+
+  SOURCES
+        dummy.cpp
+  LINK
+      tdeparts-shared
+      tdeio-shared
+      quantaqextmdi-static
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
new file mode 100644
index 00000000..cf569494
--- /dev/null
+++ b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
@@ -0,0 +1,27 @@
+#add_subdirectory( res )
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi/res
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantaqextmdi STATIC_PIC AUTOMOC
+
+  SOURCES
+        tdemdichildarea.cpp tdemdichildfrm.cpp
+        tdemdichildfrmcaption.cpp tdemdichildview.cpp
+        tdemdimainfrm.cpp tdemditaskbar.cpp
+		tdemultitabbar.cpp tdemditoolviewaccessor.cpp
+		tdemdidocumentviewtabwidget.cpp tdemdifocuslist.cpp
+		tdemdiguiclient.cpp ktabwidget.cpp
+		ktabbar.cpp kdockwidget.cpp
+		kdockwidget_private.cpp tdemdidockcontainer.cpp
+  LINK
+      tdeparts-shared
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index ee670afb..33c1ad94 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -42,7 +42,10 @@
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 2b1dfea6..828ae5d9 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -33,7 +33,9 @@
  * ATTENTION: please do you part to try to make this file legible.  It's
  * extremely hard to read already.  Especially follow the indenting rules.
  */
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <assert.h>
 
diff --git a/quanta/components/CMakeLists.txt b/quanta/components/CMakeLists.txt
index 7e0cad97..6c1f4b84 100644
--- a/quanta/components/CMakeLists.txt
+++ b/quanta/components/CMakeLists.txt
@@ -11,8 +11,11 @@
 
 # FIXME cvsservice is not ported
 
-add_subdirectory( csseditor )
+add_subdirectory( csseditor   )
 add_subdirectory( framewizard )
 add_subdirectory( tableeditor )
-add_subdirectory( debugger )
-# add_subdirectory( cvsservice )
+add_subdirectory( debugger    )
+
+if( BUILD_CVSSERVICE )
+add_subdirectory( cvsservice )
+endif()
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index 2661d75d..fe769a0e 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -405,7 +405,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index cb4ed81b..b4062318 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -976,10 +976,9 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 7675741a..77a0f915 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -430,12 +430,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/cvsservice/CMakeLists.txt b/quanta/components/cvsservice/CMakeLists.txt
new file mode 100644
index 00000000..7f2010ae
--- /dev/null
+++ b/quanta/components/cvsservice/CMakeLists.txt
@@ -0,0 +1,21 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${CMAKE_SOURCE_DIR}/quanta/src
+  ${CMAKE_SOURCE_DIR}/quanta/project
+  ${CMAKE_SOURCE_DIR}/quanta/parsers
+  ${CMAKE_SOURCE_DIR}/quanta/utility
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+##### cvsservice (static)
+
+tde_add_library( cvsservice STATIC_PIC AUTOMOC
+
+  SOURCES
+        cvsservicedcopif.skel
+        cvscommitdlgs.ui
+        cvsupdatetodlgs.ui
+        cvsservice.cpp
+)
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index f63b910e..9ff2c938 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -144,7 +144,9 @@
     <tabstop>cancelButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index d4d2dc7b..bdec051a 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -195,4 +195,9 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index fcd4b1db..221b5bcd 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -321,9 +321,9 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kled.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kled.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 10888885..2f98a16b 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -722,7 +722,7 @@
     <slot>slotLocalProjectToggle(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index c9caa54c..92e5efd1 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -756,7 +756,7 @@
     <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index 58a79167..266989b9 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -339,7 +339,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
     <slot>slotHistoryclicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kled.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kled.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 3e024de5..fbd189b5 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -538,4 +538,7 @@
 </connections>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index 29511351..be3c7553 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -639,4 +639,7 @@
     <tabstop>footerTableData</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index fae092c2..f9ecce1b 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -972,10 +972,6 @@
     <tabstop>buttonApply</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kkeybutton.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
 <Q_SLOTS>
     <slot>buttonOk_clicked()</slot>
     <slot>slotNewAction()</slot>
@@ -991,11 +987,12 @@
     <slot>slotTextChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kicondialog.h</includehint>
-    <includehint>kkeybutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>filecombo.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kkeybutton.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">filecombo.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index 2914bef2..c8a95785 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -147,9 +147,8 @@ is the future of software, but it is no guarantee of success. How many open sour
     <slot>init()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ktextbrowser.h</includehint>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index 32e6c8f7..6e38acd2 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -1964,4 +1964,9 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
     <slot>slotFamilyChanged(int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index ce90582b..0a8de386 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -640,7 +640,9 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
     <tabstop>classGroup</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kicondialog.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kicondialog.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index ec85fa91..577f9ea9 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -147,6 +147,7 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">fourbuttonmessagebox.ui.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <variables>
     <variable>int m_status;</variable>
diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index 10950ae7..d6adcd29 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -69,4 +69,8 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index fc53fe16..de8cbd6d 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -350,8 +350,10 @@
     <slot>slotNewGroup()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index c10bc62e..a9a606bf 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -146,8 +146,8 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index e7a71fa1..4072c177 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -127,4 +127,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/parsers/dtd/CMakeLists.txt b/quanta/parsers/dtd/CMakeLists.txt
index 7997cc5a..b791ed37 100644
--- a/quanta/parsers/dtd/CMakeLists.txt
+++ b/quanta/parsers/dtd/CMakeLists.txt
@@ -1,3 +1,9 @@
+##### configure checks
+
+include( ConfigureChecks.cmake )
+add_definitions( "${ICU_CXXFLAGS}" )
+
+
 #################################################
 #
 #  (C) 2010-2011 Serghei Amelian
@@ -11,6 +17,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/quanta/dialogs
   ${CMAKE_SOURCE_DIR}/lib
   ${CMAKE_SOURCE_DIR}/quanta/parsers
diff --git a/quanta/parsers/dtd/ConfigureChecks.cmake b/quanta/parsers/dtd/ConfigureChecks.cmake
new file mode 100644
index 00000000..edc884d0
--- /dev/null
+++ b/quanta/parsers/dtd/ConfigureChecks.cmake
@@ -0,0 +1,10 @@
+##### check for icu's c++ standard
+
+include( TDEMacros )
+find_package(PkgConfig)
+pkg_search_module( ICU_UC icu-uc )
+
+tde_execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+    OUTPUT_VARIABLE ICU_CXXFLAGS
+)
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 502551fd..0562f61e 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -13,6 +13,10 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 //qt includes
 #include <tqcheckbox.h>
 #include <tqfile.h>
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index c826dd73..baa146be 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -453,4 +453,9 @@
     <slot access="protected" specifier="pure virtual">linkChanged( const TQString&amp; )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 73bb8666..6bdcfb37 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -217,7 +217,8 @@
     <slot>slotDeleteEvent()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index 995aa1d4..50f01646 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -233,4 +233,7 @@
     <slot>slotActionChanged(const TQString &amp;name)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui
index 1d972b7b..860167a0 100644
--- a/quanta/project/membereditdlgs.ui
+++ b/quanta/project/membereditdlgs.ui
@@ -182,15 +182,9 @@
     <slot>slotSelectFromAddrBook()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index df0d8539..c499d194 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -284,9 +284,8 @@
     <tabstop>button</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kled.h</includehint>
-    <includehint>uploadtreeview.h</includehint>
-    <includehint>kled.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">uploadtreeview.h</include>
+	<include location="global" impldecl="in implementation">kled.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 5c91636f..d8900e5f 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -491,7 +491,10 @@
     <slot>slotNewProfileSelected(const TQString&amp;)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>uploadtreeview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">uploadtreeview.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index 8fb4b774..f35469e1 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -248,8 +248,8 @@
     <tabstop>buttonHelp</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-    <includehint>uploadtreeview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kprogress.h</include>
+	<include location="global" impldecl="in implementation">uploadtreeview.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui
index d1a0a168..dd60b002 100644
--- a/quanta/project/subprojecteditdlgs.ui
+++ b/quanta/project/subprojecteditdlgs.ui
@@ -70,4 +70,7 @@
     <tabstop>createNew</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index 512c02ca..de4abff8 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -238,12 +238,9 @@
     <slot>slotSetToYourself()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index de6521e6..9830013f 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -307,4 +307,9 @@ is obscured, saving the password in any file is a security risk. Use this option
     <tabstop>cancelButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
 </UI>
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index a5a87110..50e676c0 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -122,4 +122,7 @@
     <slot>buttonEditProfiles_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index ff7d5d4c..dfd385f1 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/quanta/components/tableeditor
   ${CMAKE_BINARY_DIR}/quanta/components/csseditor
   ${CMAKE_BINARY_DIR}/quanta/components/framewizard
+  ${CMAKE_BINARY_DIR}/quanta/components/cvsservice
   ${CMAKE_SOURCE_DIR}/lib
   ${CMAKE_SOURCE_DIR}/quanta/src
   ${CMAKE_SOURCE_DIR}/quanta/project
@@ -31,6 +32,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/components/tableeditor
   ${CMAKE_SOURCE_DIR}/quanta/components/csseditor
   ${CMAKE_SOURCE_DIR}/quanta/components/framewizard
+  ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
   ${CMAKE_SOURCE_DIR}/quanta/messages
   ${CMAKE_SOURCE_DIR}/quanta/treeviews
   ${CMAKE_SOURCE_DIR}/quanta/plugins
@@ -57,6 +59,7 @@ install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
 set_property( SOURCE kqapp.cpp APPEND PROPERTY COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}" )
 
 tde_add_executable( quanta AUTOMOC
+
   SOURCES
     quanta_init.cpp quantaview.cpp quantadoc.cpp
     main.cpp document.cpp kqapp.cpp quanta.cpp
@@ -64,15 +67,19 @@ tde_add_executable( quanta AUTOMOC
     dcopquantaif.skel dcopsettings.cpp dtds.cpp
     dcopquanta.cpp viewmanager.cpp
   LINK
-    project-static plugins-static parser-static
-    dtdparser-static treeviews-static dialogs-static
-    debuggermanager-static tagdialogs-static
-    settingsdialogs-static messages-static
-    framewizard-static csseditor-static
-    tableeditor-static preview-static
-    utility-static quantamodule-static
-    kafkalibrary-static tdemdi-shared tdehtml-shared
-    tdenewstuff-shared tdeabc-shared tdetexteditor-shared
-    ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
+     tdecore-shared tdeui-shared tdeio-shared
+     katepartinterfaces-shared tdenewstuff-shared
+     tdeabc-shared tdetexteditor-shared
+     tdemdi-shared tdehtml-shared tdespell-shared
+     kafkalibrary-static project-static
+     plugins-static parser-static
+     dtdparser-static treeviews-static
+     dialogs-static debuggermanager-static
+     tagdialogs-static settingsdialogs-static
+     messages-static framewizard-static
+     csseditor-static tableeditor-static
+     preview-static utility-static quantamodule-static
+     ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CVSSERVICE_LIBRARIES}
+
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index d72cce65..ada70492 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -15,6 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <time.h>
 
 // include files for QT
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index f01f22d7..62931561 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -16,6 +16,10 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // include files for QT
 #include <tqdir.h>
 #include <tqprinter.h>
@@ -1348,6 +1352,7 @@ TQString QuantaInit::retrievePID(const TQString& filename)
  TQString strPID = TQString();
  strPID = filename.mid(filename.findRev("P") + 1);
 
+
  if (strPID.isEmpty())
   strPID = filename.mid(filename.findRev("N") + 1);
 
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 831b81f0..92e502a2 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -12,6 +12,10 @@
  *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 //qt includes
 #include <tqdir.h>
 
diff --git a/quanta/treeviews/CMakeLists.txt b/quanta/treeviews/CMakeLists.txt
index 094ab227..6efaf7d5 100644
--- a/quanta/treeviews/CMakeLists.txt
+++ b/quanta/treeviews/CMakeLists.txt
@@ -1,3 +1,9 @@
+##### configure checks
+
+include( ConfigureChecks.cmake )
+add_definitions( "${ICU_CXXFLAGS}" )
+
+
 #################################################
 #
 #  (C) 2010-2011 Serghei Amelian
@@ -11,6 +17,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/quanta/dialogs/tagdialogs
   ${CMAKE_SOURCE_DIR}/lib
   ${CMAKE_SOURCE_DIR}/quanta/src
@@ -22,9 +29,11 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/messages
   ${CMAKE_SOURCE_DIR}/quanta/parts/kafka
   ${CMAKE_SOURCE_DIR}/quanta/components/csseditor
+  ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
   ${CMAKE_SOURCE_DIR}/quanta/plugins
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR}
   ${LIBXML_INCLUDE_DIRS}
 )
 
diff --git a/quanta/treeviews/ConfigureChecks.cmake b/quanta/treeviews/ConfigureChecks.cmake
new file mode 100644
index 00000000..edc884d0
--- /dev/null
+++ b/quanta/treeviews/ConfigureChecks.cmake
@@ -0,0 +1,10 @@
+##### check for icu's c++ standard
+
+include( TDEMacros )
+find_package(PkgConfig)
+pkg_search_module( ICU_UC icu-uc )
+
+tde_execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+    OUTPUT_VARIABLE ICU_CXXFLAGS
+)
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 1de8333b..444bbc0c 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -15,6 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 // KDE includes
 #include <kdebug.h>
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 1bb822b3..c07a7183 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -15,6 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // QT includes
 #include <tqpainter.h>
 #include <tqlabel.h>
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index d70a6f6e..78a63b0d 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -244,4 +244,7 @@
     <tabstop>parentAttr</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index a8cb7705..b1b80b41 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -164,7 +164,7 @@
     <slot>okBtn_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>