From 6b3181cf92f1fc74da1e8a82f690a1526cb4e900 Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Sun, 29 Mar 2020 19:41:28 +0200
Subject: Conversion to the cmake building system. Added several man pages
 taken from the Debian packaging. Cleanup headers in ui files. Add png icons
 for mono theme.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

cmake:
- Use tde_add_check_executable instead of a combination
of separate calls to tde_add_executable and add_test.
- Simplify the detection of time.h and sys/time.h headers.
- Refactor phrasebook files install, kmouth.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 kttsd/libkttsd/CMakeLists.txt        | 47 ++++++++++++++++++++++++++++++++++++
 kttsd/libkttsd/selecttalkerwidget.ui | 15 +++++-------
 kttsd/libkttsd/testplayer.cpp        |  3 ++-
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 kttsd/libkttsd/CMakeLists.txt

(limited to 'kttsd/libkttsd')

diff --git a/kttsd/libkttsd/CMakeLists.txt b/kttsd/libkttsd/CMakeLists.txt
new file mode 100644
index 0000000..106e2fd
--- /dev/null
+++ b/kttsd/libkttsd/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### kttsd (shared)
+
+tde_add_library( kttsd SHARED AUTOMOC
+
+  SOURCES
+        selecttalkerwidget.ui
+        pluginproc.cpp
+        pluginconf.cpp
+        testplayer.cpp
+        stretcher.cpp
+        talkercode.cpp
+        filterproc.cpp
+        filterconf.cpp
+        utils.cpp
+        selecttalkerdlg.cpp
+        notify.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+
+  VERSION 1.0.0
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_synthplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index f2b8f00..b250f4a 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -560,13 +560,10 @@
     <tabstop>talkersListView</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index b9aaecd..3688667 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -174,7 +174,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
                     offers[0]->library().latin1(), this, offers[0]->library().latin1());
         else
             kdDebug() << "TestPlayer::createPlayerObject: Could not create factory." << endl;
-    }
+    } 
     if (player == 0)
         kdDebug() << "TestPlayer::createPlayerObject: Could not load " + plugInName +
             ".  Is TDEDIRS set correctly?" << endl;
@@ -207,3 +207,4 @@ TQString TestPlayer::makeSuggestedFilename()
     return PlugInConf::realFilePath(waveFile);
 }
 
+#include "player.moc"
-- 
cgit v1.2.3