Conversion to the cmake building system.

Delete empty files (dummy.cpp, xsldbgconfig.h).
Remove hard-coded path for the kmdr-executor executable.
Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
Add man pages taken from the Debian packaging.

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

Fix linking - kxsldbgcommon-static and  kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130)

40 files changed, 573 insertions, 74 deletions

diff --git a/kommander/CMakeLists.txt b/kommander/CMakeLists.txt
new file mode 100644
index 00000000..875d4689
--- /dev/null
+++ b/kommander/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_subdirectory( icons         )
+add_subdirectory( pluginmanager )
+add_subdirectory( plugin        )
+add_subdirectory( factory       )
+add_subdirectory( widget        )
+add_subdirectory( widgets       )
+add_subdirectory( editor        )
+add_subdirectory( executor      )
+add_subdirectory( part          )
+add_subdirectory( working       )
+add_subdirectory( examples      )
+add_subdirectory( kmdrtools     )
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE x-kommander.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+)
diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt
new file mode 100644
index 00000000..0fa2d46b
--- /dev/null
+++ b/kommander/editor/CMakeLists.txt
@@ -0,0 +1,83 @@
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/widgets
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_definitions( -DKOMMANDER -DTQT_NO_SQL -DDESIGNER )
+ 
+
+##### kmdr-editor (executable)
+
+tde_add_executable( kmdr-editor AUTOMOC
+
+  SOURCES
+        actioneditor.ui assoctexteditor.ui
+        connectioneditor.ui createtemplate.ui
+        formsettings.ui iconvieweditor.ui
+        listboxeditor.ui listeditor.ui
+        listvieweditor.ui multilineeditor.ui
+        newform.ui paletteeditor.ui
+        paletteeditoradvanced.ui pixmapfunction.ui
+        preferences.ui previewwidget.ui
+        tableeditor.ui wizardeditor.ui
+        choosewidget.ui functions.ui
+        actiondnd.cpp actioneditorimpl.cpp
+        assoctexteditorimpl.cpp actionlistview.cpp
+        asciivalidator.cpp assistproc.cpp
+        command.cpp connectioneditorimpl.cpp
+        defs.cpp filechooser.cpp
+        formfile.cpp formsettingsimpl.cpp
+        formwindow.cpp hierarchyview.cpp
+        iconvieweditorimpl.cpp layout.cpp
+        listboxeditorimpl.cpp listvieweditorimpl.cpp
+        main.cpp mainwindow.cpp
+        mainwindowactions.cpp metadatabase.cpp
+        multilineeditorimpl.cpp newformimpl.cpp
+        orderindicator.cpp paletteeditoradvancedimpl.cpp
+        paletteeditorimpl.cpp parser.cpp
+        pixmapchooser.cpp previewframe.cpp
+        previewwidgetimpl.cpp propertyeditor.cpp
+        qcompletionedit.cpp resource.cpp
+        sizehandle.cpp styledbutton.cpp
+        tableeditorimpl.cpp widgetdatabase.cpp
+        widgetfactory.cpp wizardeditorimpl.cpp
+        workspace.cpp choosewidgetimpl.cpp
+        functionsimpl.cpp messagelog.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     tdetexteditor-shared
+     kommanderwidget-shared
+     kommanderwidgets-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kommander.xml kommander-new.xml
+    DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax
+)
+
+tde_create_translated_desktop( kmdr-editor.desktop )
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index 558964c1..b5f74086 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -219,4 +219,7 @@
     <slot>AssocTextEditorBase_destroyed(TQObject*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 60b4ff69..b39a7e7b 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -144,7 +144,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 2f1683aa..0a20e4e6 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -404,15 +404,9 @@
     <slot access="protected">cancelClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index e6f7fc15..f0bad338 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -330,9 +330,8 @@
     <slot>okClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 005d2261..86d1b74a 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -696,27 +696,13 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 497be25b..3fde775c 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -18,6 +18,14 @@
 
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef TQTDOCDIR
+#define TQTDOCDIR "/usr/share/tqt3/doc/html"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -118,7 +126,7 @@ static TQString textNoAccel(const TQString& text)
 MainWindow::MainWindow(bool asClient)
   : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader),
       grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true),
