diff options
Diffstat (limited to 'kttsd/libkttsd')
-rw-r--r-- | kttsd/libkttsd/CMakeLists.txt | 48 | ||||
-rw-r--r-- | kttsd/libkttsd/filterconf.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/filterproc.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/kdeexportfix.h | 6 | ||||
-rw-r--r-- | kttsd/libkttsd/kttsd_synthplugin.desktop | 2 | ||||
-rw-r--r-- | kttsd/libkttsd/notify.h | 6 | ||||
-rw-r--r-- | kttsd/libkttsd/player.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/pluginconf.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/pluginproc.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/selecttalkerdlg.cpp | 60 | ||||
-rw-r--r-- | kttsd/libkttsd/selecttalkerdlg.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/selecttalkerwidget.ui | 30 | ||||
-rw-r--r-- | kttsd/libkttsd/stretcher.cpp | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/stretcher.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/talkercode.h | 2 | ||||
-rw-r--r-- | kttsd/libkttsd/testplayer.cpp | 3 | ||||
-rw-r--r-- | kttsd/libkttsd/testplayer.h | 2 | ||||
-rw-r--r-- | kttsd/libkttsd/utils.h | 2 |
18 files changed, 112 insertions, 81 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.h b/kttsd/libkttsd/filterconf.h index 2d66fdc..6f99b45 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -34,8 +34,8 @@ #include <kdemacros.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.h b/kttsd/libkttsd/filterproc.h index 78d4d9d..2f08a0a 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -36,9 +36,9 @@ 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 fe4a60b..c4f53b6 100644 --- a/kttsd/libkttsd/kdeexportfix.h +++ b/kttsd/libkttsd/kdeexportfix.h @@ -1,5 +1,5 @@ /* - 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.h b/kttsd/libkttsd/notify.h index b4a9c92..c184659 100644 --- a/kttsd/libkttsd/notify.h +++ b/kttsd/libkttsd/notify.h @@ -22,7 +22,7 @@ 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..358ee0f 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -25,9 +25,9 @@ // #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.h b/kttsd/libkttsd/pluginconf.h index 07d672a..97055c8 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -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.h b/kttsd/libkttsd/pluginproc.h index 405e5d7..b695f20 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -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 bdab6d6..c5a33f3 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -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 fd4f2a0..bf80cb1 100644 --- a/kttsd/libkttsd/selecttalkerdlg.h +++ b/kttsd/libkttsd/selecttalkerdlg.h @@ -39,9 +39,9 @@ #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 c6c50e5..ccc3565 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -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 1eb3bd6..ac278ea 100644 --- a/kttsd/libkttsd/stretcher.h +++ b/kttsd/libkttsd/stretcher.h @@ -31,8 +31,8 @@ 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.h b/kttsd/libkttsd/talkercode.h index 85af2be..6904a00 100644 --- a/kttsd/libkttsd/talkercode.h +++ b/kttsd/libkttsd/talkercode.h @@ -32,7 +32,7 @@ #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 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" diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h index 18e6047..fe203f2 100644 --- a/kttsd/libkttsd/testplayer.h +++ b/kttsd/libkttsd/testplayer.h @@ -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..6b3a6c4 100644 --- a/kttsd/libkttsd/utils.h +++ b/kttsd/libkttsd/utils.h @@ -24,7 +24,7 @@ class TQString; class TQComboBox; -class KDE_EXPORT KttsUtils { +class TDE_EXPORT KttsUtils { public: /// Constructor |