4 files changed, 93 insertions, 37 deletions
diff --git a/kttsd/kcmkttsmgr/CMakeLists.txt b/kttsd/kcmkttsmgr/CMakeLists.txt
new file mode 100644
index 0000000..7c323aa
--- /dev/null
+++ b/kttsd/kcmkttsmgr/CMakeLists.txt
@@ -0,0 +1,78 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+##### kcmkttsmgr_kspeech
+
+set( KSPEECH_KIDL kspeech.kidl )
+set( KSPEECH_STUB kspeech_stub )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeech.h > ${KSPEECH_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeech.h
+)
+add_custom_target( kcmkttsmgr-kspeech-kidl DEPENDS ${KSPEECH_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_STUB}.h ${KSPEECH_STUB}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECH_KIDL}
+    DEPENDS ${KSPEECH_KIDL}
+)
+add_custom_target( kcmkttsmgr-kspeech-stub DEPENDS kspeech_stub.h kspeech_stub.cpp )
+
+
+###### kcmkttsmgr_kspeechsink
+
+set( KSPEECHSINK_KIDL kspeechsink.kidl )
+set( KSPEECHSINK_SKEL kspeechsink_skel )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeechsink.h > ${KSPEECHSINK_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeechsink.h
+)
+add_custom_target( kcmkttsmgr-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECHSINK_KIDL}
+    DEPENDS ${KSPEECHSINK_KIDL}
+)
+add_custom_target( kcmkttsmgr-kspeechsink-stub DEPENDS kspeech_stub.h kspeech_stub.cpp )
+
+
+##### libkcm_kttsd (kpart)
+
+tde_add_kpart( libkcm_kttsd MODULE AUTOMOC
+
+  SOURCES
+        kcmkttsmgrwidget.ui
+        addtalkerwidget.ui
+        selecteventwidget.ui
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_STUB}.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECHSINK_SKEL}.cpp
+        kcmkttsmgr.cpp
+        addtalker.cpp
+        selectevent.cpp
+  LINK
+     tdeio-shared
+     kttsd-shared
+     
+  DEPENDENCIES
+     kcmkttsmgr-kspeech-stub
+     kcmkttsmgr-kspeechsink-stub
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index ae48c61..4597a90 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -253,8 +253,7 @@
     <tabstop>languageRadioButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 0a4307c..f9dc7bc 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1895,34 +1895,13 @@
     <slot access="private">slotConfigChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>tdecmodule.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdecmodule.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index 3d4281f..14df075 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -56,7 +56,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>