From f46912a1a50c5ca06eb713e43e170f5ac47bb680 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:10 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d. --- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 8 ++++---- kttsd/filters/sbd/sbdconfwidget.ui | 24 +++++++++++----------- kttsd/filters/sbd/sbdproc.cpp | 4 ++-- kttsd/filters/sbd/sbdproc.h | 2 +- .../stringreplacer/editreplacementwidget.ui | 16 +++++++-------- .../filters/stringreplacer/stringreplacerconf.cpp | 8 ++++---- .../stringreplacer/stringreplacerconfwidget.ui | 22 ++++++++++---------- kttsd/filters/stringreplacer/stringreplacerproc.h | 2 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 8 ++++---- .../talkerchooser/talkerchooserconfwidget.ui | 18 ++++++++-------- .../filters/xmltransformer/xmltransformerconf.cpp | 8 ++++---- .../xmltransformer/xmltransformerconfwidget.ui | 20 +++++++++--------- .../filters/xmltransformer/xmltransformerproc.cpp | 4 ++-- 14 files changed, 73 insertions(+), 73 deletions(-) (limited to 'kttsd/filters') diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index 2752d5b..f33d771 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -25,7 +25,7 @@ #include using namespace std; -#include +#include #include #include diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index c3a3703..812a81d 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,11 +62,11 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args // kdDebug() << "SbdConf::SbdConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "SbdConfigWidgetLayout"); - layout->setAlignment (TQt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new SbdConfWidget(this, "SbdConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if tdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui index 1b57c98..e7158dc 100644 --- a/kttsd/filters/sbd/sbdconfwidget.ui +++ b/kttsd/filters/sbd/sbdconfwidget.ui @@ -35,7 +35,7 @@ - layout3 + tqlayout3 @@ -48,7 +48,7 @@ &Name: - + AlignVCenter|AlignRight @@ -74,7 +74,7 @@ - layout17 + tqlayout17 @@ -87,7 +87,7 @@ &Sentence boundary regular expression: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ - layout17_2 + tqlayout17_2 @@ -131,7 +131,7 @@ &Replacement sentence boundary: - + AlignVCenter|AlignRight @@ -168,7 +168,7 @@ - layout11 + tqlayout11 @@ -181,7 +181,7 @@ &Language is: - + AlignVCenter|AlignRight @@ -199,7 +199,7 @@ Application &ID contains: - + AlignVCenter|AlignRight @@ -213,7 +213,7 @@ - layout13 + tqlayout13 @@ -221,7 +221,7 @@ - layout12 + tqlayout12 @@ -265,7 +265,7 @@ - layout6 + tqlayout6 diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index 98eec0d..107e6b3 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -306,7 +306,7 @@ TQString SbdThread::endSentence() return s; } -// Parses a node of the SSML tree and recursively parses its children. +// Parses a node of the SSML tree and recursively parses its tqchildren. // Returns the filtered text with each sentence a complete ssml tree. TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re ) { @@ -441,7 +441,7 @@ TQString SbdThread::parseSsml( const TQString& inputText, const TQString& re ) // This flag is used to close out a previous sentence. m_sentenceStarted = false; - // Get the root element (speak) and recursively process its children. + // Get the root element (speak) and recursively process its tqchildren. TQDomElement docElem = doc.documentElement(); TQDomNode n = docElem.firstChild(); TQString ssml = parseSsmlNode( docElem, re ); diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index d49f72c..0c1e7aa 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -204,7 +204,7 @@ class SbdThread: public TQObject, public TQThread TQString startSentence(); // Ends a sentence and appends a Tab. TQString endSentence(); - // Parses a node of the SSML tree and recursively parses its children. + // Parses a node of the SSML tree and recursively parses its tqchildren. // Returns the filtered text with each sentence a complete ssml tree. TQString parseSsmlNode( TQDomNode& n, const TQString& re ); diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui index 8c61932..d672bbd 100644 --- a/kttsd/filters/stringreplacer/editreplacementwidget.ui +++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui @@ -21,7 +21,7 @@ 255 - + 0 0 @@ -33,7 +33,7 @@ - layout1 + tqlayout1 @@ -63,7 +63,7 @@ - layout3 + tqlayout3 @@ -128,7 +128,7 @@ - layout2 + tqlayout2 @@ -136,7 +136,7 @@ - layout6 + tqlayout6 @@ -157,7 +157,7 @@ &Replace with: - + AlignVCenter|AlignRight @@ -179,7 +179,7 @@ &Match: - + AlignVCenter|AlignRight @@ -190,7 +190,7 @@ - layout5 + tqlayout5 diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index cad745e..4d4ea72 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,11 +67,11 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons // kdDebug() << "StringReplacerConf::StringReplacerConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "StringReplacerConfigWidgetLayout"); - layout->setAlignment (TQt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); m_widget->substLView->setSortColumn(-1); connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui index d18b541..73c5954 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui +++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui @@ -23,7 +23,7 @@ - layout3 + tqlayout3 @@ -36,7 +36,7 @@ &Name: - + AlignVCenter|AlignRight @@ -73,7 +73,7 @@ - layout11 + tqlayout11 @@ -86,7 +86,7 @@ Lan&guage is: - + AlignVCenter|AlignRight @@ -104,7 +104,7 @@ Application &ID contains: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ - layout13 + tqlayout13 @@ -126,7 +126,7 @@ - layout12 + tqlayout12 @@ -170,7 +170,7 @@ - layout6 + tqlayout6 @@ -243,7 +243,7 @@ - layout24 + tqlayout24 @@ -303,7 +303,7 @@ - layout23 + tqlayout23 @@ -427,7 +427,7 @@ Expanding - + 20 20 diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index f3efb90..0fffbc9 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -27,7 +27,7 @@ // TQt includes. #include -#include +#include #include #include #include diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 805e7df..2e539f1 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -24,7 +24,7 @@ // TQt includes. #include #include -#include +#include // KDE includes. #include @@ -55,11 +55,11 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout"); - layout->setAlignment (TQt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if tdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui index a6a2dfa..1969489 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui +++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui @@ -23,7 +23,7 @@ - layout3 + tqlayout3 @@ -36,7 +36,7 @@ &Name: - + AlignVCenter|AlignRight @@ -73,7 +73,7 @@ - layout11 + tqlayout11 @@ -86,7 +86,7 @@ Te&xt contains: - + AlignVCenter|AlignRight @@ -104,7 +104,7 @@ Application &ID contains: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ - layout13 + tqlayout13 @@ -126,7 +126,7 @@ - layout12 + tqlayout12 @@ -167,7 +167,7 @@ - layout19_2 + tqlayout19_2 @@ -228,7 +228,7 @@ - layout6 + tqlayout6 diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 41a24d2..c143f21 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -23,7 +23,7 @@ // TQt includes. #include -#include +#include // KDE includes. #include @@ -49,11 +49,11 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "XmlTransformerConfWidgetLayout"); - layout->setAlignment (TQt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Set up defaults. defaults(); diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui index 471446b..63a83c3 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui +++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui @@ -22,7 +22,7 @@ - layout5 + tqlayout5 @@ -59,7 +59,7 @@ - layout6 + tqlayout6 @@ -72,7 +72,7 @@ &Name: - + AlignVCenter|AlignRight @@ -90,7 +90,7 @@ &XSLT file: - + AlignVCenter|AlignRight @@ -107,7 +107,7 @@ xsltproc &executable: - + AlignVCenter|AlignRight @@ -135,7 +135,7 @@ - layout6 + tqlayout6 @@ -169,7 +169,7 @@ - layout5 + tqlayout5 @@ -182,7 +182,7 @@ &Root element is: - + AlignVCenter|AlignRight @@ -200,7 +200,7 @@ or DOC&TYPE is: - + AlignVCenter|AlignRight @@ -217,7 +217,7 @@ and Application &ID contains: - + AlignVCenter|AlignRight diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 8fa9e4b..dcd9e74 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -373,13 +373,13 @@ void XmlTransformerProc::slotProcessExited(KProcess*) void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/) { - // TQString buf = TQString::fromLatin1(buffer, buflen); + // TQString buf = TQString::tqfromLatin1(buffer, buflen); // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl; } void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl; } -- cgit v1.2.3