summaryrefslogtreecommitdiffstats
path: root/kttsd/libkttsd
diff options
context:
space:
mode:
Diffstat (limited to 'kttsd/libkttsd')
-rw-r--r--kttsd/libkttsd/CMakeLists.txt48
-rw-r--r--kttsd/libkttsd/filterconf.cpp2
-rw-r--r--kttsd/libkttsd/filterconf.h8
-rw-r--r--kttsd/libkttsd/filterproc.cpp2
-rw-r--r--kttsd/libkttsd/filterproc.h8
-rw-r--r--kttsd/libkttsd/kdeexportfix.h8
-rw-r--r--kttsd/libkttsd/kttsd_synthplugin.desktop2
-rw-r--r--kttsd/libkttsd/notify.cpp2
-rw-r--r--kttsd/libkttsd/notify.h10
-rw-r--r--kttsd/libkttsd/player.h6
-rw-r--r--kttsd/libkttsd/pluginconf.cpp4
-rw-r--r--kttsd/libkttsd/pluginconf.h8
-rw-r--r--kttsd/libkttsd/pluginproc.cpp4
-rw-r--r--kttsd/libkttsd/pluginproc.h10
-rw-r--r--kttsd/libkttsd/selecttalkerdlg.cpp62
-rw-r--r--kttsd/libkttsd/selecttalkerdlg.h8
-rw-r--r--kttsd/libkttsd/selecttalkerwidget.ui30
-rw-r--r--kttsd/libkttsd/stretcher.cpp8
-rw-r--r--kttsd/libkttsd/stretcher.h8
-rw-r--r--kttsd/libkttsd/talkercode.cpp2
-rw-r--r--kttsd/libkttsd/talkercode.h6
-rw-r--r--kttsd/libkttsd/testplayer.cpp7
-rw-r--r--kttsd/libkttsd/testplayer.h6
-rw-r--r--kttsd/libkttsd/utils.h4
24 files changed, 147 insertions, 116 deletions
diff --git a/kttsd/libkttsd/CMakeLists.txt b/kttsd/libkttsd/CMakeLists.txt
new file mode 100644
index 0000000..ae5c19c
--- /dev/null
+++ b/kttsd/libkttsd/CMakeLists.txt
@@ -0,0 +1,48 @@
+
+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}
+ PO_DIR kttsd-desktops
+)
diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp
index e0a7b23..3013b24 100644
--- a/kttsd/libkttsd/filterconf.cpp
+++ b/kttsd/libkttsd/filterconf.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Filter Configuration class.
This is the interface definition for text filter configuration dialogs.
-------------------
diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h
index 13e9b51..2b9fbcc 100644
--- a/kttsd/libkttsd/filterconf.h
+++ b/kttsd/libkttsd/filterconf.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Filter Configuration class.
This is the interface definition for text filter configuration dialogs.
-------------------
@@ -31,11 +31,11 @@
// KDE includes.
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
-class KDE_EXPORT KttsFilterConf : public TQWidget{
- Q_OBJECT
+class TDE_EXPORT KttsFilterConf : public TQWidget{
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp
index 0847879..4022e02 100644
--- a/kttsd/libkttsd/filterproc.cpp
+++ b/kttsd/libkttsd/filterproc.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Filter Processing class.
This is the interface definition for text filters.
-------------------
diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h
index 73b1566..3e7ce5d 100644
--- a/kttsd/libkttsd/filterproc.h
+++ b/kttsd/libkttsd/filterproc.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Filter Processing class.
This is the interface definition for text filters.
-------------------
@@ -30,15 +30,15 @@
#include <tqstringlist.h>
// KDE includes.
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
class TalkerCode;
class TDEConfig;
-class KDE_EXPORT KttsFilterProc : virtual public TQObject
+class TDE_EXPORT KttsFilterProc : virtual public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/kdeexportfix.h b/kttsd/libkttsd/kdeexportfix.h
index 27811f6..c4f53b6 100644
--- a/kttsd/libkttsd/kdeexportfix.h
+++ b/kttsd/libkttsd/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>
@@ -20,8 +20,8 @@
#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
#endif // _KDEEXPORTFIX_H_
diff --git a/kttsd/libkttsd/kttsd_synthplugin.desktop b/kttsd/libkttsd/kttsd_synthplugin.desktop
index 1d185ee..46583cd 100644
--- a/kttsd/libkttsd/kttsd_synthplugin.desktop
+++ b/kttsd/libkttsd/kttsd_synthplugin.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=KTTSD
-Name[zh_TW]=KTTSd
+
Type=ServiceType
X-TDE-ServiceType=KTTSD/SynthPlugin
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index 90166b1..9b1cfd5 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Notification Action constants and utility functions.
-------------------
Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net>
diff --git a/kttsd/libkttsd/notify.h b/kttsd/libkttsd/notify.h
index 7c5545a..a105c7d 100644
--- a/kttsd/libkttsd/notify.h
+++ b/kttsd/libkttsd/notify.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Notification Action constants and utility functions.
-------------------
Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net>
@@ -18,11 +18,11 @@
#ifndef _NOTIFYACTION_H
#define _NOTIFYACTION_H
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQString;
-class KDE_EXPORT NotifyAction
+class TDE_EXPORT NotifyAction
{
public:
@@ -44,7 +44,7 @@ public:
// --------------------------------------------------------------------
-class KDE_EXPORT NotifyPresent
+class TDE_EXPORT NotifyPresent
{
public:
@@ -67,7 +67,7 @@ public:
// --------------------------------------------------------------------
-class KDE_EXPORT NotifyEvent
+class TDE_EXPORT NotifyEvent
{
public:
diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h
index 28c2591..8bbb741 100644
--- a/kttsd/libkttsd/player.h
+++ b/kttsd/libkttsd/player.h
@@ -18,16 +18,16 @@
#include <tqobject.h>
#include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
#include "tdeglobal.h"
#include "tdelocale.h"
// #include "filehandle.h"
-class KDE_EXPORT Player : virtual public TQObject
+class TDE_EXPORT Player : virtual public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp
index 03420ff..f2404c3 100644
--- a/kttsd/libkttsd/pluginconf.cpp
+++ b/kttsd/libkttsd/pluginconf.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
This file is the templates for the configuration plug ins.
-------------------
Copyright : (C) 2002-2003 by José Pablo Ezequiel "Pupeno" Fernández
@@ -27,7 +27,7 @@
// KDE includes.
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
// PluginConf includes.
#include "pluginconf.h"
diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h
index e8e1516..039a19b 100644
--- a/kttsd/libkttsd/pluginconf.h
+++ b/kttsd/libkttsd/pluginconf.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
This file is the template for the configuration plug ins.
-------------------
Copyright : (C) 2002-2003 by José Pablo Ezequiel "Pupeno" Fernández
@@ -24,7 +24,7 @@
// KDE includes.
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
// KTTS includes.
@@ -207,8 +207,8 @@
* order to synthesize speech.
*/
-class KDE_EXPORT PlugInConf : public TQWidget{
- Q_OBJECT
+class TDE_EXPORT PlugInConf : public TQWidget{
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index ec86a2a..ac2931f 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
This file is the template for the processing plug ins.
-------------------
Copyright : (C) 2002-2003 by José Pablo Ezequiel "Pupeno" Fernández
@@ -21,7 +21,7 @@
// KDE includes.
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
// PlugInProc includes.
diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h
index e05ab02..473fdd0 100644
--- a/kttsd/libkttsd/pluginproc.h
+++ b/kttsd/libkttsd/pluginproc.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
This file is the template for the processing plug ins.
-------------------
Copyright : (C) 2002-2003 by José Pablo Ezequiel "Pupeno" Fernández
@@ -21,7 +21,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
#include <tdeconfig.h>
@@ -112,7 +112,7 @@
* If @ref supportsAsync returns False, KTTSD will run the plugin in a separate
* TQThread. As a consequence, the plugin must not make use of the KDE Library,
* when @ref sayText or @ref synthText is called,
-* with the exception of TDEProcess and family (KProcIO, KShellProcess).
+* with the exception of TDEProcess and family (TDEProcIO, KShellProcess).
* This restriction comes about because the KDE Libraries make use of the
* main TQt event loop, which unfortunately, runs only in the main thread.
* This restriction will likely be lifted in TQt 4 and later.
@@ -227,8 +227,8 @@ enum pluginState
psFinished = 3 /**< Plugin has finished synthesizing. Audio file is ready. */
};
-class KDE_EXPORT PlugInProc : virtual public TQObject{
- Q_OBJECT
+class TDE_EXPORT PlugInProc : virtual public TQObject{
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index 8809331..c5a33f3 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Description:
A dialog for user to select a Talker, either by specifying
selected Talker attributes, or by specifying all attributes
@@ -111,36 +111,36 @@ SelectTalkerDlg::SelectTalkerDlg(
applyTalkerCodeToControls();
enableDisableControls();
- connect(m_widget->useDefaultRadioButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->useClosestMatchRadioButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->useSpecificTalkerRadioButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(configChanged()));
-
- connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotLanguageBrowseButton_clicked()));
-
- connect(m_widget->synthComboBox, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->genderComboBox, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->volumeComboBox, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->rateComboBox, TQT_SIGNAL(activated(const TQString&)),
- this, TQT_SLOT(configChanged()));
-
- connect(m_widget->synthCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->genderCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->volumeCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(configChanged()));
- connect(m_widget->rateCheckBox, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(configChanged()));
-
- connect(m_widget->talkersListView, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotTalkersListView_selectionChanged()));
+ connect(m_widget->useDefaultRadioButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->useClosestMatchRadioButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->useSpecificTalkerRadioButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(configChanged()));
+
+ connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotLanguageBrowseButton_clicked()));
+
+ connect(m_widget->synthComboBox, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->genderComboBox, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->volumeComboBox, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->rateComboBox, TQ_SIGNAL(activated(const TQString&)),
+ this, TQ_SLOT(configChanged()));
+
+ connect(m_widget->synthCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->genderCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->volumeCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(configChanged()));
+ connect(m_widget->rateCheckBox, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(configChanged()));
+
+ connect(m_widget->talkersListView, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotTalkersListView_selectionChanged()));
m_widget->talkersListView->setMinimumHeight( 120 );
}
diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h
index e656be5..d9fe825 100644
--- a/kttsd/libkttsd/selecttalkerdlg.h
+++ b/kttsd/libkttsd/selecttalkerdlg.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Description:
A dialog for user to select a Talker, either by specifying
selected Talker attributes, or by specifying all attributes
@@ -33,15 +33,15 @@
// KDE includes.
#include <kdialogbase.h>
#include <tdelocale.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
// KTTS includes.
#include "talkercode.h"
#include "selecttalkerwidget.h"
-class KDE_EXPORT SelectTalkerDlg : public KDialogBase
+class TDE_EXPORT SelectTalkerDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index f2b8f00..d697a5c 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -170,9 +170,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -218,9 +215,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -283,9 +277,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -331,9 +322,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -403,9 +391,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -560,13 +545,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/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index ccb621d..8930114 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Description:
Speeds up or slows down an audio file by stretching the audio stream.
Uses the sox program to do the stretching.
@@ -24,7 +24,7 @@
******************************************************************************/
// KDE includes.
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
// Stretcher includes.
@@ -63,8 +63,8 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
m_stretchProc = new TDEProcess;
TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
*m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
- connect(m_stretchProc, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(slotProcessExited(TDEProcess*)));
+ connect(m_stretchProc, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(slotProcessExited(TDEProcess*)));
if (!m_stretchProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication))
{
kdDebug() << "Stretcher::stretch: Error starting audio stretcher process. Is sox installed?" << endl;
diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h
index ca4e1a7..7c07f25 100644
--- a/kttsd/libkttsd/stretcher.h
+++ b/kttsd/libkttsd/stretcher.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Description:
Speeds up or slows down an audio file by stretching the audio stream.
Uses the sox program to do the stretching.
@@ -26,13 +26,13 @@
#ifndef _STRETCHER_H_
#define _STRETCHER_H_
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
class TDEProcess;
-class KDE_EXPORT Stretcher : public TQObject{
- Q_OBJECT
+class TDE_EXPORT Stretcher : public TQObject{
+ TQ_OBJECT
public:
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index f53311d..4983271 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Convenience object for manipulating Talker Codes.
For an explanation of what a Talker Code is, see kspeech.h.
-------------------
diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h
index fe6830b..7b8e6f6 100644
--- a/kttsd/libkttsd/talkercode.h
+++ b/kttsd/libkttsd/talkercode.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Object containing a Talker Code and providing convenience
functions for manipulating Talker Codes.
For an explanation of what a Talker Code is, see speech.h.
@@ -28,11 +28,11 @@
// TQt includes.
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
#include <tqvaluelist.h>
-class KDE_EXPORT TalkerCode
+class TDE_EXPORT TalkerCode
{
public:
/**
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 80d8b90..a95470f 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Player Object for playing synthesized audio files. Plays them
synchronously.
-------------------
@@ -28,7 +28,7 @@
// KDE includes.
#include <tdeapplication.h>
#include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kdebug.h>
@@ -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"
diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h
index b11d6cb..04cd654 100644
--- a/kttsd/libkttsd/testplayer.h
+++ b/kttsd/libkttsd/testplayer.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
Player Object for playing synthesized audio files. Plays them
synchronously.
-------------------
@@ -25,7 +25,7 @@
#ifndef _TESTPLAYER_H_
#define _TESTPLAYER_H_
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
class Player;
@@ -33,7 +33,7 @@ class Stretcher;
// TODO: Make this work asynchronously.
-class KDE_EXPORT TestPlayer : public TQObject{
+class TDE_EXPORT TestPlayer : public TQObject{
public:
/**
* Constructor.
diff --git a/kttsd/libkttsd/utils.h b/kttsd/libkttsd/utils.h
index 61711db..a9de3e7 100644
--- a/kttsd/libkttsd/utils.h
+++ b/kttsd/libkttsd/utils.h
@@ -18,13 +18,13 @@
#ifndef UTILS_H
#define UTILS_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kdeexportfix.h"
class TQString;
class TQComboBox;
-class KDE_EXPORT KttsUtils {
+class TDE_EXPORT KttsUtils {
public:
/// Constructor