-      docPath("$TQTDIR/doc/html"), client(asClient),  databaseAutoEdit(false), previewing(false)
+      docPath(TQTDOCDIR), client(asClient),  databaseAutoEdit(false), previewing(false)
 {
   m_partManager = new KParts::PartManager(this);
   //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )),          this, TQT_SLOT(slotActivePartChanged(KParts::Part * )));
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 3800bbbd..20630a19 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -19,10 +19,6 @@
 
 #include "mainwindow.h"
 
-#ifdef QT_NO_SQL
-#define TQT_NO_SQL
-#endif // QT_NO_SQL
-
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqfileinfo.h>
diff --git a/kommander/editor/pics/CMakeLists.txt b/kommander/editor/pics/CMakeLists.txt
new file mode 100644
index 00000000..04f2e9ba
--- /dev/null
+++ b/kommander/editor/pics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+    FILES kommandersplash.png toolbox.png tdefontcombo.png
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/pics
+)
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 6b71979b..76ec00d9 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -18,6 +18,10 @@
 **
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdelocale.h>
 #include <kommanderfactory.h>
 
diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index c844cfc4..ff0d9c60 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -168,7 +168,7 @@ private:
      bool mousePressed;
 };
 
-class EditorToolBox : public ToolBox
+class KDE_EXPORT EditorToolBox : public ToolBox
 {
     Q_OBJECT
   
diff --git a/kommander/examples/CMakeLists.txt b/kommander/examples/CMakeLists.txt
new file mode 100644
index 00000000..9af8ae8b
--- /dev/null
+++ b/kommander/examples/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory( current  )
+add_subdirectory( old      )
+add_subdirectory( tutorial )
diff --git a/kommander/examples/current/CMakeLists.txt b/kommander/examples/current/CMakeLists.txt
new file mode 100644
index 00000000..cb28f2a2
--- /dev/null
+++ b/kommander/examples/current/CMakeLists.txt
@@ -0,0 +1,7 @@
+##### other data
+
+install(
+    FILES a1.kmdr b1.kmdr editor-poc.kmdr keyvaluecombo.kmdr
+    kpartmwframe.kmdr kpartpart.kmdr passvariables.kmdr tableselect.kmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/current
+)
diff --git a/kommander/examples/old/CMakeLists.txt b/kommander/examples/old/CMakeLists.txt
new file mode 100644
index 00000000..8b860d42
--- /dev/null
+++ b/kommander/examples/old/CMakeLists.txt
@@ -0,0 +1,10 @@
+##### other data
+
+install(
+    FILES checkmail.kmdr execprogram.kmdr form1.kmdr form3.kmdr
+    form5.kmdr populate.kmdr selectedwidgettext.kmdr simplelist.kmdr
+    tidy.kmdr wizard.kmdr ex1.kmdr firstform.kmdr.kmdr form2.kmdr
+    form4.kmdr newfile.kmdr resize.kmdr settings.kmdr tar.kmdr
+    widgetgenerator.kmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/old
+)
diff --git a/kommander/examples/tutorial/CMakeLists.txt b/kommander/examples/tutorial/CMakeLists.txt
new file mode 100644
index 00000000..0d344518
--- /dev/null
+++ b/kommander/examples/tutorial/CMakeLists.txt
@@ -0,0 +1,10 @@
+##### other data
+
+install(
+    FILES append.kmdr calc.kmdr dcop.kmdr globals.kmdr loop.kmdr
+          progressbar.kmdr slots.kmdr strings.kmdr tree.kmdr arrays.kmdr
+          cmdline.kmdr dialogs.kmdr initialize.kmdr picview.kmdr
+          settings.kmdr statusbar.kmdr table.kmdr widgets.kmdr
+          README
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor/tutorial
+)
diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt
new file mode 100644
index 00000000..806b0911
--- /dev/null
+++ b/kommander/executor/CMakeLists.txt
@@ -0,0 +1,58 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/widgets
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### instance (static)
+
+tde_add_library( instance STATIC_PIC AUTOMOC
+
+  SOURCES
+        instance.cpp
+        dcopkommanderif.skel
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kommanderplugin-shared
+)
+
+
+##### kmdr-executor (executable)
+
+tde_add_executable( kmdr-executor AUTOMOC
+
+  SOURCES
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     instance-static
+     kommanderwidget-shared
+     kommanderwidgets-shared
+     kommanderfactory-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kmdr-executor.desktop
+    DESTINATION ${APPS_INSTALL_DIR}/.hidden
+)
diff --git a/kommander/factory/CMakeLists.txt b/kommander/factory/CMakeLists.txt
new file mode 100644
index 00000000..ec540c7c
--- /dev/null
+++ b/kommander/factory/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+add_definitions( -DTQT_NO_SQL )
+
+
+##### kommanderfactory (static)
+
+tde_add_library( kommanderfactory STATIC_PIC AUTOMOC
+
+  SOURCES
+        kommanderfactory.cpp
+        domtool.cpp
+  LINK
+     kommanderplugin-shared
+)
+
+
+###### headers
+
+install(
+    FILES kommanderfactory.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index c81ec3ad..37f26fdb 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -25,10 +25,6 @@
 #include "kommanderfactory.h"
 #include <kommanderplugin.h>
 
-#ifdef QT_NO_SQL
-#define TQT_NO_SQL
-#endif // QT_NO_SQL
-
 #include <tqfeatures.h>
 #include "config.h"
 #ifndef TQT_NO_SQL
diff --git a/kommander/icons/CMakeLists.txt b/kommander/icons/CMakeLists.txt
new file mode 100644
index 00000000..a0a4d713
--- /dev/null
+++ b/kommander/icons/CMakeLists.txt
@@ -0,0 +1,9 @@
+##### icons
+
+tde_install_icons( kommander )
+
+install(
+    FILES hi22-action-arrow.png
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/icons/hicolor/22x22/actions
+    RENAME arrow.png
+)
diff --git a/kommander/kmdrtools/CMakeLists.txt b/kommander/kmdrtools/CMakeLists.txt
new file mode 100644
index 00000000..12f913d5
--- /dev/null
+++ b/kommander/kmdrtools/CMakeLists.txt
@@ -0,0 +1,7 @@
+##### other data
+
+install(
+    FILES dcoptool-oldparser.kmdr examples.kmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kmdr-editor/editor
+)
+
diff --git a/kommander/part/CMakeLists.txt b/kommander/part/CMakeLists.txt
new file mode 100644
index 00000000..a576ef73
--- /dev/null
+++ b/kommander/part/CMakeLists.txt
@@ -0,0 +1,43 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/executor
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkommander_part (kpart)
+
+tde_add_kpart( libkommander_part AUTOMOC
+
+  SOURCES
+        kommander_part.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kjs-shared
+     tdeparts-shared
+     tdehtml-shared
+     kommanderwidget-shared
+     kommanderplugin-shared
+     instance-static  
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kommander_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kommander/plugin/CMakeLists.txt b/kommander/plugin/CMakeLists.txt
new file mode 100644
index 00000000..0daa3736
--- /dev/null
+++ b/kommander/plugin/CMakeLists.txt
@@ -0,0 +1,38 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderplugin (shared)
+
+tde_add_library( kommanderplugin SHARED AUTOMOC
+
+  SOURCES
+        kommanderplugin.cpp
+        specialinformation.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+
+  DESTINATION ${LIB_INSTALL_DIR}
+  
+  VERSION 0.0.0
+)
+
+
+##### headers
+
+install(
+    FILES kommanderplugin.h specials.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index 0a80dd85..4a1d8903 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -12,7 +12,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
- 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "specials.h"
 #include "specialinformation.h"
 
@@ -63,7 +65,7 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr
 }
 
 
-TQString SpecialFunction::prototype(uint prototypeFlags) const
+TQString KDE_EXPORT SpecialFunction::prototype(uint prototypeFlags) const
 {
   if (!m_types.count())
     return m_function;
@@ -82,21 +84,21 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const
     return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
 }
 
-TQString SpecialFunction::argumentName(uint i) const
+TQString KDE_EXPORT SpecialFunction::argumentName(uint i) const
 {
   if (i < m_args.count())
     return m_args[i];
   return TQString();
 }
 
-TQString SpecialFunction::argumentType(uint i) const
+TQString KDE_EXPORT SpecialFunction::argumentType(uint i) const
 {
   if (i < m_types.count())
     return m_types[i];
   return TQString();
 }
 
-int SpecialFunction::argumentCount() const
+int KDE_EXPORT SpecialFunction::argumentCount() const
 {
   return m_types.count();
 }
@@ -104,7 +106,7 @@ int SpecialFunction::argumentCount() const
 
 
 
-int SpecialInformation::function(int group, const TQString& fname) 
+int KDE_EXPORT SpecialInformation::function(int group, const TQString& fname)
 {
   TQString f = fname.lower();
   if (m_functions.contains(group) && m_functions[group].contains(f))
@@ -114,13 +116,13 @@ int SpecialInformation::function(int group, const TQString& fname)
   return -1;
 }
   
-SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
+KDE_EXPORT SpecialFunction SpecialInformation::functionObject(const TQString& gname, const TQString& fname)
 {
   int gid = group(gname);
   return m_specials[gid][function(gid, fname)];
 }
 
-int SpecialInformation::group(const TQString& gname) 
+int KDE_EXPORT SpecialInformation::group(const TQString& gname)
 {
  if (m_groups.contains(gname))
     return m_groups[gname];
@@ -137,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname)
   return function(group(gname), fname) != -1;
 }
 
-bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
+bool KDE_EXPORT SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
 {
   return m_specials.contains(gname) && m_specials[gname].contains(fname)
     && m_specials[gname][fname].isSupported(p);
@@ -151,14 +153,14 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname,
   return f != -1 && m_specials[g][f].isSupported(p);
 }
 
-int SpecialInformation::minArg(int gname, int fname) 
+int KDE_EXPORT SpecialInformation::minArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].minArg();
   return -1;
 }
 
