8 files changed, 52 insertions, 18 deletions
diff --git a/ksayit/KTTSD_Lib/CMakeLists.txt b/ksayit/KTTSD_Lib/CMakeLists.txt
new file mode 100644
index 0000000..511c22d
--- /dev/null
+++ b/ksayit/KTTSD_Lib/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### KTTSD_Lib (shared)
+
+tde_add_library( KTTSD_Lib SHARED AUTOMOC
+
+  SOURCES
+        KTTSDlibSetup.ui
+        kttsdlib.cpp
+        kttsdlibsetupimpl.cpp
+        kttsdlibtalker2.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+     kspeech_stub-static
+
+  VERSION 0.0.1
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
index 395ad86..fc35ff5 100644
--- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
+++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
@@ -114,8 +114,8 @@
         <slot>slotLaunchControlcenter()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">slotLaunchControlcenter()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h
index a30f3d5..8ec6f7b 100644
--- a/ksayit/KTTSD_Lib/kdeexportfix.h
+++ b/ksayit/KTTSD_Lib/kdeexportfix.h
@@ -1,5 +1,5 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
-  tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro.  This file fixes this
+/*
+  tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro.  This file fixes this
   by undefining it.
   -------------------
   Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net>
@@ -17,6 +17,6 @@
 
 #include <tdeversion.h>
 #if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
-#undef KDE_EXPORT
-#define KDE_EXPORT
+#undef TDE_EXPORT
+#define TDE_EXPORT
 #endif
diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index 32e66e4..31be41d 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -32,12 +32,12 @@ KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl)
 {
     TDEGlobal::locale()->insertCatalogue("libKTTSD");
     m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker");
-    connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)),
-        this, TQT_SLOT(slotTextFinished(const uint)) );
-    connect(m_talker, TQT_SIGNAL(signalTextStopped(const uint)),
-        this, TQT_SLOT(slotTextStopped(const uint)) );
-    connect(m_talker, TQT_SIGNAL(signalTextStarted(const uint)),
-        this, TQT_SLOT(slotTextStarted(const uint)) );
+    connect(m_talker, TQ_SIGNAL(signalTextFinished(const uint)),
+        this, TQ_SLOT(slotTextFinished(const uint)) );
+    connect(m_talker, TQ_SIGNAL(signalTextStopped(const uint)),
+        this, TQ_SLOT(slotTextStopped(const uint)) );
+    connect(m_talker, TQ_SIGNAL(signalTextStarted(const uint)),
+        this, TQ_SLOT(slotTextStarted(const uint)) );
     
     // reset list of currently processed jobs
     while ( !jobList.empty() ){
diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h
index 73e7240..1a8782f 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.h
+++ b/ksayit/KTTSD_Lib/kttsdlib.h
@@ -45,9 +45,9 @@ class kttsdlibtalker2;
 /**
 @author Robert Vogl
 */
-class KDE_EXPORT KTTSDLib : public TQObject
+class TDE_EXPORT KTTSDLib : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 signals:
     /** Emitted when the plugin has been finished speeking.
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
index 1dc4196..7228768 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
@@ -55,8 +55,8 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
 
     // invoke the Control Center Module
     TDEProcess *kcmproc = new TDEProcess();
-    connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)),
-                    this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) );
+    connect(kcmproc, TQ_SIGNAL(processExited(TDEProcess*)),
+                    this, TQ_SLOT(slotKCMProcessExited(TDEProcess*)) );
     (*kcmproc) << "tdecmshell";
     (*kcmproc) << "kcmkttsd";
     kcmproc->start(TDEProcess::NotifyOnExit);
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
index c2b4add..7b1df15 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
@@ -25,7 +25,7 @@
 */
 class KTTSDlibSetupImpl : public KTTSDlibSetup
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     KTTSDlibSetupImpl(TQWidget *parent = 0, const char *name = 0);
diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
index fe33161..641b26e 100644
--- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h
+++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h
@@ -28,7 +28,7 @@
 */
 class kttsdlibtalker2 : public TQObject, public KSpeech_stub, virtual public KSpeechSink
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 signals: