WIP: CMake portfeat/cmake-port

Signed-off-by: Philippe Mavridis <philippe.mavridis@yandex.com>

104 files changed, 2414 insertions, 205 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..ba04c261a
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,95 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+project(koffice)
+
+### Includes ##################################################################
+include(FindPkgConfig)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckIncludeFile)
+include(CheckLibraryExists)
+include(CheckCSourceCompiles)
+include(CheckCXXSourceCompiles)
+
+include(TDEMacros)
+include(TDESetupPaths)
+include(TDEVersion)
+
+### Basic project setup ########################################################
+cmake_minimum_required(VERSION ${TDE_CMAKE_MINIMUM_VERSION})
+tde_set_project_version()
+tde_setup_paths()
+
+### Options ####################################################################
+option(WITH_ALL_OPTIONS    "Enable all optional support"    ON)
+option(WITH_LIBEXIF        "Enable libexif support"         ${WITH_ALL_OPTIONS})
+option(WITH_GRAPHICSMAGICK "Enable GraphicsMagick filter"   ${WITH_ALL_OPTIONS})
+option(WITH_IMAGEMAGICK    "Enable ImageMagick filter"      ${WITH_ALL_OPTIONS})
+option(WITH_OPENEXR        "Enable OpenEXR support"         ${WITH_ALL_OPTIONS})
+option(WITH_KEXI_MYSQL     "Enable Kexi MySQL plugin"       ${WITH_ALL_OPTIONS})
+option(WITH_KEXI_PGSQL     "Enable Kexi PostgreSQL plugin"  ${WITH_ALL_OPTIONS})
+option(WITH_KEXI_MACROS    "Enable Kexi macro plugin"       ${WITH_ALL_OPTIONS})
+option(WITH_KROSS_PYTHON   "Enable Kross Python plugin"     OFF)
+option(WITH_KROSS_RUBY     "Enable Kross Ruby plugin"       ${WITH_ALL_OPTIONS})
+
+### Components #################################################################
+option(BUILD_ALL           "Build all"                      ON)
+option(BUILD_DOC           "Build documentation"            ${BUILD_ALL})
+option(BUILD_TRANSLATIONS  "Build translations"             ${BUILD_ALL})
+option(BUILD_CHALK         "Build Chalk"                    ${BUILD_ALL})
+option(BUILD_KARBON        "Build Karbon"                   ${BUILD_ALL})
+option(BUILD_KCHART        "Build KChart"                   ${BUILD_ALL})
+option(BUILD_KDGANTT       "Build KDGantt"                  ${BUILD_ALL})
+option(BUILD_KEXI          "Build Kexi"                     ${BUILD_ALL})
+option(BUILD_KFORMULA      "Build KFormula"                 ${BUILD_ALL})
+option(BUILD_KIVIO         "Build Kivio"                    ${BUILD_ALL})
+option(BUILD_KOSHELL       "Build KOffice Workspace"        ${BUILD_ALL})
+option(BUILD_KPLATO        "Build KPlato"                   ${BUILD_ALL})
+option(BUILD_KPRESENTER    "Build KPresenter"               ${BUILD_ALL})
+option(BUILD_KSPREAD       "Build KSpread"                  ${BUILD_ALL})
+option(BUILD_KUGAR         "Build Kugar"                    ${BUILD_ALL})
+option(BUILD_KWORD         "Build KWord"                    ${BUILD_ALL})
+option(BUILD_KROSS         "Build Kross scripting library"  ${BUILD_ALL})
+option(BUILD_EXAMPLE       "Build KOffice example part"     OFF)
+option(BUILD_TESTS         "Build KOffice tests"            OFF)
+
+### Configuration #############################################################
+include(ConfigureChecks.cmake)
+configure_file(config.h.cmake config.h @ONLY)
+
+### Subdirectories ############################################################
+add_subdirectory(lib)
+add_subdirectory(interfaces)
+add_subdirectory(autocorrect)
+add_subdirectory(kounavail)
+add_subdirectory(pics)
+# add_subdirectory(plugins)
+add_subdirectory(servicetypes)
+add_subdirectory(templates)
+# add_subdirectory(tools)
+# add_subdirectory(filters)
+#
+tde_conditional_add_project_docs(BUILD_DOC)
+tde_conditional_add_project_translations(BUILD_TRANSLATIONS)
+#
+# tde_conditional_add_subdirectory(BUILD_CHALK chalk)
+tde_conditional_add_subdirectory(BUILD_EXAMPLE example)
+# tde_conditional_add_subdirectory(BUILD_KARBON karbon)
+tde_conditional_add_subdirectory(BUILD_KCHART kchart)
+# tde_conditional_add_subdirectory(BUILD_KDGANTT kdgantt)
+tde_conditional_add_subdirectory(BUILD_KFORMULA kformula)
+# tde_conditional_add_subdirectory(BUILD_KIVIO kivio)
+# tde_conditional_add_subdirectory(BUILD_KOSHELL koshell)
+tde_conditional_add_subdirectory(BUILD_KPRESENTER kpresenter)
+# tde_conditional_add_subdirectory(BUILD_KSPREAD kspread)
+# tde_conditional_add_subdirectory(BUILD_KUGAR kugar)
+tde_conditional_add_subdirectory(BUILD_KWORD kword)
+# tde_conditional_add_subdirectory(BUILD_KPLATO kplato)
+# tde_conditional_add_subdirectory(BUILD_KEXI kexi)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 000000000..fd4c8d46d
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,38 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### TQt/TDE ###################################################################
+find_package(TQt)
+find_package(TDE)
+tde_setup_architecture_flags()
+tde_setup_largefiles()
+
+### Big Endian ################################################################
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+### System headers ############################################################
+check_include_file("unistd.h"        HAVE_UNISTD_H)
+check_include_file("sys/param.h"     HAVE_SYS_PARAM_H)
+check_include_file("floatingpoint.h" HAVE_FLOATINGPOINT_H)
+check_include_file("paths.h"         HAVE_PATHS_H)
+
+### KOffice library ##########################################################
+if (BUILD_CHALK OR BUILD_KARBON OR BUILD_KIVIO OR BUILD_KPRESENTER)
+  set(BUILD_KOPAINTER ON)
+endif()
+
+include(lib/ConfigureChecks.cmake)
+include(filters/ConfigureChecks.cmake)
+include(kword/ConfigureChecks.cmake)
+
+### KOffice applications ######################################################
+if (BUILD_CHALK)
+  include(chalk/ConfigureChecks.cmake)
+endif()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/autocorrect/CMakeLists.txt b/autocorrect/CMakeLists.txt
new file mode 100644
index 000000000..db4c0d413
--- /dev/null
+++ b/autocorrect/CMakeLists.txt
@@ -0,0 +1,14 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+install(
+  FILES autocorrect.xml en_US.xml
+  DESTINATION ${DATA_INSTALL_DIR}/koffice/autocorrect
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/chalk/ConfigureChecks.cmake b/chalk/ConfigureChecks.cmake
new file mode 100644
index 000000000..6a7e6fa1e
--- /dev/null
+++ b/chalk/ConfigureChecks.cmake
@@ -0,0 +1,65 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+check_symbol_exists("powf"  "math.h" HAVE_MATH_POWF)
+
+### XInput ####################################################################
+pkg_search_module(XINPUT xi)
+if (NOT XINPUT_FOUND)
+  tde_message_fatal("XInput is required for Chalk, but was not found")
+endif()
+
+### LittleCMS #################################################################
+pkg_search_module(LCMS lcms)
+if (NOT LCMS_FOUND)
+  tde_message_fatal("lcms1 is required for Chalk, but was not found")
+endif()
+
+### OpenGL ####################################################################
+check_include_file("GL/gl.h"  HAVE_GL_H)
+check_include_file("GL/glu.h" HAVE_GLU_H)
+
+if (NOT HAVE_GL_H OR NOT HAVE_GLU_H)
+  tde_message_fatal("OpenGL is required for Chalk, but headers are missing")
+endif()
+
+### EXIF ######################################################################
+pkg_search_module(EXIF libexif)
+if (NOT EXIF_FOUND)
+  message(WARNING "libexif is missing, "
+                  "Chalk won't be able to import/export JPEG files")
+endif()
+
+### JPEG ######################################################################
+find_package(JPEG)
+if (NOT JPEG_FOUND)
+  message(WARNING "libjpeg is missing, "
+                  "Chalk won't be able to import/export JPEG files")
+endif()
+
+### PNG #######################################################################
+find_package(PNG)
+if (NOT PNG_FOUND)
+  message(WARNING "libpng is missing, "
+                  "Chalk won't be able to import/export PNG files")
+endif()
+
+### TIFF ######################################################################
+find_package(TIFF)
+if (NOT TIFF_FOUND)
+  message(WARNING "libtiff is missing, "
+                  "Chalk won't be able to import/export TIFF files")
+endif()
+
+### poppler-tqt ###############################################################
+pkg_search_module(POPPLER poppler-tqt)
+if (NOT POPPLER_FOUND)
+  message(WARNING "poppler-tqt is missing, "
+                  "Chalk won't be able to import PDF files")
+endif()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/chalk/core/kis_painter.cpp b/chalk/core/kis_painter.cpp
index f3f5c9286..bb41fdfc0 100644
--- a/chalk/core/kis_painter.cpp
+++ b/chalk/core/kis_painter.cpp
@@ -625,10 +625,10 @@ void KisPainter::paintEllipse (const KisPoint &startPoint,
     KisRect r = KisRect(startPoint, endPoint).normalize();
 
     // See http://www.whizkidtech.redprince.net/bezier/circle/ for explanation.
-    // kappa = (4/3*(sqrt(2)-1))
-    const double kappa = 0.5522847498;
-    const double lx = (r.width() / 2) * kappa;
-    const double ly = (r.height() / 2) * kappa;
+    // tdeAppa = (4/3*(sqrt(2)-1))
+    const double tdeAppa = 0.5522847498;
+    const double lx = (r.width() / 2) * tdeAppa;
+    const double ly = (r.height() / 2) * tdeAppa;
 
     KisPoint center = r.center();
 
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 000000000..1b9955e2b
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,18 @@
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __TDE_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 VERSION "@VERSION@"
+#define PREFIX "@CMAKE_INSTALL_PREFIX@"
+
+// Chalk: powf exists in math.h
+#define HAVE_POWF @HAVE_MATH_POWF@
+
+// Kross: if your system has Ruby 1.9.x
+#cmakedefine HAVE_RUBY_1_9
+
+// Kross: if your system has Ruby 3.x
+#cmakedefine HAVE_RUBY_3
\ No newline at end of file
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
new file mode 100644
index 000000000..c463bcd4a
--- /dev/null
+++ b/example/CMakeLists.txt
@@ -0,0 +1,61 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(libexamplepart SHARED AUTOMOC
+  SOURCES example_part.cpp example_view.cpp example_factory.cpp
+  LINK kofficeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Programs ##################################################################
+tde_add_tdeinit_executable(example AUTOMOC
+  SOURCES main.cpp
+  LINK kofficeui-shared
+)
+
+### Data ######################################################################
+install(
+  FILES example.rc example_readonly.rc
+  DESTINATION ${DATA_INSTALL_DIR}/example
+)
+
+tde_create_translated_desktop(
+    SOURCE example.desktop
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE examplepart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE x-vnd.kde.example.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+    PO_DIR koffice-desktops
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/filters/ConfigureChecks.cmake b/filters/ConfigureChecks.cmake
new file mode 100644
index 000000000..db6263cbd
--- /dev/null
+++ b/filters/ConfigureChecks.cmake
@@ -0,0 +1,8 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cpp b/filters/chalk/gmagick/kis_image_magick_converter.cpp
index 01e1ee141..5c9d8dc36 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cpp
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp
@@ -121,14 +121,14 @@ namespace {
     KisProfile * getProfileForProfileInfo(const Image * image)
     {
         size_t length;
-        
+
         const unsigned char * profiledata = GetImageProfile(image, "ICM", &length);
         if( profiledata == NULL )
             return 0;
         TQByteArray rawdata;
         rawdata.resize(length);
         memcpy(rawdata.data(), profiledata, length);
-        
+
         KisProfile* p = new KisProfile(rawdata);
         return p;
 
@@ -169,14 +169,14 @@ namespace {
     void setAnnotationsForImage(const Image * src, KisImageSP image)
     {
         size_t length;
-        
+
         const unsigned char * profiledata = GetImageProfile(src, "IPTC", &length);
         if( profiledata != NULL )
         {
             TQByteArray rawdata;
             rawdata.resize(length);
             memcpy(rawdata.data(), profiledata, length);
-            
+
             KisAnnotation* annotation = new KisAnnotation(TQString("IPTC"), "", rawdata);
             TQ_CHECK_PTR(annotation);
 
@@ -189,14 +189,14 @@ namespace {
             TQByteArray rawdata;
             rawdata.resize(length);
             memcpy(rawdata.data(), src->generic_profile[i].info, src->generic_profile[i].length);
-            
+
             KisAnnotation* annotation = new KisAnnotation(TQString(src->generic_profile[i].name), "", rawdata);
             TQ_CHECK_PTR(annotation);
 
             image -> addAnnotation(annotation);
         }
 #endif
-        
+
         const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
         while(imgAttr)
         {
@@ -204,7 +204,7 @@ namespace {
             int len = strlen(imgAttr -> value) + 1;
             rawdata.resize(len);
             memcpy(rawdata.data(), imgAttr -> value, len);
-            
+
             KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata );
             TQ_CHECK_PTR(annotation);
 
@@ -310,7 +310,6 @@ namespace {
 
         if (!init) {
             TDEApplication *app = tdeApp;
-
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
             init = true;
@@ -331,7 +330,6 @@ namespace {
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
         TDEApplication *app = tdeApp;
-
         Q_ASSERT(app);
 
         if (app -> hasPendingEvents())
@@ -408,7 +406,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
         kdDebug(41008) << "Exceptions happen when loading" << endl;
         return KisImageBuilder_RESULT_FAILURE;
     }
-    
+
 
     if (images == 0) {
         DestroyImageInfo(ii);
@@ -447,7 +445,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
         }
 
         kdDebug(41008) << "image has " << csName << " colorspace\n";
-        
+
         KisProfile * profile = getProfileForProfileInfo(image);
         if (profile)
         {
@@ -472,7 +470,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
             m_img = new KisImage(m_doc->undoAdapter(), image -> columns, image -> rows, cs, "built image");
             TQ_CHECK_PTR(m_img);
             m_img->blockSignals(true); // Don't send out signals while we're building the image
-            
+
             // XXX I'm assuming seperate layers won't have other profile things like EXIF
             setAnnotationsForImage(image, m_img);
         }
@@ -562,7 +560,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
                     while(! hiter.isDone())
                     {
                         TQ_UINT16 *ptr = reinterpret_cast<TQ_UINT16 *>(hiter.rawData());
-                        
+
                         *(ptr++) = ScaleQuantumToShort(pp->red);
                         *(ptr++) = ScaleQuantumToShort(pp->green);
                         *(ptr++) = ScaleQuantumToShort(pp->blue);
diff --git a/filters/chalk/magick/kis_image_magick_converter.cpp b/filters/chalk/magick/kis_image_magick_converter.cpp
index 5ea939e44..0c79e1f5f 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cpp
+++ b/filters/chalk/magick/kis_image_magick_converter.cpp
@@ -258,7 +258,6 @@ namespace {
 
         if (!init) {
             TDEApplication *app = tdeApp;
-
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
             init = true;
@@ -279,7 +278,6 @@ namespace {
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
         TDEApplication *app = tdeApp;
-
         Q_ASSERT(app);
 
         if (app -> hasPendingEvents())
@@ -292,7 +290,6 @@ namespace {
     unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
         TDEApplication *app = tdeApp;
-
         Q_ASSERT(app);
 
         if (app -> hasPendingEvents())
@@ -389,7 +386,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
         }
 
         kdDebug(41008) << "image has " << csName << " colorspace\n";
-        
+
         KisProfile * profile = getProfileForProfileInfo(image);
         if (profile)
         {
@@ -414,7 +411,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
             m_img = new KisImage(m_doc->undoAdapter(), image -> columns, image -> rows, cs, "built image");
             TQ_CHECK_PTR(m_img);
             m_img->blockSignals(true); // Don't send out signals while we're building the image
-            
+
             // XXX I'm assuming seperate layers won't have other profile things like EXIF
             setAnnotationsForImage(image, m_img);
         }
@@ -504,7 +501,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
                     while(! hiter.isDone())
                     {
                         TQ_UINT16 *ptr = reinterpret_cast<TQ_UINT16 *>(hiter.rawData());
-                        
+
                         *(ptr++) = ScaleQuantumToShort(pp->red);
                         *(ptr++) = ScaleQuantumToShort(pp->green);
                         *(ptr++) = ScaleQuantumToShort(pp->blue);
diff --git a/filters/karbon/ai/ai88handler.cpp b/filters/karbon/ai/ai88handler.cpp
index 87a937ae9..acc2ff679 100644
--- a/filters/karbon/ai/ai88handler.cpp
+++ b/filters/karbon/ai/ai88handler.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2002, Dirk Sch�nberger <dirk.schoenberger@sz-online.de>
+   Copyright (C) 2002, Dirk Sch�nberger <dirk.schoenberger@sz-online.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -281,7 +281,7 @@ bool AI88Handler::handleAIOperation (AIOperation op) {
       _handleTextBlock (TO_Fill);
       return true;
       break;
-    case AIO_TextBlockAppend :
+    case AIO_TextBloctdeAppend :
       _handleTextBlock (TO_Append);
       return true;
       break;
diff --git a/filters/karbon/ai/aiparserbase.cpp b/filters/karbon/ai/aiparserbase.cpp
index 24f9920e7..bb28d1cf7 100644
--- a/filters/karbon/ai/aiparserbase.cpp
+++ b/filters/karbon/ai/aiparserbase.cpp
@@ -87,7 +87,7 @@ static AIOperationMapping aiMappings[] = {
   { "z", AIO_SetCurrentText },
   { "a", AIO_TextBlockFillStroke },
   { "e", AIO_TextBlockFill },
-  { "I", AIO_TextBlockAppend },
+  { "I", AIO_TextBloctdeAppend },
   { "o", AIO_TextBlockIgnore },
   { "r", AIO_TextBlockStroke },
   { "t", AIO_TextOutput },
@@ -1303,7 +1303,7 @@ const void aiotoa (AIOperation &data)
     case AIO_SetCurrentText : tqDebug ("AIO_SetCurrentText"); break;
     case AIO_TextBlockFillStroke : tqDebug ("AIO_TextBlockFillStroke"); break;
     case AIO_TextBlockFill : tqDebug ("AIO_TextBlockFill"); break;
-    case AIO_TextBlockAppend : tqDebug ("AIO_TextBlockAppend"); break;
+    case AIO_TextBloctdeAppend : tqDebug ("AIO_TextBloctdeAppend"); break;
     case AIO_TextBlockIgnore : tqDebug ("AIO_TextBlockIgnore"); break;
     case AIO_TextBlockStroke : tqDebug ("AIO_TextBlockStroke"); break;
     case AIO_TextOutput : tqDebug ("AIO_TextOutput"); break;
diff --git a/filters/karbon/ai/aiparserbase.h b/filters/karbon/ai/aiparserbase.h
index 14c00a14e..6f95e501c 100644
--- a/filters/karbon/ai/aiparserbase.h
+++ b/filters/karbon/ai/aiparserbase.h
@@ -100,7 +100,7 @@ typedef enum {
   AIO_SetCurrentText,
   AIO_TextBlockFillStroke,
   AIO_TextBlockFill,
-  AIO_TextBlockAppend,
+  AIO_TextBloctdeAppend,
   AIO_TextBlockIgnore,
   AIO_TextBlockStroke,
   AIO_TextOutput,
diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
index 3120d0852..18a771b07 100644
--- a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
+++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
@@ -2157,7 +2157,7 @@ static BuiltinFontWidth symbolWidthsTab[] = {
   { "Xi",                                645, NULL },
   { "theta1",                            631, NULL },
   { "logicalnot",                        713, NULL },
-  { "Kappa",                             722, NULL },
+  { "tdeAppa",                             722, NULL },
   { "similar",                           549, NULL },
   { "bar",                               200, NULL },
   { "fraction",                          167, NULL },
@@ -2173,7 +2173,7 @@ static BuiltinFontWidth symbolWidthsTab[] = {
   { "arrowright",                        987, NULL },
   { "greater",                           549, NULL },
   { "bracketlefttp",                     384, NULL },
-  { "kappa",                             549, NULL },
+  { "tdeAppa",                             549, NULL },
   { "gradient",                          713, NULL },
   { "integral",                          274, NULL },
   { "arrowboth",                        1042, NULL },
diff --git a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
index 83774bf87..fa498254a 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
+++ b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
@@ -1381,7 +1381,7 @@ const char *symbolEncoding[256] = {
   "Eta",
   "Iota",
   "theta1",
-  "Kappa",
+  "tdeAppa",
   "Lambda",
   "Mu",
   "Nu",
@@ -1413,7 +1413,7 @@ const char *symbolEncoding[256] = {
   "eta",
   "iota",
   "phi1",
-  "kappa",
+  "tdeAppa",
   "lambda",
   "mu",
   "nu",
diff --git a/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h b/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h
index c32289a4f..80053444a 100644
--- a/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h
+++ b/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h
@@ -162,7 +162,7 @@ static struct {
   {0x0134, "Jcircumflex"},
   {0x004a, "Jsmall"},
   {0x004b, "K"},
-  {0x039a, "Kappa"},
+  {0x039a, "tdeAppa"},
   {0x0136, "Kcommaaccent"},
   {0x004b, "Ksmall"},
   {0x004c, "L"},
@@ -831,7 +831,7 @@ static struct {
   {0x006a, "j"},
   {0x0135, "jcircumflex"},
   {0x006b, "k"},
-  {0x03ba, "kappa"},
+  {0x03ba, "tdeAppa"},
   {0x0137, "kcommaaccent"},
   {0x0138, "kgreenlandic"},
   {0x006c, "l"},
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
new file mode 100644
index 000000000..eb0370926
--- /dev/null
+++ b/interfaces/CMakeLists.txt
@@ -0,0 +1,36 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/kstore
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_SOURCE_DIR}/kchart/kdchart
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kochart SHARED AUTOMOC
+  SOURCES koChart.cpp
+  LINK kofficecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(FILES koChart.h DESTINATION ${INCLUDE_INSTALL_DIR}/kross/main)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/CMakeLists.txt b/kchart/CMakeLists.txt
new file mode 100644
index 000000000..80f09bac2
--- /dev/null
+++ b/kchart/CMakeLists.txt
@@ -0,0 +1,85 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_SOURCE_DIR}/kchart/kdchart
+  ${CMAKE_SOURCE_DIR}/interfaces
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kchartcommon SHARED AUTOMOC
+  SOURCES
+    kchart_part.cpp kchart_view.cpp kchart_factory.cpp
+    kchartColorConfigPage.cpp kchartParameterConfigPage.cpp
+    kchartParameter3dConfigPage.cpp kchartBackgroundPixmapConfigPage.cpp
+    kchartSubTypeChartPage.cpp kchartComboConfigPage.cpp
+    kchartFontConfigPage.cpp kchartDataConfigPage.cpp kchartPieConfigPage.cpp
+    kchartParameterPieConfigPage.cpp kchartConfigDialog.cpp kchartWizard.cpp
+    kchartWizardLabelsLegendPage.cpp kchartWizardSelectChartSubTypePage.cpp
+    kchartWizardSelectChartTypePage.cpp kchartWizardSelectDataPage.cpp
+    kchartWizardSetupAxesPage.cpp kchartWizardSetupDataPage.cpp
+    kchartWizardSelectDataFormatPage.cpp
+    kchartDataEditor.cpp KChartViewIface.skel KChartViewIface.cpp
+    kchartLegendConfigPage.cpp kchart_params.cpp KChartParamsIface.skel
+    KChartParamsIface.cpp kchartHeaderFooterConfigPage.cpp
+    kchartLine3dConfigPage.cpp kchartParameterPolarConfigPage.cpp
+    kchartPageLayout.cpp kchartPrinterDlg.cpp
+    csvimportdialog.cpp csvimportdialogui.ui
+  LINK kofficeui-shared kdchart-shared kochart-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+tde_add_kpart(libkchartpart SHARED AUTOMOC
+  SOURCES kchart_factory_init.cpp
+  LINK kchartcommon-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+add_subdirectory(kdchart)
+
+### Programs ##################################################################
+tde_add_tdeinit_executable(kchart AUTOMOC
+  SOURCES main.cpp
+  LINK kofficecore-shared
+)
+
+### Data ######################################################################
+install(
+  FILES kchart.rc kchart_readonly.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kchart
+)
+
+tde_create_translated_desktop(
+    SOURCE kchart.desktop
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE kchartpart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+add_subdirectory(toolbar)
+add_subdirectory(pics)
+add_subdirectory(templates)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/kdchart/CMakeLists.txt b/kchart/kdchart/CMakeLists.txt
new file mode 100644
index 000000000..382210219
--- /dev/null
+++ b/kchart/kdchart/CMakeLists.txt
@@ -0,0 +1,56 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kdchart SHARED AUTOMOC
+  SOURCES
+    KDChart.cpp
+    KDChartAreaPainter.cpp KDChartAxesPainter.cpp KDChartAxisParams.cpp
+    KDChartBarPainter.cpp KDChartBaseSeries.cpp KDChartBWPainter.cpp
+    KDChartCustomBox.cpp KDChartDataIntern.cpp KDChartHiLoPainter.cpp
+    KDChartLinesPainter.cpp KDChartPainter.cpp KDChartParams.cpp
+    KDChartParams_frame.cpp KDChartParams_io.cpp KDChartPiePainter.cpp
+    KDChartPlaneSeries.cpp KDChartPolarPainter.cpp KDChartPropertySet.cpp
+    KDChartRingPainter.cpp KDChartSeriesCollection.cpp KDChartTableBase.cpp
+    KDChartTextPiece.cpp KDChartVectorSeries.cpp KDChartVectorTable.cpp
+    KDChartWidget.cpp KDDrawText.cpp KDFrame.cpp KDFrameProfileSection.cpp
+    KDXMLTools.cpp KDChartEnums.cpp KDChartAxisParamsWrapper.cpp
+    KDChartCustomBoxWrapper.cpp KDChartParamsWrapper.cpp
+    KDChartTableDataWrapper.cpp
+  LINK tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ##################################################################
+install(
+  FILES
+    KDChart.h
+    KDChartAreaPainter.h KDChartAxesPainter.h
+    KDChartBarPainter.h KDChartBaseSeries.h KDChartBWPainter.h
+    KDChartDataIntern.h KDChartDataRegion.h KDChartHiLoPainter.h
+    KDChartLinesPainter.h KDChartPiePainter.h KDChartPainter.h
+    KDChartPolarPainter.h KDChartRingPainter.h
+    KDChartSeriesCollection.h KDChartPlaneSeries.h
+    KDChartVectorSeries.h KDChartTextPiece.h KDDrawText.h
+    KDChartNotEnoughSpaceException.h KDChartUnknownTypeException.h
+    KDChartUnknownTypeException.h KDXMLTools.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/pics/CMakeLists.txt b/kchart/pics/CMakeLists.txt
new file mode 100644
index 000000000..da81f7420
--- /dev/null
+++ b/kchart/pics/CMakeLists.txt
@@ -0,0 +1,26 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+install(
+  FILES
+    chart_bar_beside.png chart_bar_layer.png chart_bar_percent.png
+    chart_hilo_close.png chart_hilo_normal.png chart_hilo_openclose.png
+    chart_area_normal.png chart_area_percent.png chart_area_stacked.png
+    chart_line_normal.png chart_line_percent.png chart_line_stacked.png
+    chart_polar_normal.png chart_polar_percent.png chart_polar_stacked.png
+    chart_legend_top.png chart_legend_topleft.png chart_legend_topright.png
+    chart_legend_nolegend.png chart_legend_left.png chart_legend_right.png
+    chart_legend_bottom.png chart_legend_bottomleft.png chart_legend_bottomright.png
+    chart_legend_toplefttop.png chart_legend_topleftleft.png
+    chart_legend_bottomleftbottom.png chart_legend_bottomleftleft.png
+    chart_legend_toprighttop.png chart_legend_toprightright.png
+    chart_legend_bottomrightbottom.png chart_legend_bottomrightright.png
+  DESTINATION ${DATA_INSTALL_DIR}/kchart/pics
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/templates/CMakeLists.txt b/kchart/templates/CMakeLists.txt
new file mode 100644
index 000000000..30212fe11
--- /dev/null
+++ b/kchart/templates/CMakeLists.txt
@@ -0,0 +1,21 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+install(
+  FILES .directory  BarChart.desktop Empty.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kchart/templates/chart
+)
+
+install(
+  FILES BarChart.chrt Empty.chrt
+  DESTINATION ${DATA_INSTALL_DIR}/kchart/templates/chart/.source
+)
+
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/toolbar/CMakeLists.txt b/kchart/toolbar/CMakeLists.txt
new file mode 100644
index 000000000..56c48ea2d
--- /dev/null
+++ b/kchart/toolbar/CMakeLists.txt
@@ -0,0 +1,13 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+add_subdirectory(crystalsvg)
+# add_subdirectory(hicolor) # is empty
+add_subdirectory(locolor)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/toolbar/crystalsvg/CMakeLists.txt b/kchart/toolbar/crystalsvg/CMakeLists.txt
new file mode 100644
index 000000000..f3304540b
--- /dev/null
+++ b/kchart/toolbar/crystalsvg/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kchart/toolbar/locolor/CMakeLists.txt b/kchart/toolbar/locolor/CMakeLists.txt
new file mode 100644
index 000000000..f3304540b
--- /dev/null
+++ b/kchart/toolbar/locolor/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c
index 02e01249f..862f2742a 100644
--- a/kexi/3rdparty/kexisql/src/btree.c
+++ b/kexi/3rdparty/kexisql/src/btree.c
@@ -3169,7 +3169,7 @@ struct IntegrityCk {
 /*
 ** Append a message to the error message string.
 */
-static void checkAppendMsg(IntegrityCk *pCheck, char *zMsg1, char *zMsg2){
+static void chectdeAppendMsg(IntegrityCk *pCheck, char *zMsg1, char *zMsg2){
   if( pCheck->zErrMsg ){
     char *zOld = pCheck->zErrMsg;
     pCheck->zErrMsg = 0;
@@ -3193,13 +3193,13 @@ static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){
   if( iPage>pCheck->nPage || iPage<0 ){
     char zBuf[100];
     sprintf(zBuf, "invalid page number %d", iPage);
-    checkAppendMsg(pCheck, zContext, zBuf);
+    chectdeAppendMsg(pCheck, zContext, zBuf);
     return 1;
   }
   if( pCheck->anRef[iPage]==1 ){
     char zBuf[100];
     sprintf(zBuf, "2nd reference to page %d", iPage);
-    checkAppendMsg(pCheck, zContext, zBuf);
+    chectdeAppendMsg(pCheck, zContext, zBuf);
     return 1;
   }
   return  (pCheck->anRef[iPage]++)>1;
@@ -3222,13 +3222,13 @@ static void checkList(
     OverflowPage *pOvfl;
     if( iPage<1 ){
       sprintf(zMsg, "%d pages missing from overflow list", N+1);
-      checkAppendMsg(pCheck, zContext, zMsg);
+      chectdeAppendMsg(pCheck, zContext, zMsg);
       break;
     }
     if( checkRef(pCheck, iPage, zContext) ) break;
     if( sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pOvfl) ){
       sprintf(zMsg, "failed to get page %d", iPage);
-      checkAppendMsg(pCheck, zContext, zMsg);
+      chectdeAppendMsg(pCheck, zContext, zMsg);
       break;
     }
     if( isFreeList ){
@@ -3307,12 +3307,12 @@ static int checkTreePage(
   sprintf(zContext, "On tree page %d: ", iPage);
   if( (rc = sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pPage))!=0 ){
     sprintf(zMsg, "unable to get the page. error code=%d", rc);
-    checkAppendMsg(pCheck, zContext, zMsg);
+    chectdeAppendMsg(pCheck, zContext, zMsg);
     return 0;
   }
   if( (rc = initPage(pBt, pPage, (Pgno)iPage, pParent))!=0 ){
     sprintf(zMsg, "initPage() returns error code %d", rc);
-    checkAppendMsg(pCheck, zContext, zMsg);
+    chectdeAppendMsg(pCheck, zContext, zMsg);
     sqlitepager_unref(pPage);
     return 0;
   }
@@ -3349,7 +3349,7 @@ static int checkTreePage(
     zKey2 = sqliteMallocRaw( nKey2+1 );
     getPayload(&cur, 0, nKey2, zKey2);
     if( zKey1 && keyCompare(zKey1, nKey1, zKey2, nKey2)>=0 ){
-      checkAppendMsg(pCheck, zContext, "Key is out of order");
+      chectdeAppendMsg(pCheck, zContext, "Key is out of order");
     }
 
     /* Check sanity of left child page.
@@ -3357,7 +3357,7 @@ static int checkTreePage(
     pgno = SWAB32(pBt, pCell->h.leftChild);
     d2 = checkTreePage(pCheck, pgno, pPage, zContext, zKey1,nKey1,zKey2,nKey2);
     if( i>0 && d2!=depth ){
-      checkAppendMsg(pCheck, zContext, "Child page depth differs");
+      chectdeAppendMsg(pCheck, zContext, "Child page depth differs");
     }
     depth = d2;
     sqliteFree(zKey1);
@@ -3388,11 +3388,11 @@ static int checkTreePage(
   for(i=0; i<SQLITE_USABLE_SIZE; i++){
     if( hit[i]==0 ){
       sprintf(zMsg, "Unused space at byte %d of page %d", i, iPage);
-      checkAppendMsg(pCheck, zMsg, 0);
+      chectdeAppendMsg(pCheck, zMsg, 0);
       break;
     }else if( hit[i]>1 ){
       sprintf(zMsg, "Multiple uses for byte %d of page %d", i, iPage);
-      checkAppendMsg(pCheck, zMsg, 0);
+      chectdeAppendMsg(pCheck, zMsg, 0);
       break;
     }
   }
@@ -3403,7 +3403,7 @@ static int checkTreePage(
   if( pParent && pParent->nCell>2 && pPage->nFree>3*SQLITE_USABLE_SIZE/4 ){
     sprintf(zMsg, "free space (%d) greater than max (%d)", pPage->nFree,
        SQLITE_USABLE_SIZE/3);
-    checkAppendMsg(pCheck, zContext, zMsg);
+    chectdeAppendMsg(pCheck, zContext, zMsg);
   }
 #endif
 
@@ -3460,7 +3460,7 @@ char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
     if( sCheck.anRef[i]==0 ){
       char zBuf[100];
       sprintf(zBuf, "Page %d is never used", i);
-      checkAppendMsg(&sCheck, zBuf, 0);
+      chectdeAppendMsg(&sCheck, zBuf, 0);
     }
   }
 
@@ -3473,7 +3473,7 @@ char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
       "Outstanding page count goes from %d to %d during this analysis",
       nRef, *sqlitepager_stats(pBt->pPager)
     );
-    checkAppendMsg(&sCheck, zBuf, 0);
+    chectdeAppendMsg(&sCheck, zBuf, 0);
   }
 
   /* Clean  up and report errors.
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 472d63a60..5b82e4287 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -5297,7 +5297,7 @@ struct IntegrityCk {
 /*
 ** Append a message to the error message string.
 */
-static void checkAppendMsg(
+static void chectdeAppendMsg(
   IntegrityCk *pCheck,
   char *zMsg1,
   const char *zFormat,
@@ -5333,11 +5333,11 @@ static void checkAppendMsg(
 static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){
   if( iPage==0 ) return 1;
   if( iPage>pCheck->nPage || iPage<0 ){
-    checkAppendMsg(pCheck, zContext, "invalid page number %d", iPage);
+    chectdeAppendMsg(pCheck, zContext, "invalid page number %d", iPage);
     return 1;
   }
   if( pCheck->anRef[iPage]==1 ){
-    checkAppendMsg(pCheck, zContext, "2nd reference to page %d", iPage);
+    chectdeAppendMsg(pCheck, zContext, "2nd reference to page %d", iPage);
     return 1;
   }
   return  (pCheck->anRef[iPage]++)>1;
@@ -5362,12 +5362,12 @@ static void checkPtrmap(
 
   rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent);
   if( rc!=SQLITE_OK ){
-    checkAppendMsg(pCheck, zContext, "Failed to read ptrmap key=%d", iChild);
+    chectdeAppendMsg(pCheck, zContext, "Failed to read ptrmap key=%d", iChild);
     return;
   }
 
   if( ePtrmapType!=eType || iPtrmapParent!=iParent ){
-    checkAppendMsg(pCheck, zContext, 
+    chectdeAppendMsg(pCheck, zContext, 
       "Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)", 
       iChild, eType, iParent, ePtrmapType, iPtrmapParent);
   }
@@ -5391,14 +5391,14 @@ static void checkList(
   while( N-- > 0 ){
     unsigned char *pOvfl;
     if( iPage<1 ){
-      checkAppendMsg(pCheck, zContext,
+      chectdeAppendMsg(pCheck, zContext,
          "%d of %d pages missing from overflow list starting at %d",
           N+1, expected, iFirst);
       break;
     }
     if( checkRef(pCheck, iPage, zContext) ) break;
     if( sqlite3pager_get(pCheck->pPager, (Pgno)iPage, (void**)&pOvfl) ){
-      checkAppendMsg(pCheck, zContext, "failed to get page %d", iPage);
+      chectdeAppendMsg(pCheck, zContext, "failed to get page %d", iPage);
       break;
     }
     if( isFreeList ){
@@ -5409,7 +5409,7 @@ static void checkList(
       }
 #endif
       if( n>pCheck->pBt->usableSize/4-8 ){
-        checkAppendMsg(pCheck, zContext,
+        chectdeAppendMsg(pCheck, zContext,
            "freelist leaf count too big on page %d", iPage);
         N--;
       }else{
@@ -5492,12 +5492,12 @@ static int checkTreePage(
   if( iPage==0 ) return 0;
   if( checkRef(pCheck, iPage, zParentContext) ) return 0;
   if( (rc = getPage(pBt, (Pgno)iPage, &pPage))!=0 ){
-    checkAppendMsg(pCheck, zContext,
+    chectdeAppendMsg(pCheck, zContext,
        "unable to get the page. error code=%d", rc);
     return 0;
   }
   if( (rc = initPage(pPage, pParent))!=0 ){
-    checkAppendMsg(pCheck, zContext, "initPage() returns error code %d", rc);
+    chectdeAppendMsg(pCheck, zContext, "initPage() returns error code %d", rc);
     releasePage(pPage);
     return 0;
   }
@@ -5540,7 +5540,7 @@ static int checkTreePage(
 #endif
       d2 = checkTreePage(pCheck,pgno,pPage,zContext,0,0,0,0);
       if( i>0 && d2!=depth ){
-        checkAppendMsg(pCheck, zContext, "Child page depth differs");
+        chectdeAppendMsg(pCheck, zContext, "Child page depth differs");
       }
       depth = d2;
     }
@@ -5570,7 +5570,7 @@ static int checkTreePage(
       int size = cellSizePtr(pPage, &data[pc]);
       int j;
       if( (pc+size-1)>=usableSize || pc<0 ){
-        checkAppendMsg(pCheck, 0, 
+        chectdeAppendMsg(pCheck, 0, 
             "Corruption detected in cell %d on page %d",i,iPage,0);
       }else{
         for(j=pc+size-1; j>=pc; j--) hit[j]++;
@@ -5581,7 +5581,7 @@ static int checkTreePage(
       int size = get2byte(&data[i+2]);
       int j;
       if( (i+size-1)>=usableSize || i<0 ){
-        checkAppendMsg(pCheck, 0,  
+        chectdeAppendMsg(pCheck, 0,  
             "Corruption detected in cell %d on page %d",i,iPage,0);
       }else{
         for(j=i+size-1; j>=i; j--) hit[j]++;
@@ -5592,13 +5592,13 @@ static int checkTreePage(
       if( hit[i]==0 ){
         cnt++;
       }else if( hit[i]>1 ){
-        checkAppendMsg(pCheck, 0,
+        chectdeAppendMsg(pCheck, 0,
           "Multiple uses for byte %d of page %d", i, iPage);
         break;
       }
     }
     if( cnt!=data[hdr+7] ){
-      checkAppendMsg(pCheck, 0, 
+      chectdeAppendMsg(pCheck, 0, 
           "Fragmented space is %d byte reported as %d on page %d",
           cnt, data[hdr+7], iPage);
     }
@@ -5672,7 +5672,7 @@ char *sqlite3BtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
   for(i=1; i<=sCheck.nPage; i++){
 #ifdef SQLITE_OMIT_AUTOVACUUM
     if( sCheck.anRef[i]==0 ){
-      checkAppendMsg(&sCheck, 0, "Page %d is never used", i);
+      chectdeAppendMsg(&sCheck, 0, "Page %d is never used", i);
     }
 #else
     /* If the database supports auto-vacuum, make sure no tables contain
@@ -5680,11 +5680,11 @@ char *sqlite3BtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
     */
     if( sCheck.anRef[i]==0 && 
        (PTRMAP_PAGENO(pBt->usableSize, i)!=i || !pBt->autoVacuum) ){
-      checkAppendMsg(&sCheck, 0, "Page %d is never used", i);
+      chectdeAppendMsg(&sCheck, 0, "Page %d is never used", i);
     }
     if( sCheck.anRef[i]!=0 && 
        (PTRMAP_PAGENO(pBt->usableSize, i)==i && pBt->autoVacuum) ){
-      checkAppendMsg(&sCheck, 0, "Pointer map page %d is referenced", i);
+      chectdeAppendMsg(&sCheck, 0, "Pointer map page %d is referenced", i);
     }
 #endif
   }
@@ -5693,7 +5693,7 @@ char *sqlite3BtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
   */
   unlockBtreeIfUnused(pBt);
   if( nRef != *sqlite3pager_stats(pBt->pPager) ){
-    checkAppendMsg(&sCheck, 0, 
+    chectdeAppendMsg(&sCheck, 0, 
       "Outstanding page count goes from %d to %d during this analysis",
       nRef, *sqlite3pager_stats(pBt->pPager)
     );
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 31e335ac4..c593f883f 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -55,16 +55,16 @@ Manager::lookup()
 	m_partlist.clear();
 	m_partsByMime.clear();
 	m_parts.clear();
-	TDETrader::OfferList tlist = TDETrader::self()->query("Kexi/Handler", 
+	TDETrader::OfferList tlist = TDETrader::self()->query("Kexi/Handler",
 		"[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION));
-	
+
 	TDEConfig conf("kexirc", true);
 	conf.setGroup("Parts");
 	TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order
 	const int size = TQMAX( tlist.count(), sl_order.count() );
 	TQPtrVector<KService> ordered( size*2 );
 	int offset = size; //we will insert not described parts from #offset
-	
+
 	//compute order
 	for(TDETrader::OfferList::ConstIterator it(tlist.constBegin()); it != tlist.constEnd(); ++it)
 	{
@@ -85,14 +85,14 @@ Manager::lookup()
 		if (idx!=-1)
 			ordered.insert(idx, ptr);
 		else //add to end
-			ordered.insert(offset++, ptr);	
+			ordered.insert(offset++, ptr);
 	}
 	//fill final list using computed order
 	for (int i = 0; i< (int)ordered.size(); i++) {
 		KService::Ptr ptr = ordered[i];
 		if (ptr) {
 			Info *info = new Info(ptr);
-			info->setProjectPartID(m_nextTempProjectPartID--); // temp. part id are -1, -2, and so on, 
+			info->setProjectPartID(m_nextTempProjectPartID--); // temp. part id are -1, -2, and so on,
 			                                                   // to avoid duplicates
 			if (!info->mimeType().isEmpty()) {
 				m_partsByMime.insert(info->mimeType(), info);
@@ -122,11 +122,11 @@ Manager::part(Info *i)
 	}
 
 	Part *p = m_parts[i->projectPartID()];
-	
+
 	if(!p) {
 //		kdDebug() << "Manager::part().." << endl;
 		int error=0;
-		p = KParts::ComponentFactory::createInstanceFromService<Part>(i->ptr(), this, 
+		p = KParts::ComponentFactory::createInstanceFromService<Part>(i->ptr(), this,
 			TQString(i->objectName()+"_part").latin1(), TQStringList(), &error);
 		if(!p) {
 			kdDebug() << "Manager::part(): failed :( (ERROR #" << error << ")" << endl;
@@ -164,7 +164,7 @@ Manager::unloadPart(Info *i)
 	m_partlist.removeRef(p);*/
 }
 
-void 
+void
 Manager::unloadAllParts()
 {
 //	m_partsByMime.clear();
@@ -175,7 +175,7 @@ Manager::unloadAllParts()
 }
 #endif
 
-/*void 
+/*void
 Manager::removeClients( KexiMainWindow *win )
 {
 	if (!win)
@@ -270,7 +270,7 @@ void Manager::insertStaticPart(StaticPart* part)
 {
 	if (!part)
 		return;
-	part->info()->setProjectPartID(m_nextTempProjectPartID--); // temp. part id are -1, -2, and so on, 
+	part->info()->setProjectPartID(m_nextTempProjectPartID--); // temp. part id are -1, -2, and so on,
 	m_partlist.append(part->info());
 	if (!part->info()->mimeType().isEmpty())
 		m_partsByMime.insert(part->info()->mimeType(), part->info());
diff --git a/kexi/examples/Simple_Database.kexi b/kexi/examples/Simple_Database.kexi
new file mode 100644
index 000000000..95ff4cb6d
--- /dev/null
+++ b/kexi/examples/Simple_Database.kexi
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 4a7363741..0b4a5ff76 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -1926,7 +1926,7 @@ void KexiMainWindowImpl::updateAppCaption()
 			view = 0;
 	}
 
-	kApp->setCaption( d->appCaption );
+	tdeApp->setCaption( d->appCaption );
 	if (view && view->mdiParent()->state()==KMdiChildFrm::Maximized) {
 		setCaption( view->caption() );
 	}
@@ -3957,13 +3957,21 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
 {
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
+<<<<<<< Updated upstream
 	const TDEAboutData* about = tdeApp->aboutData();
+=======
+	const TDEAboutData* about = TDEApplication::tdeApplication()->aboutData();
+>>>>>>> Stashed changes
 	FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
 		about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
 
 	if ( wizard->exec() )
 	{
+<<<<<<< Updated upstream
 		tdeApp->invokeMailer( "kexi-reports-dummy@kexi.org",
+=======
+		TDEApplication::tdeApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
+>>>>>>> Stashed changes
 			TQString(), TQString(),
 			about->appName() + TQCString( " [feedback]" ),
 			wizard->feedbackDocument().toString( 2 ).local8Bit() );
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 757d1fc87..957efc0a6 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -132,8 +132,8 @@ void ImportWizard::parseArguments()
 		m_predefinedMimeType = (*m_args)["mimeType"];
 		if (m_args->contains("connectionData")) {
 			m_predefinedConnectionData = new KexiDB::ConnectionData();
-			KexiDB::fromMap( 
-				KexiUtils::deserializeMap((*m_args)["connectionData"]), *m_predefinedConnectionData 
+			KexiDB::fromMap(
+				KexiUtils::deserializeMap((*m_args)["connectionData"]), *m_predefinedConnectionData
 			);
 		}
 	}
@@ -146,7 +146,7 @@ void ImportWizard::setupIntro()
 {
 	m_introPage = new TQWidget(this);
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint());
-	
+
 	TQLabel *lblIntro = new TQLabel(m_introPage);
 	lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 	TQString msg;
@@ -179,7 +179,7 @@ void ImportWizard::setupSrcType()
 {
 	m_srcTypePage = new TQWidget(this);
 
-//! @todo Would be good if KexiDBDriverComboBox worked for migration drivers 
+//! @todo Would be good if KexiDBDriverComboBox worked for migration drivers
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_srcTypePage, KDialog::marginHint());
 
 	TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
@@ -206,7 +206,7 @@ void ImportWizard::setupSrcConn()
 	m_srcConnPage = new TQWidget(this);
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_srcConnPage, KDialog::marginHint());
 
-	m_srcConn = new KexiConnSelectorWidget(Kexi::connset(), 
+	m_srcConn = new KexiConnSelectorWidget(Kexi::connset(),
 		":ProjectMigrationSourceDir", m_srcConnPage, "m_srcConnSelector");
 
 	m_srcConn->hideConnectonIcon();
@@ -256,7 +256,7 @@ void ImportWizard::setupDstType()
 	m_dstPrjTypeSelector->option_server->setText(i18n("Database project stored on a server"));
 
 	TQVBoxLayout *frame_server_vbox = new TQVBoxLayout(m_dstPrjTypeSelector->frame_server, KDialog::spacingHint());
-	m_dstServerTypeCombo = new KexiDBDriverComboBox(m_dstPrjTypeSelector->frame_server, drvs, 
+	m_dstServerTypeCombo = new KexiDBDriverComboBox(m_dstPrjTypeSelector->frame_server, drvs,
 		KexiDBDriverComboBox::ShowServerDrivers);
 	frame_server_vbox->addWidget(m_dstServerTypeCombo);
 	hbox->addStretch(1);
@@ -272,7 +272,7 @@ void ImportWizard::setupDstType()
 //
 void ImportWizard::setupDstTitle()
 {
-	m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"), 
+	m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"),
 		this, "KexiDBTitlePage");
 	m_dstTitlePage->layout()->setMargin( KDialog::marginHint() );
 	m_dstTitlePage->updateGeometry();
@@ -287,7 +287,7 @@ void ImportWizard::setupDst()
 	m_dstPage = new TQWidget(this);
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_dstPage, KDialog::marginHint());
 
-	m_dstConn = new KexiConnSelectorWidget(Kexi::connset(), 
+	m_dstConn = new KexiConnSelectorWidget(Kexi::connset(),
 		":ProjectMigrationDestinationDir", m_dstPage, "m_dstConnSelector");
 	m_dstConn->hideHelpers();
 	//me: Can't connect m_dstConn->m_fileDlg here, it doesn't exist yet
@@ -377,7 +377,7 @@ void ImportWizard::setupFinish()
 	m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	vbox->addWidget( m_finishLbl );
-	m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), 
+	m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"),
 		m_finishPage, "openImportedProjectCheckBox");
 	m_openImportedProjectCheckBox->setChecked(true);
 	vbox->addSpacing( KDialog::spacingHint() );
@@ -482,7 +482,7 @@ void ImportWizard::arriveDstTitlePage()
 	if(fileBasedSrcSelected()) {
 		TQString suggestedDBName( TQFileInfo(m_srcConn->selectedFileName()).fileName() );
 		const TQFileInfo fi( suggestedDBName );
-		suggestedDBName = suggestedDBName.left(suggestedDBName.length() 
+		suggestedDBName = suggestedDBName.left(suggestedDBName.length()
 			- (fi.extension().length() ? (fi.extension().length()+1) : 0));
 		m_dstNewDBNameLineEdit->setText( suggestedDBName );
 	} else {
@@ -547,14 +547,14 @@ void ImportWizard::arriveImportingPage() {
 //todo
 
 	//temp. hack for MS Access driver only
-//! @todo for other databases we will need KexiMigration::Conenction 
+//! @todo for other databases we will need KexiMigration::Conenction
 //! and KexiMigration::Driver classes
 	bool showOptions = false;
 	if (fileBasedSrcSelected()) {
 		Kexi::ObjectStatus result;
 		KexiMigrate* sourceDriver = prepareImport(result);
 		if (sourceDriver) {
-			showOptions = !result.error() 
+			showOptions = !result.error()
 				&& sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool();
 			KexiMigration::Data *data = sourceDriver->data();
 			sourceDriver->setData( 0 );
@@ -621,7 +621,7 @@ TQString ImportWizard::driverNameForSelectedSource()
 		return m_predefinedConnectionData->driverName;
 	}
 
-	return m_srcConn->selectedConnectionData() 
+	return m_srcConn->selectedConnectionData()
 		? m_srcConn->selectedConnectionData()->driverName : TQString();
 }
 
@@ -653,7 +653,7 @@ void ImportWizard::accept()
 KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 {
 	KexiUtils::WaitCursor wait;
-	
+
 	// Start with a driver manager
 	KexiDB::DriverManager manager;
 
@@ -686,7 +686,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 			cdata = m_dstConn->selectedConnectionData();
 			dbname = m_dstNewDBNameLineEdit->text();
 		}
-		else // if (m_dstTypeCombo->currentText().lower() == KexiDB::Driver::defaultFileBasedDriverName()) 
+		else // if (m_dstTypeCombo->currentText().lower() == KexiDB::Driver::defaultFileBasedDriverName())
 		{
 			//file-based project
 			kdDebug() << "File Destination..." << endl;
@@ -701,7 +701,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 /*		else
 		{
 			//TODO This needs a better message
-			//KMessageBox::error(this, 
+			//KMessageBox::error(this,
 			result.setStatus(i18n("No connection data is available. You did not select a destination filename."),"");
 			//return false;
 		} */
@@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 	{
 		sourceDriverName = driverNameForSelectedSource();
 		if (sourceDriverName.isEmpty())
-			result.setStatus(i18n("No appropriate migration driver found."), 
+			result.setStatus(i18n("No appropriate migration driver found."),
 				m_migrateManager.possibleProblemsInfoMsg());
 	}
 
@@ -736,7 +736,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 		// Setup progress feedback for the GUI
 		if(sourceDriver->progressSupported()) {
 			m_progressBar->updateGeometry();
-			disconnect(sourceDriver, TQ_SIGNAL(progressPercent(int)), 
+			disconnect(sourceDriver, TQ_SIGNAL(progressPercent(int)),
 				this, TQ_SLOT(progressUpdated(int)));
 			connect(sourceDriver, TQ_SIGNAL(progressPercent(int)),
 				this, TQ_SLOT(progressUpdated(int)));
@@ -759,7 +759,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 			kdDebug() << "Neither radio button is selected (not possible?) presume keep data" << endl;
 			keepData = true;
 		}
-		
+
 		KexiMigration::Data* md = new KexiMigration::Data();
 	//	delete md->destination;
 		md->destination = new KexiProjectData(*cdata, dbname);
@@ -769,7 +769,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 			md->source = conn_data;
 			md->sourceName = "";
 		}
-		else 
+		else
 		{
 			if (m_predefinedConnectionData)
 				md->source = m_predefinedConnectionData;
@@ -802,8 +802,8 @@ tristate ImportWizard::import()
 	if (sourceDriver && !result.error())
 	{
 		if (!m_sourceDBEncoding.isEmpty()) {
-			sourceDriver->setPropertyValue( "source_database_nonunicode_encoding", 
-				TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" 
+			sourceDriver->setPropertyValue( "source_database_nonunicode_encoding",
+				TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250"
 			);
 		}
 
@@ -835,10 +835,10 @@ tristate ImportWizard::import()
 	{
 		if (m_args) {
 //				if (fileBasedDstSelected()) {
-			m_args->insert("destinationDatabaseName", 
+			m_args->insert("destinationDatabaseName",
 				sourceDriver->data()->destination->databaseName());
 //				}
-			TQString destinationConnectionShortcut( 
+			TQString destinationConnectionShortcut(
 				Kexi::connset().fileNameForConnectionData( m_dstConn->selectedConnectionData() ) );
 			if (!destinationConnectionShortcut.isEmpty()) {
 				m_args->insert("destinationConnectionShortcut", destinationConnectionShortcut);
@@ -859,14 +859,14 @@ tristate ImportWizard::import()
 
 		kdDebug() << msg << "\n" << details << endl;
 		setTitle(m_finishPage, i18n("Failure"));
-		m_finishLbl->setText(	
+		m_finishLbl->setText(
 			i18n("<p>Import failed.</p>%1<p>%2</p><p>You can click \"Back\" button and try again.</p>")
 			.arg(msg).arg(details));
 		return false;
 	}
 //	delete kexi_conn;
 	return true;
-} 
+}
 
 void ImportWizard::reject()
 {
@@ -896,7 +896,7 @@ void ImportWizard::next()
 			if (fileBasedSrcSelected())
 				dbname = m_srcConn->selectedFileName();
 			else
-				dbname = m_srcConn->selectedConnectionData() 
+				dbname = m_srcConn->selectedConnectionData()
 					? m_srcConn->selectedConnectionData()->serverInfoString() : TQString();
 				if (!dbname.isEmpty())
 					dbname = TQString(" \"%1\"").arg(dbname);
@@ -920,7 +920,7 @@ void ImportWizard::next()
 			m_lblImportingTxt->setText(i18n("Importing in progress..."));
 			tristate res = import();
 			if (true == res) {
-				m_finishLbl->setText( 
+				m_finishLbl->setText(
 					i18n("Database has been imported into Kexi database project \"%1\".")
 					.arg(m_dstNewDBNameLineEdit->text()) );
 				cancelButton()->setEnabled(false);
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index ea4bbb9c7..de0345c1f 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
 
 		TDECmdLineArgs::init(argc, argv, &about);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		//create new kapplication
+		//create new tdeApplication
 		TDEApplication app;
 		//create new kunitrunnergui
 		KUnitTest::RunnerGUI runner(0);
diff --git a/kformula/CMakeLists.txt b/kformula/CMakeLists.txt
new file mode 100644
index 000000000..9c456783b
--- /dev/null
+++ b/kformula/CMakeLists.txt
@@ -0,0 +1,64 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_SOURCE_DIR}/lib/kformula
+  ${CMAKE_SOURCE_DIR}/lib/kotext
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(libkformulapart SHARED AUTOMOC
+  SOURCES
+    kfconfig.cpp kformula_doc.cpp kformula_view.cpp kformula_factory.cpp
+    kformulawidget.cpp kformula_view_iface.skel kformula_view_iface.cpp
+    formulastring.cpp fsparser.cpp
+  LINK
+    tdecore-shared tdeui-shared tdefx-shared tdeio-shared tdeparts-shared
+    kofficeui-shared kotext-shared kformulalib-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Programs ##################################################################
+tde_add_tdeinit_executable(kformula AUTOMOC
+  SOURCES main.cpp
+  LINK kofficecore-shared
+)
+
+### Data ######################################################################
+install(
+  FILES kformula.rc kformula_readonly.rc tips
+  DESTINATION ${DATA_INSTALL_DIR}/kformula
+)
+
+tde_create_translated_desktop(
+    SOURCE kformula.desktop
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE kformulapart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+add_subdirectory(pics)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kformula/pics/CMakeLists.txt b/kformula/pics/CMakeLists.txt
new file mode 100644
index 000000000..f3304540b
--- /dev/null
+++ b/kformula/pics/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kounavail/CMakeLists.txt b/kounavail/CMakeLists.txt
new file mode 100644
index 000000000..5cb21e1ba
--- /dev/null
+++ b/kounavail/CMakeLists.txt
@@ -0,0 +1,41 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(libkounavail SHARED AUTOMOC
+  SOURCES kounavail.cpp
+  LINK
+    tdecore-shared tdeui-shared tdefx-shared tdeio-shared tdeparts-shared
+    kofficecore-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Data ######################################################################
+tde_create_translated_desktop(
+    SOURCE kounavail.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/kplato/kptganttview.cpp b/kplato/kptganttview.cpp
index 40dfbf75e..fe797fdaa 100644
--- a/kplato/kptganttview.cpp
+++ b/kplato/kptganttview.cpp
@@ -30,7 +30,7 @@
 #include "kpttask.h"
 #include "kptresource.h"
 #include "kptdatetime.h"
-#include "kpttaskappointmentsview.h"
+#include "kpttastdeAppointmentsview.h"
 #include "kptrelation.h"
 #include "kptcontext.h"
 #include "kptschedule.h"
@@ -114,8 +114,8 @@ GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name)
     m_gantt->setScale(KDGanttView::Day);
     m_gantt->setShowLegendButton(false);
     m_gantt->setShowHeaderPopupMenu();
-    m_taskView = new TaskAppointmentsView(this);
-    // hide TaskAppointmentsView
+    m_taskView = new TastdeAppointmentsView(this);
+    // hide TastdeAppointmentsView
     TQValueList<int> list = sizes();
     list[0] += list[1];
     list[1] = 0;
diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h
index dc34fe869..826ec682b 100644
--- a/kplato/kptganttview.h
+++ b/kplato/kptganttview.h
@@ -45,7 +45,7 @@ namespace KPlato
 {
 
 class MyKDGanttView;
-class TaskAppointmentsView;
+class TastdeAppointmentsView;
 
 class Node;
 class Task;
@@ -189,7 +189,7 @@ private:
     int m_defaultFontSize;
     KDGanttViewItem *m_currentItem;
     MyKDGanttView *m_gantt;
-    TaskAppointmentsView *m_taskView;
+    TastdeAppointmentsView *m_taskView;
     bool m_showExpected;
     bool m_showOptimistic;
     bool m_showPessimistic;
diff --git a/kplato/kptresource.cpp b/kplato/kptresource.cpp
index 3b3be7a28..ae56980ac 100644
--- a/kplato/kptresource.cpp
+++ b/kplato/kptresource.cpp
@@ -594,7 +594,7 @@ Duration Resource::effort(const DateTime &start, const Duration &duration, bool
     return e;
 }
 
-DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bool checkAppointments) const {
+DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bool chectdeAppointments) const {
     DateTime t;
     if (m_units == 0) {
         return t;
@@ -617,14 +617,14 @@ DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bo
     }
     t = m_availableFrom > time ? m_availableFrom : time;
     t = cal->firstAvailableAfter(t, lmt);
-    if (checkAppointments) {
+    if (chectdeAppointments) {
         //TODO
     }
     //kdDebug()<<k_funcinfo<<time.toString()<<"="<<t.toString()<<" "<<m_name<<endl;
     return t;
 }
 
-DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, bool checkAppointments) const {
+DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, bool chectdeAppointments) const {
     DateTime t;
     if (m_units == 0) {
         return t;
@@ -653,7 +653,7 @@ DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, b
     }
     //kdDebug()<<k_funcinfo<<t<<", "<<lmt<<endl;
     t = cal->firstAvailableBefore(t, lmt);
-    if (checkAppointments) {
+    if (chectdeAppointments) {
         //TODO
     }
     //kdDebug()<<k_funcinfo<<m_name<<" returns: "<<time<<"="<<t<<" "<<endl;
diff --git a/kplato/kptresource.h b/kplato/kptresource.h
index d4930f2fa..e8cc8caf9 100644
--- a/kplato/kptresource.h
+++ b/kplato/kptresource.h
@@ -292,12 +292,12 @@ public:
      * Find the first available time after time, within limit.
      * Returns invalid DateTime if not available.
      */
-    DateTime availableAfter(const DateTime &time, const DateTime limit=DateTime(), bool checkAppointments=false) const;
+    DateTime availableAfter(const DateTime &time, const DateTime limit=DateTime(), bool chectdeAppointments=false) const;
     /**
      * Find the first available time before time, within limit.
      * Returns invalid DateTime if not available.
      */
-    DateTime availableBefore(const DateTime &time, const DateTime limit=DateTime(), bool checkAppointments=false) const;
+    DateTime availableBefore(const DateTime &time, const DateTime limit=DateTime(), bool chectdeAppointments=false) const;
 
     Resource *findId() const { return findId(m_id); }
     Resource *findId(const TQString &id) const;
diff --git a/kplato/kptresourceappointmentsview.h b/kplato/kptresourceappointmentsview.h
index c8b0c7053..f4feb890c 100644
--- a/kplato/kptresourceappointmentsview.h
+++ b/kplato/kptresourceappointmentsview.h
@@ -100,4 +100,4 @@ private:
 }  //KPlato namespace
 
 
-#endif // KPTTASKAPPOINTMENTSVIEW_H
+#endif // KPTTAStdeAppOINTMENTSVIEW_H
diff --git a/kplato/kpttaskappointmentsview.cpp b/kplato/kpttaskappointmentsview.cpp
index 669bf0654..0cab9cc4c 100644
--- a/kplato/kpttaskappointmentsview.cpp
+++ b/kplato/kpttaskappointmentsview.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include "kpttaskappointmentsview.h"
+#include "kpttastdeAppointmentsview.h"
 
 #include "kptappointment.h"
 #include "kpttask.h"
@@ -32,14 +32,14 @@
 namespace KPlato
 {
 
-TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight)
+TastdeAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight)
     : DoubleListViewBase::MasterListItem(parent, r->name(), highlight),
       resource(r) {
       
       setFormat(0, 'f', 1);
     //kdDebug()<<k_funcinfo<<endl;
 }
-TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p, bool highlight)
+TastdeAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p, bool highlight)
     : DoubleListViewBase::MasterListItem(p, r->name(), highlight),
       resource(r) {
       
@@ -47,7 +47,7 @@ TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p,
     //kdDebug()<<k_funcinfo<<endl;
 }
 
-TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight)
+TastdeAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight)
     : DoubleListViewBase::MasterListItem(parent, text, highlight),
       resource(0) {
       
@@ -56,7 +56,7 @@ TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *
 }
 
 //-------------------------------------------
-TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent)
+TastdeAppointmentsView::TastdeAppointmentsView(TQWidget *parent)
     : DoubleListViewBase(parent),
       m_task(0) {
     
@@ -70,17 +70,17 @@ TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent)
     setSizes(list);
 }
 
-void TaskAppointmentsView::zoom(double zoom) {
+void TastdeAppointmentsView::zoom(double zoom) {
     Q_UNUSED(zoom);
 }
 
 
-void TaskAppointmentsView::draw(Task *task) {
+void TastdeAppointmentsView::draw(Task *task) {
     m_task = task;
     draw();
 }
 
-void TaskAppointmentsView::draw() {
+void TastdeAppointmentsView::draw() {
     //kdDebug()<<k_funcinfo<<endl;
     clearLists();
     if (!m_task)
@@ -90,19 +90,19 @@ void TaskAppointmentsView::draw() {
     TQPtrListIterator<Appointment> it(lst);
     for (; it.current(); ++it) {
         Resource *r = it.current()->resource()->resource();
-        TaskAppointmentsView::ResourceItem *item = new TaskAppointmentsView::ResourceItem(r, masterListView());
+        TastdeAppointmentsView::ResourceItem *item = new TastdeAppointmentsView::ResourceItem(r, masterListView());
         
         item->effortMap = it.current()->plannedPrDay(m_task->startTime().date(), m_task->endTime().date());
     }
     slotUpdate();
 }
 
-void TaskAppointmentsView::drawContents(TQPainter* painter)
+void TastdeAppointmentsView::drawContents(TQPainter* painter)
 {
   this->DoubleListViewBase::drawContents(painter);
 }
 
-void TaskAppointmentsView::slotUpdate() {
+void TastdeAppointmentsView::slotUpdate() {
     //kdDebug()<<k_funcinfo<<endl;
     if (!m_task)
         return;
@@ -122,7 +122,7 @@ void TaskAppointmentsView::slotUpdate() {
     }
     TQListViewItemIterator it(masterListView());
     for (;it.current(); ++it) {
-        TaskAppointmentsView::ResourceItem *item = static_cast<TaskAppointmentsView::ResourceItem*>(it.current());
+        TastdeAppointmentsView::ResourceItem *item = static_cast<TastdeAppointmentsView::ResourceItem*>(it.current());
         if (!item) {
             continue;
         }
@@ -139,11 +139,11 @@ void TaskAppointmentsView::slotUpdate() {
 }
 
 
-void TaskAppointmentsView::print(KPrinter &/*printer*/) {
+void TastdeAppointmentsView::print(KPrinter &/*printer*/) {
     kdDebug()<<k_funcinfo<<endl;
 }
 
-// bool TaskAppointmentsView::setContext(Context::TaskAppointmentsView &context) {
+// bool TastdeAppointmentsView::setContext(Context::TastdeAppointmentsView &context) {
 //     //kdDebug()<<k_funcinfo<<endl;
 //     
 //     TQValueList<int> list;
@@ -158,7 +158,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) {
 //     return true;
 // }
 // 
-// void TaskAppointmentsView::getContext(Context::TaskAppointmentsView &context) const {
+// void TastdeAppointmentsView::getContext(Context::TastdeAppointmentsView &context) const {
 //     //kdDebug()<<k_funcinfo<<endl;
 //     context.accountsviewsize = m_dlv->sizes()[0];
 //     context.periodviewsize = m_dlv->sizes()[1];
@@ -168,15 +168,15 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) {
 //     //kdDebug()<<k_funcinfo<<"sizes="<<sizes()[0]<<","<<sizes()[1]<<endl;
 // }
 
-void TaskAppointmentsView::clear() {
+void TastdeAppointmentsView::clear() {
     clearLists();
 }
 
-void TaskAppointmentsView::createSlaveItems() {
+void TastdeAppointmentsView::createSlaveItems() {
     DoubleListViewBase::createSlaveItems();
     setSlaveFormat(0, 'f', 1);
 }
 
 }  //KPlato namespace
 
-#include "kpttaskappointmentsview.moc"
+#include "kpttastdeAppointmentsview.moc"
diff --git a/kplato/kpttaskappointmentsview.h b/kplato/kpttaskappointmentsview.h
index e913b439f..fefb08642 100644
--- a/kplato/kpttaskappointmentsview.h
+++ b/kplato/kpttaskappointmentsview.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPTTASKAPPOINTMENTSVIEW_H
-#define KPTTASKAPPOINTMENTSVIEW_H
+#ifndef KPTTAStdeAppOINTMENTSVIEW_H
+#define KPTTAStdeAppOINTMENTSVIEW_H
 
 #include "kptcontext.h"
 #include "kptdoublelistviewbase.h"
@@ -47,15 +47,15 @@ class ResourceGroup;
 class Resource;
 class ResourceItemPrivate;
 
-class TaskAppointmentsView : public DoubleListViewBase
+class TastdeAppointmentsView : public DoubleListViewBase
 {
     TQ_OBJECT
   
 public:
 
-    TaskAppointmentsView(TQWidget *parent);
+    TastdeAppointmentsView(TQWidget *parent);
 
-    //~TaskAppointmentsView();
+    //~TastdeAppointmentsView();
 
     void zoom(double zoom);
 
@@ -65,8 +65,8 @@ public:
     void print(KPrinter &printer);
     void clear();
     
-    //virtual bool setContext(Context::TaskAppointmentsView &context);
-    //virtual void getContext(Context::TaskAppointmentsView &context) const;
+    //virtual bool setContext(Context::TastdeAppointmentsView &context);
+    //virtual void getContext(Context::TastdeAppointmentsView &context) const;
 
     virtual void createSlaveItems();
     
@@ -93,4 +93,4 @@ private:
 }  //KPlato namespace
 
 
-#endif // KPTTASKAPPOINTMENTSVIEW_H
+#endif // KPTTAStdeAppOINTMENTSVIEW_H
diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h
index b638597e8..00d2f961b 100644
--- a/kplato/kpttaskappointmentsview.ui.h
+++ b/kplato/kpttaskappointmentsview.ui.h
@@ -32,7 +32,7 @@
 namespace KPlato
 {
 
-void TaskAppointmentsView::clear()
+void TastdeAppointmentsView::clear()
 {
     if (m_appList) m_appList->clear();
     if (m_taskName) m_taskName->clear();
@@ -45,7 +45,7 @@ void TaskAppointmentsView::clear()
     if (m_cpi) m_cpi->clear();
 }
 
-void TaskAppointmentsView::draw(Task *task)
+void TastdeAppointmentsView::draw(Task *task)
 {
     //kdDebug()<<k_funcinfo<<endl;
     m_task = task;
@@ -81,7 +81,7 @@ void TaskAppointmentsView::draw(Task *task)
 }
 
 
-void TaskAppointmentsView::init()
+void TastdeAppointmentsView::init()
 {
     m_appList->setColumnAlignment(1, AlignHCenter);
     m_appList->setColumnAlignment(3, AlignRight);
@@ -94,7 +94,7 @@ void TaskAppointmentsView::init()
      
 }
 
-void TaskAppointmentsView::drawCostEffort()
+void TastdeAppointmentsView::drawCostEffort()
 {
     if (m_task == 0)
  return;
diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp
index 4b74eab26..e0e8d895a 100644
--- a/kplato/kptview.cpp
+++ b/kplato/kptview.cpp
@@ -194,7 +194,7 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/)
     
 //    actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, this, TQ_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled");
     
-    actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments");
+    actionViewTastdeAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewTastdeAppointments()), actionCollection(), "view_task_appointments");
 
     actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, this, TQ_SLOT(slotViewPert()), actionCollection(), "view_pert");
     
@@ -456,9 +456,9 @@ void View::slotViewGanttNoInformation() {
         slotUpdate(false);
 }
 
-void View::slotViewTaskAppointments() {
+void View::slotViewTastdeAppointments() {
     //kdDebug()<<k_funcinfo<<endl;
-    m_ganttview->setShowAppointments(actionViewTaskAppointments->isChecked());
+    m_ganttview->setShowAppointments(actionViewTastdeAppointments->isChecked());
     m_updateGanttview = true;
     if (m_tab->visibleWidget() == m_ganttview)
         slotUpdate(false);
diff --git a/kplato/kptview.h b/kplato/kptview.h
index f2726c70a..530be6b59 100644
--- a/kplato/kptview.h
+++ b/kplato/kptview.h
@@ -105,7 +105,7 @@ public slots:
     void slotViewGanttCriticalTasks();
     void slotViewGanttCriticalPath();
     void slotViewGanttNoInformation();
-    void slotViewTaskAppointments();
+    void slotViewTastdeAppointments();
     void slotViewPert();
     void slotViewResources();
     void slotViewResourceAppointments();
@@ -223,7 +223,7 @@ private:
     TDEToggleAction *actionViewGanttCriticalTasks;
     TDEToggleAction *actionViewGanttCriticalPath;
     TDEToggleAction *actionViewGanttNotScheduled;
-    TDEToggleAction *actionViewTaskAppointments;
+    TDEToggleAction *actionViewTastdeAppointments;
     TDEAction *actionViewPert;
     TDEAction *actionViewResources;
     TDEToggleAction *actionViewResourceAppointments;
diff --git a/kpresenter/CMakeLists.txt b/kpresenter/CMakeLists.txt
new file mode 100644
index 000000000..d845c61d8
--- /dev/null
+++ b/kpresenter/CMakeLists.txt
@@ -0,0 +1,120 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kotext
+  ${CMAKE_SOURCE_DIR}/lib/kformula
+  ${CMAKE_BINARY_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}/lib/kotext
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(libkwordprivate SHARED AUTOMOC
+  SOURCES
+    KPrPage.cpp KPrFindReplace.cpp KPrBackDia.cpp KPrWebPresentation.cpp
+    KPrView.cpp  KPrMSPresentationSetup.cpp KPrBrush.cpp KPrDocument.cpp
+    KPrSoundPlayer.cpp KPrPgConfDia.cpp KPrEffectDia.cpp KPrCommand.cpp
+    KPrUtils.cpp KPrEffectHandler.cpp KPrPageEffects.cpp KPrTransEffectDia.cpp
+    KPrObject.cpp KPrLineObject.cpp KPrRectObject.cpp KPrEllipseObject.cpp
+    KPrAutoformObject.cpp KPrTextObject.cpp KPrPixmapObject.cpp
+    KPrPieObject.cpp KPrPartObject.cpp KPrGroupObject.cpp KPrBackground.cpp
+    KPrGradient.cpp KPrGradientCollection.cpp KPrGotoPage.cpp KPrFactory.cpp
+    KPrDocumentIface.skel KPrDocumentIface.cpp
+    KPrViewIface.skel KPrViewIface.cpp
+    KPrObjectIface.skel KPrObjectIface.cpp
+    KPrPageIface.skel KPrPageIface.cpp
+    KPrSideBar.cpp insertpagedia.ui KPrConfig.cpp KPrVariableCollection.cpp
+    KPrTextDocument.cpp KPrPointObject.cpp KPrFreehandObject.cpp
+    KPrPolylineObject.cpp KPrBezierCurveObject.cpp KPrPolygonObject.cpp
+    KPrNoteBar.cpp KPrTextObjectIface.skel KPrTextObjectIface.cpp
+    KPrTextViewIface.skel KPrTextViewIface.cpp KPrPresDurationDia.cpp
+    KPrPieObjectIface.skel KPrPieObjectIface.cpp
+    KPrPolygonObjectIface.skel KPrPolygonObjectIface.cpp
+    KPrRectObjectIface.skel KPrRectObjectIface.cpp
+    KPrPixmapObjectIface.skel KPrPixmapObjectIface.cpp
+    KPrAutoFormObjectIface.skel KPrAutoFormObjectIface.cpp
+    KPrObject2DIface.skel KPrObject2DIface.cpp
+    KPrLineObjectIface.skel KPrLineObjectIface.cpp
+    KPrQuadricBezierCurveObjectIface.skel KPrQuadricBezierCurveObjectIface.cpp
+    KPrCubicBezierCurveObjectIface.skel KPrCubicBezierCurveObjectIface.cpp
+    KPrSVGPathParser.cpp shadowdialog.ui KPrShadowDialogImpl.cpp
+    KPrTextPreview.cpp KPrRotationDialogImpl.cpp rotationpropertyui.ui
+    KPrFreehandObjectIface.skel KPrFreehandObjectIface.cpp KPrStyleManager.cpp
+    KPrBgSpellCheck.cpp KPrMoveHelpLineDia.cpp
+    KPrPolyLineObjectIface.skel KPrPolyLineObjectIface.cpp
+    KPrDuplicateObjDia.cpp KPrClosedLineObject.cpp
+    KPrImportStyleDia.cpp KPrImageEffectDia.cpp imageEffectBase.ui
+    KPrCustomSlideShowDia.cpp KPrPBPreview.cpp penstyle.ui KPrPenStyleWidget.cpp
+    KPrRectPreview.cpp rectpropertyui.ui KPrRectProperty.cpp KPrPiePreview.cpp
+    KPrPolygonPreview.cpp KPrPicturePreview.cpp
+    brushpropertyui.ui gradientpropertyui.ui KPrBrushProperty.cpp
+    KPrGeneralProperty.cpp polygonpropertyui.ui KPrPolygonProperty.cpp
+    piepropertyui.ui KPrPieProperty.cpp picturepropertyui.ui
+    KPrPictureProperty.cpp marginui.ui KPrMarginWidget.cpp KPrTextProperty.cpp
+    KPrObjectProperties.cpp KPrPropertyEditor.cpp slidetransitionwidget.ui
+    KPrSlideTransitionDia.cpp KPrPrinterDlg.cpp KoPointArray.cpp KPrCanvas.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeparts-shared
+    tdespell2-shared kofficeui-shared kofficetext-shared kopainter-shared
+    mcop-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Part #######################################################################
+tde_add_kpart(libkpresenterpart SHARED AUTOMOC
+  SOURCES
+    KPrFactoryInit.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Programs ##################################################################
+tde_add_tdeinit_executable(kpresenter AUTOMOC
+  SOURCES main.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared kofficecore-shared
+)
+
+### Data ######################################################################
+install(
+  FILES kpresenter.rc kpresenter_readonly.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kpresenter
+)
+
+tde_create_translated_desktop(
+    SOURCE kpresenter.desktop
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE kpresenterpart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+# add_subdirectory(data)
+# add_subdirectory(dtd)
+# add_subdirectory(horizontalline)
+# add_subdirectory(templates)
+# add_subdirectory(toolbar)
+# add_subdirectory(pics)
+# add_subdirectory(mailmerge)
\ No newline at end of file
diff --git a/kword/CMakeLists.txt b/kword/CMakeLists.txt
new file mode 100644
index 000000000..d1ec0bb12
--- /dev/null
+++ b/kword/CMakeLists.txt
@@ -0,0 +1,108 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kotext
+  ${CMAKE_SOURCE_DIR}/lib/kformula
+  ${CMAKE_BINARY_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}/lib/kotext
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(libkwordprivate SHARED AUTOMOC
+  SOURCES
+    KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWFormulaFrameSet.cpp
+    KWFactory.cpp KWDocument.cpp KWView.cpp KWViewMode.cpp KWTextParag.cpp
+    KWTextDocument.cpp KWTextFrameSet.cpp KWPartFrameSet.cpp KWTextImage.cpp
+    KWAnchor.cpp KWConfig.cpp KWVariable.cpp KWFrameDia.cpp KWFootNoteDia.cpp
+    KWFrameStyle.cpp KWFrameStyleManager.cpp KWTableStyle.cpp
+    KWTableStyleManager.cpp KWTableTemplate.cpp KWTableTemplateSelector.cpp
+    KWTableDia.cpp KWInsertDia.cpp KWDeleteDia.cpp KWDocStruct.cpp
+    KWInsertTOCCommand.cpp KWStyleManager.cpp KWFindReplace.cpp KWCommand.cpp
+    KWStatisticsDialog.cpp KWordMailMergeDatabaseIface.skel
+    kwordmailmergedatabaseiface.cpp KWMailMergeDataBase.cpp
+    KWMailMergeLabelAction.cpp KWEditPersonnalExpression.cpp
+    KWSplitCellDia.cpp KWInsertPicDia.cpp
+    KWordDocIface.skel KWordDocIface.cpp
+    KWordViewIface.skel KWordViewIface.cpp
+    KWordTextFrameSetIface.skel KWordTextFrameSetIface.cpp
+    KWordTextFrameSetEditIface.skel KWordTextFrameSetEditIface.cpp
+    KWordFrameSetIface.skel KWordFrameSetIface.cpp
+    KWordFormulaFrameSetIface.skel KWordFormulaFrameSetIface.cpp
+    KWordFormulaFrameSetEditIface.skel KWordFormulaFrameSetEditIface.cpp
+    KWordPictureFrameSetIface.skel KWordPictureFrameSetIface.cpp
+    KWordTableFrameSetIface.skel KWordTableFrameSetIface.cpp
+    KWordPartFrameSetIface.skel KWordPartFrameSetIface.cpp
+    KWBgSpellCheck.cpp KWResizeTableDia.cpp KWFrameLayout.cpp
+    KWConfigFootNoteDia.cpp KWCreateBookmarkDia.cpp KWImportStyleDia.cpp
+    KWordFootNoteFrameSetIface.skel KWordFootNoteFrameSetIface.cpp
+    KWCreateBookmarkDiaBase.ui  KWSelectBookmarkDiaBase.ui
+    KWSortDia.cpp KWInsertPageDia.cpp KWCollectFramesetsVisitor.cpp
+    KWOasisLoader.cpp KWOasisSaver.cpp KWFrameList.cpp KWPage.cpp
+    KWPageManager.cpp KWFrameSet.cpp KWFrameSetEdit.cpp KWPictureFrameSet.cpp
+    KWFrameViewManager.cpp KWFrameView.cpp KWStartupWidgetBase.ui
+    KWStartupWidget.cpp KWLoadingInfo.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeparts-shared
+    tdespell2-shared kformulalib-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Part #######################################################################
+tde_add_kpart(libkwordpart SHARED AUTOMOC
+  SOURCES
+    KWFactoryInit.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared libkwordprivate-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Programs ##################################################################
+tde_add_tdeinit_executable(kword AUTOMOC
+  SOURCES main.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared kofficecore-shared
+)
+
+### Data ######################################################################
+install(
+  FILES kword.rc kword_readonly.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kword
+)
+
+tde_create_translated_desktop(
+    SOURCE kword.desktop
+    PO_DIR koffice-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE kwordpart.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+add_subdirectory(data)
+add_subdirectory(dtd)
+add_subdirectory(horizontalline)
+add_subdirectory(templates)
+add_subdirectory(toolbar)
+add_subdirectory(pics)
+add_subdirectory(mailmerge)
\ No newline at end of file
diff --git a/kword/ConfigureChecks.cmake b/kword/ConfigureChecks.cmake
new file mode 100644
index 000000000..cf79731ff
--- /dev/null
+++ b/kword/ConfigureChecks.cmake
@@ -0,0 +1,18 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+check_cxx_source_compiles("
+#include <tqglobal.h>
+#ifdef TQT_NO_SQL
+# error \"No TQt-SQL support\"
+#endif
+" HAS_TQT_SQL)
+
+if (NOT HAS_TQT_SQL)
+  message(WARNING "TQt-SQL support is not installed, the KWord MailMerge dialog "
+                  "will be compiled without SQL source support.")
+endif()
\ No newline at end of file
diff --git a/kword/data/CMakeLists.txt b/kword/data/CMakeLists.txt
new file mode 100644
index 000000000..225acb293
--- /dev/null
+++ b/kword/data/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+install(
+  FILES framestyles.xml tablestyles.xml tabletemplates.xml
+  DESTINATION ${DATA_INSTALL_DIR}/kword
+)
\ No newline at end of file
diff --git a/kword/dtd/CMakeLists.txt b/kword/dtd/CMakeLists.txt
new file mode 100644
index 000000000..837a2c241
--- /dev/null
+++ b/kword/dtd/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+install(
+  FILES kword.dtd framestyles.dtd tablestyles.dtd tabletemplates.dtd
+  DESTINATION ${DATA_INSTALL_DIR}/kword/dtd
+)
\ No newline at end of file
diff --git a/kword/expression/CMakeLists.txt b/kword/expression/CMakeLists.txt
new file mode 100644
index 000000000..4df3e57ff
--- /dev/null
+++ b/kword/expression/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+install(
+  FILES expression.xml
+  DESTINATION ${DATA_INSTALL_DIR}/kword/expression
+)
\ No newline at end of file
diff --git a/kword/horizontalline/CMakeLists.txt b/kword/horizontalline/CMakeLists.txt
new file mode 100644
index 000000000..4e406c637
--- /dev/null
+++ b/kword/horizontalline/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+install(
+  FILES line.png
+  DESTINATION ${DATA_INSTALL_DIR}/kword/horizontalline
+)
\ No newline at end of file
diff --git a/kword/mailmerge/CMakeLists.txt b/kword/mailmerge/CMakeLists.txt
new file mode 100644
index 000000000..7361a9cd9
--- /dev/null
+++ b/kword/mailmerge/CMakeLists.txt
@@ -0,0 +1,41 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(kwmailmerge_classic SHARED AUTOMOC
+  SOURCES
+    KWClassicSerialDataSource.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared kotext-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Data ######################################################################
+tde_create_translated_desktop(
+    SOURCE kwserialletter_classic.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+add_subdirectory(tdeabc)
+add_subdirectory(kspread)
+tde_conditional_add_subdirectory(HAS_TQT_SQL sql)
\ No newline at end of file
diff --git a/kword/mailmerge/kspread/CMakeLists.txt b/kword/mailmerge/kspread/CMakeLists.txt
new file mode 100644
index 000000000..637ee0845
--- /dev/null
+++ b/kword/mailmerge/kspread/CMakeLists.txt
@@ -0,0 +1,38 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/kspread
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(kwmailmerge_kspread SHARED AUTOMOC
+  SOURCES
+    kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Data ######################################################################
+tde_create_translated_desktop(
+    SOURCE kwmailmerge_kspread.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
\ No newline at end of file
diff --git a/kword/mailmerge/tdeabc/CMakeLists.txt b/kword/mailmerge/tdeabc/CMakeLists.txt
new file mode 100644
index 000000000..187e514d2
--- /dev/null
+++ b/kword/mailmerge/tdeabc/CMakeLists.txt
@@ -0,0 +1,37 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_kpart(kwmailmerge_tdeabc SHARED AUTOMOC
+  SOURCES
+    KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
+  LINK
+    tdecore-shared tdeui-shared kjs-shared tdefx-shared tdeio-shared
+    tdeparts-shared tdeabc-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Data ######################################################################
+tde_create_translated_desktop(
+    SOURCE kwmailmerge_tdeabc.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
\ No newline at end of file
diff --git a/kword/pics/CMakeLists.txt b/kword/pics/CMakeLists.txt
new file mode 100644
index 000000000..4467c87c9
--- /dev/null
+++ b/kword/pics/CMakeLists.txt
@@ -0,0 +1,8 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+tde_install_icons()
\ No newline at end of file
diff --git a/kword/templates/CMakeLists.txt b/kword/templates/CMakeLists.txt
new file mode 100644
index 000000000..61ba22d22
--- /dev/null
+++ b/kword/templates/CMakeLists.txt
@@ -0,0 +1,10 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+add_subdirectory(CardsAndLabels)
+add_subdirectory(Envelopes)
+add_subdirectory(Wordprocessing)
\ No newline at end of file
diff --git a/kword/templates/CardsAndLabels/CMakeLists.txt b/kword/templates/CardsAndLabels/CMakeLists.txt
new file mode 100644
index 000000000..2cc740141
--- /dev/null
+++ b/kword/templates/CardsAndLabels/CMakeLists.txt
@@ -0,0 +1,22 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+set(TEMPLATE_SUBDIR "CardsAndLabels")
+file(GLOB DESKTOP_FILES *.desktop)
+file(GLOB KWORD_TEMPLATES *.kwt)
+
+install(
+  FILES .directory ${DESKTOP_FILES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}
+)
+
+install(
+  FILES ${KWORD_TEMPLATES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}/.source
+)
+
+tde_install_icons()
\ No newline at end of file
diff --git a/kword/templates/Envelopes/CMakeLists.txt b/kword/templates/Envelopes/CMakeLists.txt
new file mode 100644
index 000000000..47ae2fc40
--- /dev/null
+++ b/kword/templates/Envelopes/CMakeLists.txt
@@ -0,0 +1,22 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+set(TEMPLATE_SUBDIR "Envelopes")
+file(GLOB DESKTOP_FILES *.desktop)
+file(GLOB KWORD_TEMPLATES *.kwt)
+
+install(
+  FILES .directory ${DESKTOP_FILES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}
+)
+
+install(
+  FILES ${KWORD_TEMPLATES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}/.source
+)
+
+tde_install_icons()
\ No newline at end of file
diff --git a/kword/templates/Wordprocessing/CMakeLists.txt b/kword/templates/Wordprocessing/CMakeLists.txt
new file mode 100644
index 000000000..1c1611ecf
--- /dev/null
+++ b/kword/templates/Wordprocessing/CMakeLists.txt
@@ -0,0 +1,22 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+set(TEMPLATE_SUBDIR "Normal")
+file(GLOB DESKTOP_FILES *.desktop)
+file(GLOB KWORD_TEMPLATES *.kwt)
+
+install(
+  FILES .directory ${DESKTOP_FILES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}
+)
+
+install(
+  FILES ${KWORD_TEMPLATES}
+  DESTINATION ${DATA_INSTALL_DIR}/kword/templates/${TEMPLATE_SUBDIR}/.source
+)
+
+tde_install_icons()
\ No newline at end of file
diff --git a/kword/toolbar/CMakeLists.txt b/kword/toolbar/CMakeLists.txt
new file mode 100644
index 000000000..4467c87c9
--- /dev/null
+++ b/kword/toolbar/CMakeLists.txt
@@ -0,0 +1,8 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+tde_install_icons()
\ No newline at end of file
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 000000000..645b05fce
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,25 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+add_subdirectory(store)
+add_subdirectory(kwmf)
+add_subdirectory(kofficecore)
+add_subdirectory(kofficeui)
+add_subdirectory(koproperty)
+tde_conditional_add_subdirectory(BUILD_KROSS kross)
+
+# All applications except for Kexi need the following components
+if (BUILD_CHALK OR BUILD_KARBON OR BUILD_KCHART OR BUILD_KGANTT OR
+    BUILD_KFORMULA OR BUILD_KIVIO OR BUILD_KOSHELL OR BUILD_KPLATO OR
+    BUILD_KPRESENTER OR BUILD_KSPREAD OR BUILD_KUGAR OR BUILD_KWORD)
+  add_subdirectory(kotext)
+  add_subdirectory(kformula)
+  add_subdirectory(kopalette)
+  tde_conditional_add_subdirectory(BUILD_KOPAINTER kopainter)
+endif()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/ConfigureChecks.cmake b/lib/ConfigureChecks.cmake
new file mode 100644
index 000000000..5dc7d7566
--- /dev/null
+++ b/lib/ConfigureChecks.cmake
@@ -0,0 +1,15 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+find_program(HAVE_MAKETDEWIDGETS maketdewidgets)
+if (NOT HAVE_MAKETDEWIDGETS)
+  message(WARNING "maketdewidgets not found, won't generate Designer widgets")
+endif()
+
+if (BUILD_KROSS)
+  include(lib/kross/ConfigureChecks.cmake)
+endif()
\ No newline at end of file
diff --git a/lib/kformula/CMakeLists.txt b/lib/kformula/CMakeLists.txt
new file mode 100644
index 000000000..ee3df6cc4
--- /dev/null
+++ b/lib/kformula/CMakeLists.txt
@@ -0,0 +1,70 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_SOURCE_DIR}/lib/kopalette
+  ${CMAKE_SOURCE_DIR}/lib/kotext
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+# We have to name it kformulalib, not just kformula, since that's the name of
+# the tdeinit module for kformula.
+tde_add_library(kformulalib SHARED AUTOMOC
+  SOURCES
+    basicelement.cpp contextstyle.cpp formulacursor.cpp
+    formulaelement.cpp indexelement.cpp kformulacontainer.cpp
+    sequenceelement.cpp textelement.cpp bracketelement.cpp
+    matrixelement.cpp fractionelement.cpp rootelement.cpp symbolelement.cpp
+    kformulacommand.cpp kformulamimesource.cpp
+    MatrixDialog.cpp sequenceparser.cpp elementtype.cpp kformuladocument.cpp
+    symboltable.cpp kformulainputfilter.cpp kformulaview.cpp
+    spaceelement.cpp kformulaconfigpage.cpp
+    symbolaction.cpp fontstyle.cpp creationstrategy.cpp
+    oasiscreationstrategy.cpp tokenstyleelement.cpp tokenelement.cpp
+    identifierelement.cpp operatorelement.cpp glyphelement.cpp styleelement.cpp
+    stringelement.cpp paddedelement.cpp errorelement.cpp phantomelement.cpp
+    actionelement.cpp encloseelement.cpp entities.cpp operatordictionary.cpp
+    numberelement.cpp
+  LINK tdeui-shared kotext-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Programs ##################################################################
+if (BUILD_TESTS)
+  tde_add_executable(koformulatest AUTOMOC
+    SOURCES main.cpp kformulawidget.cpp
+    LINK kformulalib-shared
+  )
+endif()
+
+### Headers ###################################################################
+# install(
+#   FILES
+#     kformulacontainer.h kformuladocument.h kformulaview.h
+#     kformuladefs.h kformulaconfigpage.h
+#   DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+# )
+
+### Data ######################################################################
+add_subdirectory(pics)
+add_subdirectory(fonts)
+add_subdirectory(dtd)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kformula/dtd/CMakeLists.txt b/lib/kformula/dtd/CMakeLists.txt
new file mode 100644
index 000000000..b8bf11ee4
--- /dev/null
+++ b/lib/kformula/dtd/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+install(FILES kformula.dtd DESTINATION ${DATA_INSTALL_DIR}/kformula/dtd)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kformula/entities.cpp b/lib/kformula/entities.cpp
index c6696e1ff..174878e33 100644
--- a/lib/kformula/entities.cpp
+++ b/lib/kformula/entities.cpp
@@ -1150,8 +1150,8 @@ const entityMap entities[] = {
      {"jscr", 0x1D4BF} ,
      {"jsercy", 0x00458} ,
      {"jukcy", 0x00454} ,
-     {"kappa", 0x003BA} ,
-     {"kappav", 0x003F0} ,
+     {"tdeAppa", 0x003BA} ,
+     {"tdeAppav", 0x003F0} ,
      {"kcedil", 0x00137} ,
      {"kcy", 0x0043A} ,
      {"kfr", 0x1D528} ,
@@ -1848,7 +1848,7 @@ const entityMap entities[] = {
      {"therefore", 0x02234} ,
      {"theta", 0x003B8} ,
      {"thetav", 0x003D1} ,
-     {"thickapprox", 0x02248} ,
+     {"thictdeApprox", 0x02248} ,
      {"thicksim", 0x0223C} ,
      {"thinsp", 0x02009} ,
      {"thkap", 0x02248} ,
@@ -1942,7 +1942,7 @@ const entityMap entities[] = {
      {"vDash", 0x022A8} ,
      {"vangrt", 0x0299C} ,
      {"varepsilon", 0x003B5} ,
-     {"varkappa", 0x003F0} ,
+     {"vartdeAppa", 0x003F0} ,
      {"varnothing", 0x02205} ,
      {"varphi", 0x003C6} ,
      {"varpi", 0x003D6} ,
diff --git a/lib/kformula/fonts/CMakeLists.txt b/lib/kformula/fonts/CMakeLists.txt
new file mode 100644
index 000000000..74379d976
--- /dev/null
+++ b/lib/kformula/fonts/CMakeLists.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+set(FONTDIR "${DATA_INSTALL_DIR}/kformula/fonts")
+install(
+  FILES cmex10.ttf Arev.ttf ArevIt.ttf ArevBd.ttf ArevBI.ttf
+  DESTINATION ${FONTDIR}
+)
+
+install(CODE "execute_process(COMMAND mkfontscale \$ENV{DESTDIR}${FONTDIR})")
+install(CODE "execute_process(COMMAND mkfontdir \$ENV{DESTDIR}${FONTDIR})")
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kformula/kformulacontainer.cpp b/lib/kformula/kformulacontainer.cpp
index a6123154d..5499fe915 100644
--- a/lib/kformula/kformulacontainer.cpp
+++ b/lib/kformula/kformulacontainer.cpp
@@ -528,7 +528,7 @@ void Container::saveMathML( TQTextStream& stream, bool oasisFormat )
 {
     TQDomDocument doc;
     if ( !oasisFormat ) {
-        doc = document()->createMathMLDomDocument(); 
+        doc = document()->createMathMLDomDocument();
    }
     rootElement()->writeMathML( doc, doc, oasisFormat );
     stream << doc;
diff --git a/lib/kformula/kformuladocument.cpp b/lib/kformula/kformuladocument.cpp
index 24d7c6504..6d954d66c 100644
--- a/lib/kformula/kformuladocument.cpp
+++ b/lib/kformula/kformuladocument.cpp
@@ -125,7 +125,7 @@ int Document::formulaCount()
 bool Document::loadXML( const TQDomDocument& doc )
 {
     setCreationStrategy( "Ordinary" );
-        
+
     //clear();
     TQDomElement root = doc.documentElement();
 
@@ -205,12 +205,12 @@ TQDomDocument Document::createDomDocument()
  */
 TQDomDocument Document::createMathMLDomDocument()
 {
-    TQDomDocumentType dt = 
+    TQDomDocumentType dt =
         TQDomImplementation().createDocumentType( "math",
                                                  "-//W3C//DTD MathML 2.0//EN",
                                                  "http://www.w3.org/TR/MathML2/dtd/mathml2.dtd");
     TQDomDocument doc( dt );
-    doc.insertBefore( doc.createProcessingInstruction( "xml", 
+    doc.insertBefore( doc.createProcessingInstruction( "xml",
                                                        "version=\"1.0\" encoding=\"UTF-8\"" ),
                       doc.documentElement() );
     return doc;
@@ -1212,10 +1212,10 @@ void DocumentWrapper::setEnabled( bool enabled )
     getAddLowerLeftAction()->setEnabled( enabled );
     getAddUpperRightAction()->setEnabled( enabled );
     getAddLowerRightAction()->setEnabled( enabled );
-    
+
     getAddGenericUpperAction()->setEnabled( enabled );
     getAddGenericLowerAction()->setEnabled( enabled );
-    
+
 
     if ( enabled ) {
         getAddGenericUpperAction()->
@@ -1277,6 +1277,7 @@ void DocumentWrapper::setEnabled( bool enabled )
 
 void DocumentWrapper::enableMatrixActions( bool b)
 {
+    if (!m_hasActions) return;
     getAppendColumnAction()->setEnabled( b );
     getInsertColumnAction()->setEnabled( b );
     getRemoveColumnAction()->setEnabled( b );
diff --git a/lib/kformula/pics/CMakeLists.txt b/lib/kformula/pics/CMakeLists.txt
new file mode 100644
index 000000000..bb28270cf
--- /dev/null
+++ b/lib/kformula/pics/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+add_subdirectory(crystalsvg)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kformula/pics/crystalsvg/CMakeLists.txt b/lib/kformula/pics/crystalsvg/CMakeLists.txt
new file mode 100644
index 000000000..f3304540b
--- /dev/null
+++ b/lib/kformula/pics/crystalsvg/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kformula/unicodetable.cpp b/lib/kformula/unicodetable.cpp
index 23dc8636e..faf5a3628 100644
--- a/lib/kformula/unicodetable.cpp
+++ b/lib/kformula/unicodetable.cpp
@@ -33,8 +33,8 @@ static UnicodeNameTable greekTable[] = {
     { 0x03B8, "theta" },
     { 0x03D1, "vartheta" },
     { 0x03B9, "iota" },
-    { 0x03BA, "kappa" },
-    { 0x03F0, "varkappa" },
+    { 0x03BA, "tdeAppa" },
+    { 0x03F0, "vartdeAppa" },
     { 0x03BB, "lambda" },
     { 0x03BC, "mu" },
     { 0x03BD, "nu" },
diff --git a/lib/kofficecore/CMakeLists.txt b/lib/kofficecore/CMakeLists.txt
new file mode 100644
index 000000000..c3868bdf8
--- /dev/null
+++ b/lib/kofficecore/CMakeLists.txt
@@ -0,0 +1,87 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kwmf
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kofficecore SHARED AUTOMOC
+  SOURCES
+    KoDocument.cpp KoGlobal.cpp KoUnit.cpp KoFilterManager.cpp
+    KoMainWindow.cpp KoApplication.cpp KoQueryTrader.cpp
+    KoFilter.cpp KoFilterChain.cpp KoDocumentInfo.cpp
+    KoPictureKey.cpp KoPictureBase.cpp KoPicture.cpp KoPictureShared.cpp
+    KoPictureImage.cpp KoPictureClipart.cpp KoPictureCollection.cpp
+    KoPictureEps.cpp KoPictureWmf.cpp
+    KoView.cpp KoFrame.cpp KoContainerHandler.cpp KoDocumentChild.cpp
+    KoDocumentInfoDlg.cpp KoFactory.cpp KoChild.cpp
+    koDocumentInfoAboutWidget.ui koDocumentInfoAuthorWidget.ui
+    koDocumentInfoUserMetadataWidget.ui
+    KoApplicationIface.cpp KoApplicationIface.skel
+    KoDocumentIface.cpp KoDocumentIface.skel KoViewIface.cpp KoViewIface.skel
+    KoMainWindowIface.cpp KoMainWindowIface.skel kofficeversion.cpp
+    KoOasisStyles.cpp KoOasisSettings.cpp KoOasisLoadingContext.cpp
+    KoStyleStack.cpp KoGenStyles.cpp KoPageLayout.cpp
+    KoFileDialog.cpp KoXmlNS.cpp KoDom.cpp Koversiondialog.cpp KoOasisStore.cpp
+    kkbdaccessextensions.cpp koDetailsPaneBase.ui koOpenPaneBase.ui
+    KoOpenPane.cpp KoTemplates.cpp KoDetailsPane.cpp KoSpeaker.cpp KoRect.cpp
+  LINK
+    tdeio-shared tdefx-shared tdeabc-shared tdeprint-shared tdeparts-shared
+    kstore-shared kwmf-shared kowmf-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+tde_add_kpart(kodocinfopropspage SHARED AUTOMOC
+  SOURCES KoDocInfoPropsFactory.cpp
+  LINK tdecore-shared tdeio-shared tdefx-shared kjs-shared kofficecore-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(
+  FILES
+    KoContainerHandler.h
+    KoFilter.h KoFilterChain.h
+    KoGlobal.h KoUnit.h KoDocument.h
+    KoMainWindow.h
+    KoApplication.h KoQueryTrader.h
+    KoFilterManager.h
+    KoDocumentInfo.h
+    KoView.h KoFrame.h KoDocumentChild.h
+    KoDocumentInfoDlg.h KoFactory.h KoChild.h
+    KoApplicationIface.h KoDocumentIface.h KoViewIface.h KoMainWindowIface.h
+    KoPictureKey.h KoPicture.h KoPictureCollection.h kofficeversion.h
+    KoOasisStyles.h KoStyleStack.h KoGenStyles.h KoOasisSettings.h
+    KoPageLayout.h KoXmlNS.h KoDom.h Koversiondialog.h
+    kkbdaccessextensions.h
+    koffice_export.h KoOpenPane.h
+    KoSpeaker.h KoOasisLoadingContext.h
+    KoPoint.h
+
+  DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+)
+
+### Data ######################################################################
+install(FILES koffice_shell.rc DESTINATION ${DATA_INSTALL_DIR}/koffice)
+tde_create_translated_desktop(
+    SOURCE kodocinfopropspage.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 59d160e74..fd26f2e02 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -376,9 +376,9 @@ bool KoDocument::exp0rt( const KURL & _url )
 bool KoDocument::saveFile()
 {
     kdDebug(30003) << "KoDocument::saveFile() doc='" << url().url() <<"'"<< endl;
-    
+
     // set local again as it can happen that it gets resetted
-    // so that all saved numbers have a . and not e.g a , as a 
+    // so that all saved numbers have a . and not e.g a , as a
     // decimal seperator
     setlocale( LC_NUMERIC, "C" );
 
@@ -1266,7 +1266,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size )
 TQString KoDocument::autoSaveFile( const TQString & path ) const
 {
     // set local again as it can happen that it gets resetted
-    // so that all saved numbers have a . and not e.g a , as a 
+    // so that all saved numbers have a . and not e.g a , as a
     // decimal seperator
     setlocale( LC_NUMERIC, "C" );
 
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 747a21e4a..65792b648 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -1636,9 +1636,9 @@ void KoMainWindow::slotEmailFile()
     if (!fileURL.isEmpty())
     {
         tdeApp->invokeMailer(TQString(), TQString(), TQString(), theSubject,
-                            TQString(), //body
-                            TQString(),
-                            urls); // attachments
+                             TQString(), //body
+                             TQString(),
+                             urls); // attachments
     }
 }
 
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 3637b90b8..83c0de179 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
 *   This file is part of the KDE/KOffice project.
 *   Copyright (C) 2005, Gary Cramblitt <garycramblitt@comcast.net>
 *
@@ -371,10 +371,10 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
     else
     if (w->inherits("TQComboBox"))
         text = dynamic_cast<TQComboBox *>(w)->currentText();
-    else 
+    else
     if (w->inherits("TQLineEdit"))
         text = dynamic_cast<TQLineEdit *>(w)->text();
-    else 
+    else
     if (w->inherits("TQTextEdit"))
         text = dynamic_cast<TQTextEdit *>(w)->text();
     else
diff --git a/lib/kofficeui/CMakeLists.txt b/lib/kofficeui/CMakeLists.txt
new file mode 100644
index 000000000..868ed2305
--- /dev/null
+++ b/lib/kofficeui/CMakeLists.txt
@@ -0,0 +1,77 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kofficeui SHARED AUTOMOC
+  SOURCES
+    KoPageLayoutDia.cpp KoZoomAction.cpp KoTabBar.cpp
+    KoPartSelectDia.cpp KoPartSelectAction.cpp
+    KoRuler.cpp KoTemplateChooseDia.cpp KoTabChooser.cpp
+    KoKoolBar.cpp KoTemplateCreateDia.cpp KoContextCelp.cpp
+    kcoloractions.cpp KoPictureFilePreview.cpp KoUnitWidgets.cpp
+    ttdeaction.cpp tkcoloractions.cpp tkcombobox.cpp ttdetoolbarbutton.cpp
+    KoCharSelectDia.cpp KoInsertLink.cpp KoEditPath.cpp KoCommandHistory.cpp
+    KoSelectAction.cpp Kolinewidthaction.cpp Kolinestyleaction.cpp
+    KoTooluButton.cpp KoBrush.cpp KoImageResource.cpp KoToolBox.cpp
+    KoZoomHandler.cpp KoGuideLineDia.cpp KoGuides.cpp KoZoomMode.cpp
+    KoGeneralPropertyUi.ui KoPageLayoutColumns.cpp KoPageLayoutColumnsBase.ui
+    KoPageLayoutSize.cpp KoPageLayoutHeaderBase.ui KoPageLayoutHeader.cpp
+    KoPen.cpp
+  LINK kofficecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(
+  FILES
+    KoPageLayoutDia.h KoZoomAction.h KoTabBar.h
+    KoPartSelectDia.h KoPartSelectAction.h
+    KoRuler.h KoTemplateChooseDia.h KoTabChooser.h
+    KoKoolBar.h KoTemplateCreateDia.h KoContextCelp.h
+    kcoloractions.h KoPictureFilePreview.h KoUnitWidgets.h
+    ttdeaction.h tkcoloractions.h ttdetoolbarbutton.h tkcombobox.h
+    KoCharSelectDia.h KoInsertLink.h KoTooluButton.h KoEditPath.h
+    KoCommandHistory.h  KoImageResource.h
+    KoSelectAction.h Kolinewidthaction.h Kolinestyleaction.h
+    KoZoomHandler.h KoGuideLineDia.h KoGuides.h
+    KoPageLayoutHeader.h KoPageLayoutSize.h
+    KoPageLayoutColumns.h KoBrush.h KoPen.h KoZoomMode.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+)
+
+### Widgets ###################################################################
+if (HAVE_MAKETDEWIDGETS)
+  add_custom_command(OUTPUT kofficewidgets.cpp
+    COMMAND maketdewidgets -o kofficewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/koffice.widgets
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/koffice.widgets
+  )
+
+  tde_add_kpart(kofficewidgets AUTOMOC
+    SOURCES kofficewidgets.cpp
+    LINK tdeio-shared
+    DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
+  )
+endif()
+
+### Data ######################################################################
+add_subdirectory(pics)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 94a2ffb75..a836b8de2 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -242,7 +242,7 @@ internetLinkPage::internetLinkPage( TQWidget *parent , char *name  )
   lay2->addWidget(m_hrefName);
 
   lay2->addStretch( 1 );
-  
+
   m_linkName->setFocus();
 
   connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
@@ -315,7 +315,7 @@ bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name  )
   lay2->addWidget(m_hrefName);
 
   lay2->addStretch( 1 );
-  
+
   m_linkName->setFocus();
 
   connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
@@ -396,7 +396,7 @@ mailLinkPage::mailLinkPage( TQWidget *parent , char *name  )
 
   lay2->addWidget(m_hrefName);
   lay2->addStretch( 1 );
-  
+
   connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
   connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & )));
   KSeparator* bar1 = new KSeparator( KSeparator::HLine, this);
@@ -483,9 +483,9 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   }
   else
       recentFile->insertStringList( lst);
-  
+
   recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
-  
+
   connect( recentFile , TQ_SIGNAL(highlighted ( const TQString &)), this,  TQ_SLOT( slotSelectRecentFile( const TQString & )));
 
   tmpTQLabel = new TQLabel( this);
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index d8542ec5c..3cc02db3a 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -40,13 +40,13 @@ class KoSelectAction::KoSelectActionPrivate
       m_popup = new TDEPopupMenu(0L,"KoLineStyleAction::popup");
       m_currentSelection = 0;
     }
-    
+
     ~KoSelectActionPrivate()
     {
       delete m_popup;
       m_popup = 0;
     }
-    
+
     TDEPopupMenu* m_popup;
     int m_currentSelection;
 };
@@ -56,7 +56,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon,
 {
   d = new KoSelectActionPrivate;
   setShowCurrentSelection(true);
-  
+
   connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int)));
 }
 
@@ -64,7 +64,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const
   const char* slot, TQObject* parent, const char* name) : TDEAction(text, icon, 0, parent, name)
 {
   d = new KoSelectActionPrivate;
-  
+
   connect(this, TQ_SIGNAL(selectionChanged(int)), receiver, slot);
   connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int)));
 }
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 8ce383a9d..6a89cbe77 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -472,7 +472,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 	d->m_jwidget->showPage(templateNum);
     else if ( defaultTemplateGroup != -1)
 	d->m_jwidget->showPage(defaultTemplateGroup);
-    
+
 
     // Set the initially selected template, possibly from the last usage of the dialog
     currentChanged(itemtoselect);
diff --git a/lib/kofficeui/koffice.widgets b/lib/kofficeui/koffice.widgets
index 9a3f0ba10..336d60562 100644
--- a/lib/kofficeui/koffice.widgets
+++ b/lib/kofficeui/koffice.widgets
@@ -1,32 +1,26 @@
 [Global]
 PluginName=KOfficeWidgets
 
-[KoBuggyUnitDoubleSpinBox]
+[KoUnitDoubleSpinBox]
 ToolTip=KOffice Spin box for double precision numbers with unit display
 WhatsThis=KOffice Spin box for double precision numbers with unit display
-IncludeFile=koUnitWidgets.h
-Group=Input (KOffice)
-
-[KoUnitDoubleSpinBox2]
-ToolTip=KOffice Spin box for double precision numbers with unit display
-WhatsThis=KOffice Spin box for double precision numbers with unit display
-IncludeFile=koUnitWidgets.h
+IncludeFile=KoUnitWidgets.h
 Group=Input (KOffice)
 
 [KoUnitDoubleLineEdit]
 ToolTip=KOffice Line edit for double precision numbers with unit display
 WhatsThis=KOffice Line edit for double precision numbers with unit display
-IncludeFile=koUnitWidgets.h
+IncludeFile=KoUnitWidgets.h
 Group=Input (KOffice)
 
 [KoUnitDoubleComboBox]
 ToolTip=KOffice Combo box for double precision numbers with unit display
 WhatsThis=KOffice Combo box for double precision numbers with unit display
-IncludeFile=koUnitWidgets.h
+IncludeFile=KoUnitWidgets.h
 Group=Input (KOffice)
 
 [KoUnitDoubleSpinComboBox]
 ToolTip=KOffice Combo box (with spin control) for double precision numbers with unit display
 WhatsThis=KOffice Combo box (with spin control) for double precision numbers with unit display
-IncludeFile=koUnitWidgets.h
+IncludeFile=KoUnitWidgets.h
 Group=Input (KOffice)
diff --git a/lib/kofficeui/pics/CMakeLists.txt b/lib/kofficeui/pics/CMakeLists.txt
new file mode 100644
index 000000000..1d14be12e
--- /dev/null
+++ b/lib/kofficeui/pics/CMakeLists.txt
@@ -0,0 +1,23 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+install(
+  FILES
+    koRulerFirst.png koRulerLeft.png koffice-logo.png
+    koKoolBarDown.png koKoolBarUp.png
+    koPortrait.png koLandscape.png
+  DESTINATION ${DATA_INSTALL_DIR}/koffice/pics
+)
+
+install(
+  FILES
+    kounitdoublecombobox.png kounitdoublelineedit.png
+    kounitdoublespinbox2.png kounitdoublespincombobox.png
+  DESTINATION ${DATA_INSTALL_DIR}/kofficewidgets/pics
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kopainter/CMakeLists.txt b/lib/kopainter/CMakeLists.txt
new file mode 100644
index 000000000..0bb476ce7
--- /dev/null
+++ b/lib/kopainter/CMakeLists.txt
@@ -0,0 +1,33 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kopainter SHARED AUTOMOC
+  SOURCES
+    svgpathparser.cpp koColor.cpp koFrameButton.cpp koColorSlider.cpp
+    koColorChooser.cpp koIconChooser.cpp kogradientmanager.cpp
+    ko_color_wheel.cpp ko_gray_widget.cpp ko_hsv_widget.cpp
+    ko_rgb_widget.cpp ko_cmyk_widget.cpp
+  LINK kofficeui-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kopalette/CMakeLists.txt b/lib/kopalette/CMakeLists.txt
new file mode 100644
index 000000000..3ac6edde9
--- /dev/null
+++ b/lib/kopalette/CMakeLists.txt
@@ -0,0 +1,33 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kopalette SHARED AUTOMOC
+  SOURCES
+    kopalette.cpp kopalettemanager.cpp
+    kotoolboxpalette.cpp kotabpalette.cpp
+  LINK kofficecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(FILES kopalettemanager.h DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/koproperty/CMakeLists.txt b/lib/koproperty/CMakeLists.txt
new file mode 100644
index 000000000..a22303efa
--- /dev/null
+++ b/lib/koproperty/CMakeLists.txt
@@ -0,0 +1,36 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/koproperty/editors
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(koproperty SHARED AUTOMOC
+  SOURCES
+    property.cpp customproperty.cpp set.cpp editor.cpp
+    editoritem.cpp factory.cpp widget.cpp
+  LINK tdecore-shared tdeui-shared kopropertyeditors-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+add_subdirectory(editors)
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/koproperty/editors/CMakeLists.txt b/lib/koproperty/editors/CMakeLists.txt
new file mode 100644
index 000000000..b201dc53f
--- /dev/null
+++ b/lib/koproperty/editors/CMakeLists.txt
@@ -0,0 +1,33 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/koproperty/editors
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kopropertyeditors SHARED AUTOMOC
+  SOURCES
+    booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp
+    datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp
+    pixmapedit.cpp pointedit.cpp rectedit.cpp sizeedit.cpp sizepolicyedit.cpp
+    spinbox.cpp stringedit.cpp stringlistedit.cpp symbolcombo.cpp timeedit.cpp
+    urledit.cpp
+  LINK tdeui-shared tdeio-shared
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kotext/CMakeLists.txt b/lib/kotext/CMakeLists.txt
new file mode 100644
index 000000000..afc0688c9
--- /dev/null
+++ b/lib/kotext/CMakeLists.txt
@@ -0,0 +1,57 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/store
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kotext SHARED AUTOMOC
+  SOURCES
+    KoComplexText.cpp KoRichText.cpp
+    KoTextZoomHandler.cpp KoBorder.cpp
+    KoTextFormat.cpp KoParagCounter.cpp KoStyleCollection.cpp KoTextCommand.cpp
+    KoTextParag.cpp KoTextDocument.cpp KoTextFormatter.cpp KoParagLayout.cpp
+    KoTextObject.cpp KoTextView.cpp KoAutoFormat.cpp KoAutoFormatDia.cpp
+    KoParagDia.cpp KoVariable.cpp KoCustomVariablesDia.cpp
+    KoChangeCaseDia.cpp KoStyleManager.cpp KoSearchDia.cpp
+    timedateformatwidget.ui TimeFormatWidget.cpp DateFormatWidget.cpp
+    kofonttabbase.ui KoFontTab.cpp KoTextBookmark.cpp
+    kohighlightingtabbase.ui KoHighlightingTab.cpp
+    kodecorationtabbase.ui KoDecorationTab.cpp
+    kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp
+    KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui
+    KoTextViewIface.skel KoTextViewIface.cpp KoFontDia.cpp KoBgSpellCheck.cpp
+    KoCommentDia.cpp KoSpell.cpp KoCreateStyleDia.cpp KoTextCustomItem.cpp
+    KoImportStyleDia.cpp KoTextIterator.cpp KoOasisContext.cpp KoListStyleStack.cpp
+    KoUserStyle.cpp KoUserStyleCollection.cpp KoParagStyle.cpp KoParagDecorationTab.ui
+  LINK kofficeui-shared kohyphen-static tdespell2-shared tdeutils-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+add_subdirectory(kohyphen)
+
+### Headers ###################################################################
+# install(
+#   FILES
+#     KoTextZoomHandler.h KoTextFormat.h KoParagCounter.h KoStyleCollection.h
+#     KoTextDocument.h KoBgSpellCheck.h KoCommentDia.h KoCreateStyleDia.h
+#   DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+# )
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 3306798d1..46d601208 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -335,7 +335,7 @@ void KoAutoFormat::readConfig(bool force)
     if( beginDoubleQuote.isEmpty())
     {
         if( m_typographicDefaultDoubleQuotes.begin.isNull())
-            m_typographicDoubleQuotes.begin = TQChar('�');
+            m_typographicDoubleQuotes.begin = TQChar('�');
         else
             m_typographicDoubleQuotes.begin = m_typographicDefaultDoubleQuotes.begin;
     }
@@ -345,7 +345,7 @@ void KoAutoFormat::readConfig(bool force)
     if( endDoubleQuote.isEmpty() )
     {
         if( m_typographicDefaultDoubleQuotes.end.isNull())
-            m_typographicDoubleQuotes.end = TQChar('�');
+            m_typographicDoubleQuotes.end = TQChar('�');
         else
             m_typographicDoubleQuotes.end = m_typographicDefaultDoubleQuotes.end;
     }
@@ -1654,11 +1654,11 @@ KCommand * KoAutoFormat::doAutoReplaceNumber( KoTextCursor* textEditCursor, KoTe
         textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor );
         TQString replacement;
         if( word == TQString("1/2") )
-            replacement=TQString("�");
+            replacement=TQString("�");
         else if (word == TQString("1/4") )
-            replacement=TQString("�");
+            replacement=TQString("�");
         else if (word == TQString("3/4") )
-            replacement=TQString("�");
+            replacement=TQString("�");
         TQString cmdName = i18n("Autocorrect for Fraction");
         KCommand *cmd =txtObj->replaceSelectionCommand( textEditCursor, replacement,
                                                         cmdName,
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index 248415023..1383bec54 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -286,7 +286,7 @@ void KoAutoFormatDia::setupTab1()
     cbAutoReplaceNumber=new TQCheckBox( tab1 );
     cbAutoReplaceNumber->setText( i18n(
             "We add the 1/2 char at the %1", "Re&place 1/2... with %1..." )
-            .arg( TQString( "�" ) ) );
+            .arg( TQString( "�" ) ) );
     TQWhatsThis::add( cbAutoReplaceNumber, i18n(
             "Most standard fraction notations will be converted when available"
             ) );
diff --git a/lib/kotext/kohyphen/CMakeLists.txt b/lib/kotext/kohyphen/CMakeLists.txt
new file mode 100644
index 000000000..a9718a46c
--- /dev/null
+++ b/lib/kotext/kohyphen/CMakeLists.txt
@@ -0,0 +1,41 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_SOURCE_DIR}/lib/kofficeui
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kohyphen STATIC_PIC AUTOMOC
+  SOURCES hnjalloc.c hyphen.c kohyphen.cpp
+  LINK tdecore-shared
+)
+
+### Programs ##################################################################
+if (BUILD_TESTS)
+  tde_add_executable(kohyphentest AUTOMOC
+    SOURCES kohyphentest.cpp
+    LINK
+      tdecore-shared tdeui-shared tdefx-shared tdeio-shared
+      tdetexteditor kohyphen-static
+  )
+endif()
+
+### Data ######################################################################
+add_subdirectory(hyphdicts)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kotext/kohyphen/hyphdicts/CMakeLists.txt b/lib/kotext/kohyphen/hyphdicts/CMakeLists.txt
new file mode 100644
index 000000000..95f8bb963
--- /dev/null
+++ b/lib/kotext/kohyphen/hyphdicts/CMakeLists.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+install(
+  FILES
+    dicts.xml
+    hyph_cs.dic hyph_en.dic hyph_hu.dic hyph_uk.dic hyph_da.dic hyph_de.dic
+    hyph_en_CA.dic hyph_es.dic hyph_fr.dic hyph_it.dic hyph_nl.dic hyph_pt_BR.dic
+    hyph_pt.dic hyph_pt_PT.dic hyph_ru.dic hyph_sk.dic hyph_sv.dic hyph_sl.dic
+  DESTINATION ${DATA_INSTALL_DIR}/koffice/hyphdicts
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/kotext/kohyphen/kohyphentest.cpp b/lib/kotext/kohyphen/kohyphentest.cpp
index 0f083631e..5a0d3ac0e 100644
--- a/lib/kotext/kohyphen/kohyphentest.cpp
+++ b/lib/kotext/kohyphen/kohyphentest.cpp
@@ -6,6 +6,7 @@
 #include <tqstringlist.h>
 
 #include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include "kohyphen.h"
 #include <kdebug.h>
@@ -40,7 +41,8 @@ void check_hyphenation( const TQStringList& tests, const TQStringList& results,
 
 int main (int argc, char ** argv)
 {
-    TDEApplication app(argc, argv, "KoHyphenator test");
+    TDECmdLineArgs::init(argc, argv, "kohyphentest", "KoHyphenator test", 0, 0, true);
+    TDEApplication app;
 
     try {
         hypher = KoHyphenator::self();
@@ -54,8 +56,12 @@ int main (int argc, char ** argv)
     TQStringList::ConstIterator it, itres;
 
     //testing Czech language, this text is in UTF-8!
-    TQStringList cs_tests = TQStringList() << "Žluťoučký" << "kůň" << "úpěl" <<
-                        "ďábelské" << "ódy";
+    TQStringList cs_tests;
+    cs_tests << TQString::fromLocal8Bit("Žluťoučký")
+             << TQString::fromLocal8Bit("kůň")
+             << TQString::fromLocal8Bit("úpěl")
+             << TQString::fromLocal8Bit("ďábelské")
+             << TQString::fromLocal8Bit("ódy");
 
     for ( it = cs_tests.begin(); it != cs_tests.end() ; ++it )
         kdDebug() << (*it) << " hyphenates like this: " << hypher->hyphenate((*it), "cs") << endl;
diff --git a/lib/kross/CMakeLists.txt b/lib/kross/CMakeLists.txt
new file mode 100644
index 000000000..e083e027c
--- /dev/null
+++ b/lib/kross/CMakeLists.txt
@@ -0,0 +1,17 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+tde_conditional_add_subdirectory(WITH_KROSS_PYTHON python)
+tde_conditional_add_subdirectory(WITH_KROSS_RUBY ruby)
+
+add_subdirectory(api)
+add_subdirectory(main)
+add_subdirectory(runner)
+
+if (BUILD_TESTS)
+  add_subdirectory(test)
+endif()
\ No newline at end of file
diff --git a/lib/kross/ConfigureChecks.cmake b/lib/kross/ConfigureChecks.cmake
new file mode 100644
index 000000000..5949ee220
--- /dev/null
+++ b/lib/kross/ConfigureChecks.cmake
@@ -0,0 +1,119 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Python ####################################################################
+if (WITH_KROSS_PYTHON)
+#   find_package(Python3 COMPONENTS Interpreter Development)
+#   if (NOT Python3_FOUND)
+#     message(WARNING "Python developement files were not found, Python scripting support for "
+#                     "KOffice will not be built. If you don't need Python scripting, you "
+#                     "can ignore this message.")
+    message(WARNING "The Python bindings of Kross don't support Python3."
+                    "Python scripting support for KOffice will not be built. If you don't "
+                    "need Python scripting, you can ignore this message.")
+    set(WITH_KROSS_PYTHON OFF)
+#   endif()
+endif()
+
+
+if (WITH_KROSS_RUBY)
+  find_program(RUBY ruby)
+  if (NOT RUBY)
+    message(WARNING "The Ruby executable was not found. "
+                    "Ruby scripting support for KOffice will not be built. If you don't "
+                    "need Ruby scripting, you can ignore this message.")
+    set(WITH_KROSS_RUBY OFF)
+  else()
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"
+                    OUTPUT_VARIABLE RUBY_MAJOR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"
+                    OUTPUT_VARIABLE RUBY_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"
+                    OUTPUT_VARIABLE RUBY_ARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"
+                    OUTPUT_VARIABLE RUBY_SITEARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitedir))"
+                    OUTPUT_VARIABLE RUBY_SITEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"
+                    OUTPUT_VARIABLE RUBY_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"
+                    OUTPUT_VARIABLE RUBY_SITELIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"
+                    OUTPUT_VARIABLE RUBY_RUBYLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"
+                    OUTPUT_VARIABLE RUBY_LIBRUBYARG OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    ###
+    if (RUBY_LIBRUBYARG)
+      set(RUBY_ENABLESHARED ON)
+    else()
+      set(RUBY_ENABLESHARED OFF)
+    endif()
+
+    ###
+    set(RUBY_SERIES "${RUBY_MAJOR}.${RUBY_MINOR}")
+    set(RUBY_VERSION_DEFS "")
+
+    if (RUBY_SERIES VERSION_GREATER_EQUAL "1.9")
+      set(HAVE_RUBY_1_9 1)
+      set(RUBY_VERSION_DEFS "${RUBY_VERSION_DEFS} -DHAVE_RUBY_1_9")
+    endif()
+
+    if (RUBY_SERIES VERSION_GREATER_EQUAL "3.0")
+      set(HAVE_RUBY_3 1)
+      set(RUBY_VERSION_DEFS "${RUBY_VERSION_DEFS} -DHAVE_RUBY_3")
+    endif()
+
+    ###
+    execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"
+                    OUTPUT_VARIABLE RUBY_HAS_INCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (RUBY_HAS_INCLUDEDIR STREQUAL "true")
+      execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"
+                      OUTPUT_VARIABLE RUBY_INCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+      execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"
+                      OUTPUT_VARIABLE RUBY_HAS_ARCHINCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+      if (RUBY_HAS_ARCHINCLUDEDIR STREQUAL "true")
+        execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"
+                        OUTPUT_VARIABLE RUBY_ARCHINCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+      else()
+        execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"
+                        OUTPUT_VARIABLE RUBY_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(RUBY_ARCHINCLUDEDIR "${RUBY_INCLUDEDIR}/${RUBY_ARCH}")
+      endif()
+
+      set(RUBY_CFLAGS "-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}")
+    else()
+      execute_process(COMMAND ${RUBY} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"
+                      OUTPUT_VARIABLE RUBY_INCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set(RUBY_CFLAGS "-I${RUBY_INCLUDEDIR}")
+      message("set RUBY_CFLAGS 2 ${RUBY_CFLAGS}")
+    endif()
+  endif()
+
+  ###
+  if (NOT EXISTS "${RUBY_INCLUDEDIR}/ruby/config.h" AND
+      NOT EXISTS "${RUBY_ARCHINCLUDEDIR}/ruby/config.h")
+    message(WARNING "Ruby development files were not found, or Ruby <= 1.8.1 was found, "
+                    "Ruby scripting support for KOffice will not be built. If you don't "
+                    "need Ruby scripting, you can ignore this message.")
+    set(WITH_KROSS_RUBY OFF)
+  else()
+    message(STATUS "Ruby executable:  ${RUBY}")
+    message(STATUS "Ruby archdir:     ${RUBY_ARCHDIR}")
+    message(STATUS "Ruby sitearchdir: ${RUBY_SITEARCHDIR}")
+    message(STATUS "Ruby sitedir:     ${RUBY_SITEDIR}")
+    message(STATUS "Ruby sitelibdir:  ${RUBY_SITELIBDIR}")
+    message(STATUS "Ruby libdir:      ${RUBY_LIBDIR}")
+    message(STATUS "Ruby includedir:  ${RUBY_INCLUDEDIR}")
+    message(STATUS "Ruby librubyarg:  ${RUBY_LIBRUBYARG}")
+    message(STATUS "Ruby cflags:      ${RUBY_CFLAGS}")
+  endif()
+endif()
\ No newline at end of file
diff --git a/lib/kross/api/CMakeLists.txt b/lib/kross/api/CMakeLists.txt
new file mode 100644
index 000000000..077b3bebf
--- /dev/null
+++ b/lib/kross/api/CMakeLists.txt
@@ -0,0 +1,38 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(libkrossapi SHARED AUTOMOC
+  SOURCES
+    object.cpp variant.cpp list.cpp dict.cpp exception.cpp callable.cpp
+    eventaction.cpp eventsignal.cpp eventslot.cpp eventscript.cpp
+    qtobject.cpp script.cpp interpreter.cpp
+  LINK
+    tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(
+  FILES
+    callable.h class.h dict.h eventaction.h event.h eventscript.h eventsignal.h
+    eventslot.h exception.h function.h interpreter.h list.h module.h object.h
+    proxy.h qtobject.h script.h value.h variant.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kross/api
+)
\ No newline at end of file
diff --git a/lib/kross/main/CMakeLists.txt b/lib/kross/main/CMakeLists.txt
new file mode 100644
index 000000000..3eee58de6
--- /dev/null
+++ b/lib/kross/main/CMakeLists.txt
@@ -0,0 +1,39 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kross/
+  ${CMAKE_BINARY_DIR}/lib/kross/
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(libkrossmain SHARED AUTOMOC
+  SOURCES
+    krossconfig.cpp mainmodule.cpp scriptcontainer.cpp manager.cpp
+    scriptaction.cpp scriptguiclient.cpp wdgscriptsmanagerbase.ui
+    wdgscriptsmanager.cpp
+  LINK
+    tdecore-shared tdeio-shared tdeui-shared tdenewstuff-shared
+    libkrossapi-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+### Headers ###################################################################
+install(
+  FILES
+    krossconfig.h mainmodule.h manager.h scriptaction.h scriptcontainer.h
+    scriptguiclient.h wdgscriptsmanager.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+)
\ No newline at end of file
diff --git a/lib/kross/ruby/CMakeLists.txt b/lib/kross/ruby/CMakeLists.txt
new file mode 100644
index 000000000..4ec25f67d
--- /dev/null
+++ b/lib/kross/ruby/CMakeLists.txt
@@ -0,0 +1,35 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kross
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${RUBY_INCLUDEDIR}
+  ${RUBY_INCLUDEDIR}/ruby
+  ${RUBY_ARCHINCLUDEDIR}
+  ${RUBY_ARCHINCLUDEDIR}/ruby
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+add_compile_options(${RUBY_LIBRUBYARG})
+
+### Libraries #################################################################
+tde_add_kpart(krossruby SHARED AUTOMOC
+  SOURCES
+    rubyinterpreter.cpp rubyextension.cpp rubyscript.cpp rubymodule.cpp
+    rubywrapper.c
+  LINK
+    tdecore-shared libkrossapi-shared libkrossmain-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/lib/kross/runner/CMakeLists.txt b/lib/kross/runner/CMakeLists.txt
new file mode 100644
index 000000000..7577d32e4
--- /dev/null
+++ b/lib/kross/runner/CMakeLists.txt
@@ -0,0 +1,27 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Programs ##################################################################
+tde_add_executable(krossrunner AUTOMOC
+  SOURCES main.cpp
+  LINK
+    tdecore-shared tdeui-shared tdefx-shared tdeio-shared
+    tdetexteditor-shared libkrossapi-shared libkrossmain-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/lib/kross/test/CMakeLists.txt b/lib/kross/test/CMakeLists.txt
new file mode 100644
index 000000000..7068c6f54
--- /dev/null
+++ b/lib/kross/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Programs ##################################################################
+tde_add_executable(krosstest AUTOMOC
+  SOURCES
+    testobject.cpp testaction.cpp testplugin.cpp testwindow.cpp main.cpp
+  LINK
+    tdecore-shared tdeui-shared tdefx-shared dcop-shared tdetexteditor-shared
+    libkrossapi-shared libkrossmain-shared
+)
\ No newline at end of file
diff --git a/lib/kwmf/CMakeLists.txt b/lib/kwmf/CMakeLists.txt
new file mode 100644
index 000000000..6a4c9a5f3
--- /dev/null
+++ b/lib/kwmf/CMakeLists.txt
@@ -0,0 +1,36 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+### Libraries #################################################################
+tde_add_library(kwmf SHARED AUTOMOC
+  SOURCES kwmf.cpp qwmf.cpp
+  LINK tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+tde_add_library(kowmf SHARED AUTOMOC
+  SOURCES
+    kowmfreadprivate.cpp kowmfstack.cpp
+    kowmfread.cpp kowmfwrite.cpp kowmfpaint.cpp
+  LINK tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/lib/store/CMakeLists.txt b/lib/store/CMakeLists.txt
new file mode 100644
index 000000000..6d8459081
--- /dev/null
+++ b/lib/store/CMakeLists.txt
@@ -0,0 +1,34 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib/kofficecore
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+tde_add_library(kstore SHARED AUTOMOC
+  SOURCES
+    KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp
+    KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
+  LINK tdecore-shared tdeui-shared tdeio-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+install(
+  FILES KoStore.h KoStoreDevice.h KoXmlWriter.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/KOffice
+)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
new file mode 100644
index 000000000..bb28270cf
--- /dev/null
+++ b/pics/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+add_subdirectory(crystalsvg)
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/pics/crystalsvg/CMakeLists.txt b/pics/crystalsvg/CMakeLists.txt
new file mode 100644
index 000000000..f3304540b
--- /dev/null
+++ b/pics/crystalsvg/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+tde_install_icons()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/servicetypes/CMakeLists.txt b/servicetypes/CMakeLists.txt
new file mode 100644
index 000000000..05744b2d8
--- /dev/null
+++ b/servicetypes/CMakeLists.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+### Data ######################################################################
+foreach(DESKTOP_FILE kofficepart.desktop kofilter.desktop koplugin.desktop
+                     kochart.desktop kofilterwrapper.desktop)
+  tde_create_translated_desktop(
+    SOURCE ${DESKTOP_FILE}
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR koffice-desktops
+  )
+endforeach()
+
+# kate: indent-width 2; replace-tabs true;
\ No newline at end of file
diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
new file mode 100644
index 000000000..5c3b7f4fb
--- /dev/null
+++ b/templates/CMakeLists.txt
@@ -0,0 +1,22 @@
+###############################################################################
+# Trinity KOffice                                                             #
+# ---------------                                                             #
+# This file is licensed under the terms of GNU GPL v3 or later.               #
+# Improvements and feedback are welcome.                                      #
+###############################################################################
+
+set(TEMPLATE_SUBDIR "Normal")
+file(GLOB DESKTOP_FILES *.desktop)
+file(GLOB KWORD_TEMPLATES *.kwt)
+
+install(
+  FILES
+    Presentation.desktop TextDocument.desktop SpreadSheet.desktop
+    Illustration.desktop
+  DESTINATION ${TEMPLATES_INSTALL_DIR}
+)
+
+install(
+  FILES Presentation.kpt TextDocument.kwt SpreadSheet.kst Illustration.karbon
+  DESTINATION ${TEMPLATES_INSTALL_DIR}/.source
+)
\ No newline at end of file