-int SpecialInformation::maxArg(int gname, int fname) 
+int KDE_EXPORT SpecialInformation::maxArg(int gname, int fname)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].maxArg();
@@ -186,7 +188,7 @@ TQString SpecialInformation::description(int gname, int fname)
   return TQString();
 }
 
-TQString SpecialInformation::prototype(int gname, int fname, uint flags)
+TQString KDE_EXPORT SpecialInformation::prototype(int gname, int fname, uint flags)
 {
   if (isValid(gname, fname))
     return m_specials[gname][fname].prototype(flags);
@@ -246,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin
   }
 }
 
-TQString SpecialInformation::parserGroupName(const TQString& name)
+TQString KDE_EXPORT SpecialInformation::parserGroupName(const TQString& name)
 {
   if (m_parserGroups.contains(name))
     return m_parserGroups[name];
@@ -254,12 +256,12 @@ TQString SpecialInformation::parserGroupName(const TQString& name)
     return name;
 }
 
-TQStringList SpecialInformation::groups()
+TQStringList KDE_EXPORT SpecialInformation::groups()
 {
   return m_groups.keys();
 }
 
-TQStringList SpecialInformation::functions(const TQString& g)
+TQStringList KDE_EXPORT SpecialInformation::functions(const TQString& g)
 {
   int gid = group(g);
   if (gid == -1)
@@ -279,7 +281,7 @@ bool SpecialFunction::isSupported(ParserType p) const
   return (m_parserTypes & p);
 }
 
