summaryrefslogtreecommitdiffstats
path: root/kttsd/plugins/command
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:10 -0600
commitf46912a1a50c5ca06eb713e43e170f5ac47bb680 (patch)
tree5ff859ec73dca8829e4ca2633fd176cf8bbfd604 /kttsd/plugins/command
parent23aecb275d6085b7a15a38da0180edf156c8ea9d (diff)
downloadtdeaccessibility-f46912a1a50c5ca06eb713e43e170f5ac47bb680.tar.gz
tdeaccessibility-f46912a1a50c5ca06eb713e43e170f5ac47bb680.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d.
Diffstat (limited to 'kttsd/plugins/command')
-rw-r--r--kttsd/plugins/command/commandconf.cpp22
-rw-r--r--kttsd/plugins/command/commandconfwidget.ui8
-rw-r--r--kttsd/plugins/command/commandproc.cpp6
3 files changed, 18 insertions, 18 deletions
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9cbba40..9045f14 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -16,11 +16,11 @@
***************************************************************************/
// TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqfile.h>
#include <tqapplication.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
// KDE includes.
#include <kdialog.h>
@@ -48,11 +48,11 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
m_commandProc = 0;
m_progressDlg = 0;
- TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "CommandConfigWidgetLayout");
- layout->setAlignment (TQt::AlignTop);
+ tqlayout->tqsetAlignment (TQt::AlignTop);
m_widget = new CommandConfWidget(this, "CommandConfigWidget");
- layout->addWidget(m_widget);
+ tqlayout->addWidget(m_widget);
// Build codec list and fill combobox.
m_codecList = PlugInProc::buildCodecList();
@@ -127,12 +127,12 @@ TQString CommandConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .arg(m_languageCode)
- .arg("fixed")
- .arg("neutral")
- .arg("medium")
- .arg("medium")
- .arg("Command");
+ .tqarg(m_languageCode)
+ .tqarg("fixed")
+ .tqarg("neutral")
+ .tqarg("medium")
+ .tqarg("medium")
+ .tqarg("Command");
}
}
return TQString();
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 75ce080..8db709c 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index ddc8a8c..d1eb223 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -21,7 +21,7 @@
#include <tqvaluelist.h>
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqvaluestack.h>
// KDE includes.
@@ -382,13 +382,13 @@ void CommandProc::slotProcessExited(KProcess*)
void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::fromLatin1(buffer, buflen);
+ TQString buf = TQString::tqfromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
}
void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::fromLatin1(buffer, buflen);
+ TQString buf = TQString::tqfromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl;
}