8 files changed, 85 insertions, 94 deletions
diff --git a/kttsd/plugins/hadifix/CMakeLists.txt b/kttsd/plugins/hadifix/CMakeLists.txt
new file mode 100644
index 0000000..74398d5
--- /dev/null
+++ b/kttsd/plugins/hadifix/CMakeLists.txt
@@ -0,0 +1,46 @@
+
+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_hadifixplugin (kpart)
+
+tde_add_kpart( libkttsd_hadifixplugin AUTOMOC
+
+  SOURCES
+        hadifixconfigui.ui
+        voicefileui.ui
+        hadifixconf.cpp
+        hadifixproc.cpp
+        hadifixplugin.cpp
+  LINK
+     tdecore-shared
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_hadifixplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR kttsd-desktops
+)
+
+install(
+    FILES SSMLtoTxt2pho.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/hadifix/xslt
+)
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 9b86384..3b30295 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -32,7 +32,7 @@
 #include <tdelocale.h>
 #include <kdialog.h>
 #include <kcombobox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
@@ -215,12 +215,12 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList
    TQString file = locate("data", "LICENSES/LGPL_V2");
    i18n("This plugin is distributed under the terms of the GPL v2 or later.");
    
-   connect(d->configWidget->voiceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(voiceButton_clicked()));
-   connect(d->configWidget->testButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(testButton_clicked()));
-   connect(d->configWidget, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(configChanged (bool)));
-   connect(d->configWidget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)),
-        this, TQT_SLOT(configChanged()));
-   connect(d->configWidget->voiceCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(voiceCombo_activated(int)));
+   connect(d->configWidget->voiceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(voiceButton_clicked()));
+   connect(d->configWidget->testButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(testButton_clicked()));
+   connect(d->configWidget, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(configChanged (bool)));
+   connect(d->configWidget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)),
+        this, TQ_SLOT(configChanged()));
+   connect(d->configWidget->voiceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(voiceCombo_activated(int)));
    d->initializeCharacterCodes();
    d->initializeVoices();
    d->setDefaults();
@@ -330,7 +330,7 @@ void HadifixConf::testButton_clicked () {
    else
    {
       d->hadifixProc = new HadifixProc();
-      connect (d->hadifixProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped()));
+      connect (d->hadifixProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped()));
    }
    // Create a temp file name for the wave file.
    KTempFile tempFile (locateLocal("tmp", "hadifixplugin-"), ".wav");
@@ -354,7 +354,7 @@ void HadifixConf::testButton_clicked () {
 
    // TQString testMsg = "K D E ist eine moderne grafische Arbeitsumgebung für UNIX-Computer.";
    TQString testMsg = testMessage(d->languageCode);
-   connect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished()));
+   connect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished()));
    d->hadifixProc->synth (testMsg,
       realFilePath(d->configWidget->hadifixURL->url()),
       d->configWidget->isMaleVoice(),
@@ -369,7 +369,7 @@ void HadifixConf::testButton_clicked () {
    // Display progress dialog modally.  Processing continues when plugin signals synthFinished,
    // or if user clicks Cancel button.
    d->progressDlg->exec();
-   disconnect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished()));
+   disconnect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished()));
    if (d->progressDlg->wasCancelled()) d->hadifixProc->stopText();
    delete d->progressDlg;
    d->progressDlg = 0;
diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h
index 14d56bc..a773a4b 100644
--- a/kttsd/plugins/hadifix/hadifixconf.h
+++ b/kttsd/plugins/hadifix/hadifixconf.h
@@ -11,7 +11,7 @@ class HadifixProc;
 class HadifixConfPrivate;
 
 class HadifixConf : public PlugInConf {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 367200c..1fbe4ea 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -640,6 +640,11 @@
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">math.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <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">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <forwards>
     <forward>class TQStringList;</forward>
@@ -651,10 +656,10 @@
     <variable>TQPixmap male;</variable>
     <variable>TQMap&lt;TQString,int&gt; femaleVoices;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>changed(bool)</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected" specifier="non virtual">volumeBox_valueChanged( int percentValue )</slot>
     <slot access="protected" specifier="non virtual">timeBox_valueChanged( int percentValue )</slot>
     <slot access="protected" specifier="non virtual">frequencyBox_valueChanged( int percentValue )</slot>
@@ -662,7 +667,7 @@
     <slot access="protected" specifier="non virtual">timeSlider_valueChanged( int sliderValue )</slot>
     <slot access="protected" specifier="non virtual">frequencySlider_valueChanged( int sliderValue )</slot>
     <slot access="protected">changed( const TQString &amp; )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="protected" specifier="non virtual" returnType="int">percentToSlider( int percentValue )</function>
     <function access="protected" specifier="non virtual" returnType="int">sliderToPercent( int sliderValue )</function>
@@ -674,19 +679,4 @@
     <function specifier="non virtual" returnType="bool">isMaleVoice()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 3f2899f..fc92f99 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -22,8 +22,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 
 #include "hadifixproc.h"
 #include "hadifixproc.moc"
@@ -197,10 +197,10 @@ void HadifixProc::synth(TQString text,
    *(d->hadifixProc) << command;
    
    // Connect signals from process.
-   connect(d->hadifixProc, TQT_SIGNAL(processExited(TDEProcess *)),
-     this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-   connect(d->hadifixProc, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-     this, TQT_SLOT(slotWroteStdin(TDEProcess *)));
+   connect(d->hadifixProc, TQ_SIGNAL(processExited(TDEProcess *)),
+     this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+   connect(d->hadifixProc, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+     this, TQ_SLOT(slotWroteStdin(TDEProcess *)));
    
    // Store off name of wave file to be generated.
    d->synthFilename = waveFilename;
@@ -359,10 +359,10 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
    HadifixProc speech;
    KShellProcess proc;
    proc << command;
-   connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-     &speech, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
-   connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-     &speech, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
+   connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+     &speech, TQ_SLOT(receivedStdout(TDEProcess *, char *, int)));
+   connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+     &speech, TQ_SLOT(receivedStderr(TDEProcess *, char *, int)));
 
    speech.stdOut = TQString();
    speech.stdErr = TQString();
diff --git a/kttsd/plugins/hadifix/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h
index 34039c0..d3f6745 100644
--- a/kttsd/plugins/hadifix/hadifixproc.h
+++ b/kttsd/plugins/hadifix/hadifixproc.h
@@ -26,7 +26,7 @@ class TDEProcess;
 
 class HadifixProcPrivate;
 class HadifixProc : public PlugInProc{
-  Q_OBJECT
+  TQ_OBJECT
   
   
   public:
diff --git a/kttsd/plugins/hadifix/kttsd_hadifixplugin.desktop b/kttsd/plugins/hadifix/kttsd_hadifixplugin.desktop
index 0256587..2864dab 100644
--- a/kttsd/plugins/hadifix/kttsd_hadifixplugin.desktop
+++ b/kttsd/plugins/hadifix/kttsd_hadifixplugin.desktop
@@ -1,50 +1,8 @@
 [Desktop Entry]
 Name=Hadifix
-Name[ne]=ह्याडिफिक्स
+
 Comment=German hadifix text-to-speech system
-Comment[bg]=Синтезатор на глас за немски език Hadifix
-Comment[ca]=Sistema de text a veu alemany hadifix
-Comment[cs]=Německý systém hlasové syntézy hadifix
-Comment[da]=Tysk hadifix tekst-til-tale system
-Comment[de]=Deutsches hadifix-Sprachausgabesystem
-Comment[el]=Σύστημα κειμένου-σε-ομιλία γερμανικού hadifix
-Comment[es]=Sintetizador de texto a voz en alemán hadifix
-Comment[et]=Saksa teksti kõneks muutmise süsteem Hadifix
-Comment[eu]=Alemanierazko hadifix testutik hizketarako sistema
-Comment[fa]=سیستم متن به گفتار hadifix آلمانی
-Comment[fi]=Saksalainen hadifix teksti puheeksi -systeemi
-Comment[fr]=Système allemand de synthèse vocale hadifix
-Comment[ga]=Córas téacs-go-caint Gearmáinise hadifix
-Comment[gl]=Sistema alemao de texto-para-fala hadifix
-Comment[hu]=Hadifix szövegfelolvasó (Mbrola-alapú)
-Comment[is]=Þýska hadifix texti-í-tal kerfið
-Comment[it]=Sistema di pronuncia tedesca Hadifix
-Comment[ja]=ドイツ語 hadifix テキスト読み上げシステム
-Comment[ka]=გერმანული hadifix ტექსტის გახმოვანების სისტემა
-Comment[km]=ប្រព័ន្ធអត្ថបទដែលត្រូវនិយាយ hadifix អាល្លឺម៉ង់
-Comment[mk]=Германски hadifix систем за текст-во-говор
-Comment[ms]=Sistem teks-ke-tutur hadifiks Jerman
-Comment[mt]=Sistema test-għal-vuċi hadifix Ġermaniż
-Comment[nb]=Tysk hadifix system for tekst-til-tale
-Comment[nds]=Düütsch Blicksnuut Hadifix
-Comment[ne]=जर्मनी ह्याडिफिक्स पाठ वाचक प्रणाली
-Comment[nl]=Duits hadifix tekst-tot-spraak-systeem
-Comment[pa]=ਜਰਮਨ hadifix ਪਾਠ ਤੋਂ ਬੋਲੀ ਸਿਸਟਮ
-Comment[pl]=Niemiecki system syntezy mowy hadifix
-Comment[pt]=Sistema alemão de texto-para-voz hadifix
-Comment[pt_BR]=Sistema de conversão de texto para áudio almeão hadifix
-Comment[ru]=Немецкая система синтеза речи Hadifix
-Comment[sk]=Nemecký systém text-na-reč hadifix
-Comment[sl]=Nemški sistem besedila v govor hadifix
-Comment[sr]=Hadifix, немачки систем за текст-у-говор
-Comment[sr@Latn]=Hadifix, nemački sistem za tekst-u-govor
-Comment[sv]=Tyska Hadifix text-till-tal system
-Comment[ta]=ஜெர்மன் ஹாடிஃபிக்ஸ் உரையில் இருந்து பேச்சு அமைப்பு
-Comment[tg]=Системаи олмонии таҳлили овози hadifix
-Comment[tr]=Alman hadifix metinden konuşmaya sistemi
-Comment[uk]=Німецька система синтезу мовлення hadifix
-Comment[vi]=Hệ thống tổng hợp tiếng nói Đức hadifix
-Comment[zh_TW]=德語 hadifix 文字轉語音系統
+
 Type=Service
 X-TDE-ServiceTypes=KTTSD/SynthPlugin
 X-TDE-Library=libkttsd_hadifixplugin
diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui
index c333670..bb3a232 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui
+++ b/kttsd/plugins/hadifix/voicefileui.ui
@@ -100,20 +100,17 @@
 <includes>
     <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include>
     <include location="global" impldecl="in implementation">tdemessagebox.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">kurlrequester.h</include>
     <include location="local" impldecl="in implementation">hadifixproc.h</include>
     <include location="local" impldecl="in implementation">voicefileui.ui.h</include>
 </includes>
 <variables>
-    <variable access="public">QString mbrola;</variable>
+    <variable access="public">TQString mbrola;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
     <slot>genderButton_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>