-void SpecialInformation::registerSpecials()
+void KDE_EXPORT SpecialInformation::registerSpecials()
 {
   insertGroup(Group::DCOP, "DCOP", "");
   insert(DCOP::addUniqueItem, "addUniqueItem(TQString widget, TQString item)",
diff --git a/kommander/pluginmanager/CMakeLists.txt b/kommander/pluginmanager/CMakeLists.txt
new file mode 100644
index 00000000..077dd20b
--- /dev/null
+++ b/kommander/pluginmanager/CMakeLists.txt
@@ -0,0 +1,30 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmdr-plugins (executable)
+
+tde_add_executable( kmdr-plugins AUTOMOC
+
+  SOURCES
+        main.cpp
+        mainwindow.cpp
+        pluginmanager.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt
new file mode 100644
index 00000000..38fb56f7
--- /dev/null
+++ b/kommander/widget/CMakeLists.txt
@@ -0,0 +1,46 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidget (shared)
+
+tde_add_library( kommanderwidget SHARED AUTOMOC
+
+  SOURCES
+        expression.cpp function.cpp
+        functionlib.cpp invokeclass.cpp
+        kmdrmainwindow.cpp kommanderfunctions.cpp
+        kommanderwidget.cpp kommanderwindow.cpp
+        myprocess.cpp parsenode.cpp
+        parser.cpp parserdata.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${LIB_INSTALL_DIR}
+  
+  VERSION 0.0.0
+)
+
+
+##### headers
+
+install(
+    FILES kommanderwidget.h kommander_export.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 5805c58d..845cc905 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kmdrmainwindow.h"
 
 #include <tqtimer.h>
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 91be985d..cc1b57d3 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,7 +17,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KmdrMainWindow : public TDEMainWindow
+class KDE_EXPORT KmdrMainWindow : public TDEMainWindow
 {
 Q_OBJECT
   
diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt
new file mode 100644
index 00000000..d4bacb99
--- /dev/null
+++ b/kommander/widgets/CMakeLists.txt
@@ -0,0 +1,49 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidgets (shared)
+
+tde_add_library( kommanderwidgets SHARED AUTOMOC
+
+  SOURCES
+        aboutdialog.cpp buttongroup.cpp
+        checkbox.cpp closebutton.cpp
+        combobox.cpp datepicker.cpp dialog.cpp
+        execbutton.cpp fileselector.cpp
+        fontdialog.cpp groupbox.cpp
+        konsole.cpp label.cpp
+        lineedit.cpp listbox.cpp
+        pixmaplabel.cpp plugin.cpp
+        popupmenu.cpp progressbar.cpp
+        radiobutton.cpp richtexteditor.cpp
+        scriptobject.cpp slider.cpp
+        spinboxint.cpp statusbar.cpp
+        subdialog.cpp table.cpp
+        tabwidget.cpp textbrowser.cpp
+        textedit.cpp timer.cpp
+        toolbox.cpp treewidget.cpp
+        wizard.cpp
+  LINK
+     tdeio-shared
+     kommanderwidget-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${LIB_INSTALL_DIR}
+  
+  VERSION 0.0.0
+)
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index a9a8f77f..db473520 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqfile.h>
 #include "aboutdialog.h"
 
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index 440541c8..37dedec4 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -21,7 +21,7 @@ class TDEAboutData;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class AboutDialog : public TQLabel, public KommanderWidget
+class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 4f73cedc..242d4ba4 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -13,6 +13,15 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef KMDR_EXECUTOR_PATH
+#define KMDR_EXECUTOR_PATH "/usr/bin/kmdr-executor"
+#endif
+
 /* KDE INCLUDES */
 #include <tdelocale.h>
 
@@ -50,7 +59,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags
   setStates(states);
   setDisplayStates(states);
   m_useShebang = false;
-  m_shebang = "#!/usr/bin/kmdr-executor";
+  m_shebang = "#!" KMDR_EXECUTOR_PATH;
   m_firstShow = true;
   KommanderPlugin::setDefaultGroup(Group::DCOP);
   KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 419fc8d2..59a1e372 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "fontdialog.h"
 
 #include "kommanderplugin.h"
diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h
index c9e9e7ba..375e6cea 100644
--- a/kommander/widgets/fontdialog.h
+++ b/kommander/widgets/fontdialog.h
@@ -20,7 +20,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class FontDialog : public TQLabel, public KommanderWidget
+class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 343526ae..7a570dd3 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "popupmenu.h"
 #include "specials.h"
 
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index 7d691ff0..4bf073b8 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class PopupMenu : public TQLabel, public KommanderWidget
+class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index 6dfc8b89..4df6b78e 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "toolbox.h"
 #include "kommanderplugin.h"
 #include "specials.h"
diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h
index 1d253c90..b1563c13 100644
--- a/kommander/widgets/toolbox.h
+++ b/kommander/widgets/toolbox.h
@@ -18,7 +18,8 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class ToolBox : public TQToolBox, public KommanderWidget
+
+class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/working/CMakeLists.txt b/kommander/working/CMakeLists.txt
new file mode 100644
index 00000000..d03e032a
--- /dev/null
+++ b/kommander/working/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory( plugintemplate )
+
+install(
+    PROGRAMS kmdr2po extractkmdr
+    DESTINATION ${DATA_INSTALL_DIR}/kommander/translating
+)
diff --git a/kommander/working/plugintemplate/CMakeLists.txt b/kommander/working/plugintemplate/CMakeLists.txt
new file mode 100644
index 00000000..1d4f4aac
--- /dev/null
+++ b/kommander/working/plugintemplate/CMakeLists.txt
@@ -0,0 +1,17 @@
+##### other data
+
+install(
+    FILES kommanderplugin.png
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard
+)
+
+install(
+    FILES kommanderplugin.tdevtemplate
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates
+)
+
+tde_create_tarball(
+    TARGET kommanderplugin.tar.gz
+    FILES src-Makefile.am plugin.cpp widget.h widget.cpp app.tdevelop
+    DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard
+)