8 files changed, 67 insertions, 117 deletions
diff --git a/kttsd/plugins/command/CMakeLists.txt b/kttsd/plugins/command/CMakeLists.txt
new file mode 100644
index 0000000..6ecb4a6
--- /dev/null
+++ b/kttsd/plugins/command/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_commandplugin (kpart)
+
+tde_add_kpart( libkttsd_commandplugin AUTOMOC
+
+  SOURCES
+        commandconfwidget.ui
+        commandconf.cpp
+        commandproc.cpp
+        commandplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_commandplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR kttsd-desktops
+)
diff --git a/kttsd/plugins/command/README b/kttsd/plugins/command/README
index fbba4f8..5bfafa4 100644
--- a/kttsd/plugins/command/README
+++ b/kttsd/plugins/command/README
@@ -4,5 +4,5 @@ This plug in is developed and maintained by Gunnar Schmi Dt.
 If you intend to edit the GUI (commandconfwidget.ui) you will have to first
 copy kttsd/libkttsd/pluginconf.h to a standard include directory
 like $TDEDIR/include/ since the interface has been tweaked to derive
-from PlugInConf instead of QWidget and Qt Designer refuses to open it
+from PlugInConf instead of TQWidget and Qt Designer refuses to open it
 if the header is not properly placed.
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 6fc2792..2144b52 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -60,16 +60,16 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
     m_widget->characterCodingBox->insertStringList(m_codecList);
 
     defaults();
-    connect(m_widget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)),
-        this, TQT_SLOT(configChanged()));
-    connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)),
-        this, TQT_SLOT(configChanged()));
-    connect(m_widget->stdInButton, TQT_SIGNAL(toggled(bool)),
-        this, TQT_SLOT(configChanged()));
-    connect(m_widget->urlReq, TQT_SIGNAL(textChanged(const TQString&)),
-        this, TQT_SLOT(configChanged()));
-    connect(m_widget->commandTestButton, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotCommandTest_clicked()));
+    connect(m_widget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)),
+        this, TQ_SLOT(configChanged()));
+    connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)),
+        this, TQ_SLOT(configChanged()));
+    connect(m_widget->stdInButton, TQ_SIGNAL(toggled(bool)),
+        this, TQ_SLOT(configChanged()));
+    connect(m_widget->urlReq, TQ_SIGNAL(textChanged(const TQString&)),
+        this, TQ_SLOT(configChanged()));
+    connect(m_widget->commandTestButton, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotCommandTest_clicked()));
 }
 
 /** Destructor */
@@ -147,7 +147,7 @@ void CommandConf::slotCommandTest_clicked()
     else
     {
         m_commandProc = new CommandProc();
-        connect (m_commandProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped()));
+        connect (m_commandProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped()));
     }
 
     // Create a temp file name for the wave file.
@@ -167,7 +167,7 @@ void CommandConf::slotCommandTest_clicked()
     m_progressDlg->setAllowCancel(true);
 
     // TODO: Do codec names contain non-ASCII characters?
-    connect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished()));
+    connect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished()));
     m_commandProc->synth(
         testMsg,
         tmpWaveFile,
@@ -179,7 +179,7 @@ void CommandConf::slotCommandTest_clicked()
     // Display progress dialog modally.  Processing continues when plugin signals synthFinished,
     // or if user clicks Cancel button.
     m_progressDlg->exec();
-    disconnect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished()));
+    disconnect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished()));
     if (m_progressDlg->wasCancelled()) m_commandProc->stopText();
     delete m_progressDlg;
     m_progressDlg = 0;
diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h
index 11f8b9b..8c22717 100644
--- a/kttsd/plugins/command/commandconf.h
+++ b/kttsd/plugins/command/commandconf.h
@@ -35,7 +35,7 @@ class CommandProc;
 class KProgressDialog;
 
 class CommandConf : public PlugInConf {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 75ce080..8491898 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -214,14 +214,8 @@
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>configurationChanged()</signal>
-</Q_SIGNALS>
+</signals>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index 1be0d2d..e0f04ec 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -290,14 +290,14 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
     m_commandProc->setEnvironment("LANG", language + "." + codec->mimeName());
     m_commandProc->setEnvironment("LC_CTYPE", language + "." + codec->mimeName());
     *m_commandProc << command;
-    connect(m_commandProc, TQT_SIGNAL(processExited(TDEProcess*)),
-        this, TQT_SLOT(slotProcessExited(TDEProcess*)));
-    connect(m_commandProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-        this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
-    connect(m_commandProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-        this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
-    connect(m_commandProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
-        this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
+    connect(m_commandProc, TQ_SIGNAL(processExited(TDEProcess*)),
+        this, TQ_SLOT(slotProcessExited(TDEProcess*)));
+    connect(m_commandProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+        this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(m_commandProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+        this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
+    connect(m_commandProc, TQ_SIGNAL(wroteStdin(TDEProcess*)),
+        this, TQ_SLOT(slotWroteStdin(TDEProcess* )));
 
     // 4. start the process
 
diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h
index 1ffe7ee..f476a1b 100644
--- a/kttsd/plugins/command/commandproc.h
+++ b/kttsd/plugins/command/commandproc.h
@@ -28,7 +28,7 @@ class TDEProcess;
 class TQTextCodec;
 
 class CommandProc : public PlugInProc{
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/kttsd/plugins/command/kttsd_commandplugin.desktop b/kttsd/plugins/command/kttsd_commandplugin.desktop
index 2b2e1a9..1017c14 100644
--- a/kttsd/plugins/command/kttsd_commandplugin.desktop
+++ b/kttsd/plugins/command/kttsd_commandplugin.desktop
@@ -1,91 +1,8 @@
 [Desktop Entry]
 Name=Command
-Name[br]=Urzhiad
-Name[bs]=Naredba
-Name[ca]=Odre
-Name[cs]=Příkaz
-Name[cy]=Gorchymyn
-Name[da]=Kommando
-Name[de]=Befehl
-Name[el]=Εντολή
-Name[es]=Orden
-Name[et]=Käsk
-Name[fa]=فرمان
-Name[fi]=Komento
-Name[fr]=Commande
-Name[ga]=Ordú
-Name[gl]=Comando
-Name[he]=פקודה
-Name[hu]=Parancs
-Name[is]=Skipun
-Name[it]=Comando
-Name[ja]=コマンド
-Name[ka]=ბრძანება
-Name[km]=ពាក្យបញ្ជា
-Name[mk]=Командна линија
-Name[ms]=Arahan
-Name[nb]=Kommando
-Name[nds]=Befehl
-Name[ne]=आदेश
-Name[pa]=ਕਮਾਂਡ
-Name[pl]=Polecenie
-Name[pt]=Comando
-Name[ru]=Командная строка
-Name[sk]=Príkaz
-Name[sl]=Ukaz
-Name[sr]=Наредба
-Name[sr@Latn]=Naredba
-Name[sv]=Kommando
-Name[ta]=கட்டளை
-Name[tg]=Сатри фармоишӣ 
-Name[tr]=Komut
-Name[uk]=Команда
-Name[vi]=Ra lệnh
-Name[zh_TW]=命令
+
 Comment=Generic speech synthesizer from command line
-Comment[bg]=Общ синтезатор на глас от командния ред
-Comment[bs]=Generalna sinteza govora sa komandne linije
-Comment[ca]=Sintetitzador de veu genèric de línia d'ordres
-Comment[cs]=Hlasový syntetizátor pro příkazovou řádku
-Comment[da]=Generisk tale-synthesizer fra kommandolinjen
-Comment[de]=Generischer Sprachsynthesizer in der Befehlszeile
-Comment[el]=Γενικός συνθέτης ομιλίας για τη γραμμή εντολών
-Comment[es]=Sintetizador genérico de texto a voz para la línea de órdenes
-Comment[et]=Üldine käsurea-kõnesüntesaator
-Comment[eu]=Komando-lerroko hizketa-sintetizadore generikoa
-Comment[fa]=ترکیب‌دهندۀ گفتار عمومی از خط فرمان
-Comment[fi]=Yleinen komentorivipohjainen puhesyntetisaattori
-Comment[fr]=Synthèse vocale générique en ligne de commande
-Comment[ga]=Sintéiseoir cainte ginearálta ó líne na n-orduithe
-Comment[gl]=Sintetizados de fala xenérico para a liña de comandos
-Comment[hu]=Parancssoros kezelőprogram szövegfelolvasáshoz
-Comment[is]=Almennur talgerfill frá skipanalínu
-Comment[it]=Sintetizzatore vocale generico dalla riga di comando
-Comment[ja]=コマンドラインからの汎用スピーチシンセサイザ
-Comment[ka]=საზოგადო ხმის სინქრონიზატორი ბრძანების ველიდან
-Comment[km]=កម្មវិធីសង្គ្រោះការនិយាយទូទៅពីបន្ទាត់ពាក្យបញ្ជា
-Comment[mk]=Синтисајзер на општ говор од командната линија
-Comment[ms]=Pensintesis tutur generik dari baris arahan
-Comment[nb]=Generisk talesyntetisering fra kommandolinje
-Comment[nds]=Blicksnuut för de Befehlsreeg
-Comment[ne]=आदेश रेखाबाट जेनेरिक संवाद सिन्थेसाइजर
-Comment[nl]=Generieke spraaksynthesizer voor de commandoregel
-Comment[pa]=ਕਮਾਂਡ ਲਾਈਨ ਤੋਂ ਸਧਾਰਨ ਬੋਲੀ ਸੰਸਲੇਸ਼ਕ
-Comment[pl]=Program syntezatora mowy uruchamiany z linii poleceń
-Comment[pt]=Sintetizador de fala genérico através de uma linha de comandos
-Comment[pt_BR]=Interface de linha de comando para o sintetizador de fala genérico
-Comment[ru]=Консольный интерфейс к движкам синтеза речи
-Comment[sk]=Všeobecný syntetizátor reči z príkazového riadka
-Comment[sl]=Generični sintetizator govora iz ukazne vrstice
-Comment[sr]=Генерички синтетизатор говора из командне линије
-Comment[sr@Latn]=Generički sintetizator govora iz komandne linije
-Comment[sv]=Generell talsyntes från kommandoraden
-Comment[ta]=கட்டளை வரியில் இருந்து பொது பேச்சு கூட்டிணைப்பாளர்
-Comment[tg]=Консоли интерфейс ба микшерҳо барои таҳлили овоз
-Comment[tr]=Komut satırından genel konuşma bireştirici
-Comment[uk]=Загальний синтезатор мовлення з командного рядка
-Comment[vi]=Tổng hợp giọng nói chung cho việc ra lệnh
-Comment[zh_TW]=從命令列的一般語音合成器
+
 Type=Service
 X-TDE-ServiceTypes=KTTSD/SynthPlugin
 X-TDE-Library=libkttsd_commandplugin