From f138d74fe16092003b06f5bde9663841929cde7f Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 22:17:08 +0000 Subject: TQt4 port kdeaccessibility This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kttsd/filters/main.cpp | 4 +- kttsd/filters/sbd/sbdconf.cpp | 32 +++++------ kttsd/filters/sbd/sbdconf.h | 5 +- kttsd/filters/sbd/sbdconfwidget.ui | 58 ++++++++++---------- kttsd/filters/sbd/sbdproc.cpp | 64 +++++++++++----------- kttsd/filters/sbd/sbdproc.h | 12 ++-- .../stringreplacer/editreplacementwidget.ui | 42 +++++++------- .../filters/stringreplacer/stringreplacerconf.cpp | 34 ++++++------ kttsd/filters/stringreplacer/stringreplacerconf.h | 5 +- .../stringreplacer/stringreplacerconfwidget.ui | 54 +++++++++--------- .../filters/stringreplacer/stringreplacerproc.cpp | 14 ++--- kttsd/filters/stringreplacer/stringreplacerproc.h | 5 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 30 +++++----- kttsd/filters/talkerchooser/talkerchooserconf.h | 5 +- .../talkerchooser/talkerchooserconfwidget.ui | 48 ++++++++-------- kttsd/filters/talkerchooser/talkerchooserproc.cpp | 10 ++-- kttsd/filters/talkerchooser/talkerchooserproc.h | 3 +- kttsd/filters/xhtml2ssml/Doxyfile | 4 +- kttsd/filters/xhtml2ssml/xhtml2ssml.cpp | 8 +-- kttsd/filters/xhtml2ssml/xhtml2ssml.h | 4 +- kttsd/filters/xhtml2ssml/xmlelement.cpp | 6 +- kttsd/filters/xhtml2ssml/xmlelement.h | 4 +- kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl | 8 +-- .../filters/xmltransformer/xmltransformerconf.cpp | 24 ++++---- kttsd/filters/xmltransformer/xmltransformerconf.h | 5 +- .../xmltransformer/xmltransformerconfwidget.ui | 48 ++++++++-------- .../filters/xmltransformer/xmltransformerproc.cpp | 18 +++--- kttsd/filters/xmltransformer/xmltransformerproc.h | 5 +- 28 files changed, 284 insertions(+), 275 deletions(-) (limited to 'kttsd/filters') diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index f33d771..015bed0 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -123,9 +123,9 @@ int main(int argc, char *argv[]) TalkerCode* talkerCode = new TalkerCode( talker ); text = plugIn->convert( text, talkerCode, appId ); if ( args->isSet("break") ) - text.replace( "\t", "\\t" ); + text.tqreplace( "\t", "\\t" ); else - text.replace( "\t", "" ); + text.tqreplace( "\t", "" ); cout << text.latin1() << endl; delete config; delete plugIn; diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 5244974..6beaba3 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -56,17 +56,17 @@ /** * Constructor */ -SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +SbdConf::SbdConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // 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 (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new SbdConfWidget(this, "SbdConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if kdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -156,7 +156,7 @@ void SbdConf::save(KConfig* config, const TQString& configGroup){ config->writeEntry("SentenceDelimiterRegExp", m_widget->reLineEdit->text() ); config->writeEntry("SentenceBoundary", m_widget->sbLineEdit->text() ); config->writeEntry("LanguageCodes", m_languageCodeList ); - config->writeEntry("AppID", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry("AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); } /** @@ -195,7 +195,7 @@ bool SbdConf::supportsMultiInstance() { return true; } TQString SbdConf::userPlugInName() { if ( m_widget->reLineEdit->text().isEmpty() ) - return TQString::null; + return TQString(); else return m_widget->nameLineEdit->text(); } @@ -257,7 +257,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() if (!countryCode.isEmpty()) language += " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; TQListViewItem* item = new KListViewItem(langLView, language, locale); - if (m_languageCodeList.contains(locale)) item->setSelected(true); + if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); } // Sort by language. langLView->setSorting(0); @@ -276,7 +276,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() dlg->setHelp("", "kttsd"); dlg->setInitialSize(TQSize(300, 500), false); int dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (dlgResult == TQDialog::Accepted) { m_languageCodeList.clear(); @@ -288,7 +288,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) @@ -331,11 +331,11 @@ void SbdConf::slotSaveButton_clicked() void SbdConf::slotClearButton_clicked() { - m_widget->nameLineEdit->setText( TQString::null ); - m_widget->reLineEdit->setText( TQString::null ); - m_widget->sbLineEdit->setText( TQString::null ); + m_widget->nameLineEdit->setText( TQString() ); + m_widget->reLineEdit->setText( TQString() ); + m_widget->sbLineEdit->setText( TQString() ); m_languageCodeList.clear(); - m_widget->languageLineEdit->setText( TQString::null ); - m_widget->appIdLineEdit->setText( TQString::null ); + m_widget->languageLineEdit->setText( TQString() ); + m_widget->appIdLineEdit->setText( TQString() ); configChanged(); } diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index eb1b817..f2610c4 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -24,7 +24,7 @@ #ifndef _SBDCONF_H_ #define _SBDCONF_H_ -// Qt includes. +// TQt includes. #include // KDE includes. @@ -43,12 +43,13 @@ class EditReplacementWidget; class SbdConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - SbdConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + SbdConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui index 17cd525..c094a52 100644 --- a/kttsd/filters/sbd/sbdconfwidget.ui +++ b/kttsd/filters/sbd/sbdconfwidget.ui @@ -1,7 +1,7 @@ SbdConfWidget Gary Cramblitt <garycramblitt@comcast.net> - + SbdConfWidget @@ -25,7 +25,7 @@ unnamed - + textLabel1 @@ -33,22 +33,22 @@ <b>WARNING: This filter is a key component of the KTTS system. Please read the KTTS Handbook before modifying these settings.</b> - + - layout3 + tqlayout3 unnamed - + nameLabel &Name: - + AlignVCenter|AlignRight @@ -72,22 +72,22 @@ - + - layout17 + tqlayout17 unnamed - + reLabel &Sentence boundary regular expression: - + AlignVCenter|AlignRight @@ -116,22 +116,22 @@ - + - layout17_2 + tqlayout17_2 unnamed - + sbLabel &Replacement sentence boundary: - + AlignVCenter|AlignRight @@ -152,7 +152,7 @@ - + applyGroupBox @@ -166,22 +166,22 @@ unnamed - + - layout11 + tqlayout11 unnamed - + languageLabel &Language is: - + AlignVCenter|AlignRight @@ -192,14 +192,14 @@ What's this text - + appIdLabel - Application &ID contains: + Application &ID tqcontains: - + AlignVCenter|AlignRight @@ -211,17 +211,17 @@ - + - layout13 + tqlayout13 unnamed - + - layout12 + tqlayout12 @@ -263,9 +263,9 @@ - + - layout6 + tqlayout6 @@ -347,7 +347,7 @@ languageBrowseButton appIdLineEdit - + klineedit.h klineedit.h diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index 6117b11..6b0a1a4 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -41,8 +41,8 @@ /** * Constructor. */ -SbdThread::SbdThread( TQObject *parent, const char *name ) : - TQObject( parent, name ), +SbdThread::SbdThread( TQObject *tqparent, const char *name ) : + TQObject( tqparent, name ), TQThread() { } @@ -175,7 +175,7 @@ void SbdThread::pushSsmlElem( SsmlElemType et, const TQDomElement& elem ) // i.e., name="value". TQString SbdThread::makeAttr( const TQString& name, const TQString& value ) { - if ( value.isEmpty() ) return TQString::null; + if ( value.isEmpty() ) return TQString(); return " " + name + "=\"" + value + "\""; } @@ -277,8 +277,8 @@ TQString SbdThread::makeSentence( const TQString& text ) if ( !e.isEmpty() ) s += e; // Escape ampersands and less thans. TQString newText = text; - newText.replace(TQRegExp("&(?!amp;)"), "&"); - newText.replace(TQRegExp("<(?!lt;)"), "<"); + newText.tqreplace(TQRegExp("&(?!amp;)"), "&"); + newText.tqreplace(TQRegExp("<(?!lt;)"), "<"); s += newText; if ( !e.isEmpty() ) s += ""; if ( !p.isEmpty() ) s += ""; @@ -289,7 +289,7 @@ TQString SbdThread::makeSentence( const TQString& text ) // Starts a sentence by returning a speak tag. TQString SbdThread::startSentence() { - if ( m_sentenceStarted ) return TQString::null; + if ( m_sentenceStarted ) return TQString(); TQString s; s += makeSsmlElem( etSpeak ); m_sentenceStarted = true; @@ -299,14 +299,14 @@ TQString SbdThread::startSentence() // Ends a sentence and appends a Tab. TQString SbdThread::endSentence() { - if ( !m_sentenceStarted ) return TQString::null; + if ( !m_sentenceStarted ) return TQString(); TQString s = ""; s += "\t"; m_sentenceStarted = false; 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 ) { @@ -351,7 +351,7 @@ TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re ) case TQDomNode::TextNode: { // = 3 TQString s = parsePlainText( n.toText().data(), re ); // TQString d = s; - // d.replace("\t", "\\t"); + // d.tqreplace("\t", "\\t"); // kdDebug() << "SbdThread::parseSsmlNode: parsedPlainText = [" << d << "]" << endl; TQStringList sentenceList = TQStringList::split( '\t', s, false ); int lastNdx = sentenceList.count() - 1; @@ -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 ); @@ -457,13 +457,13 @@ TQString SbdThread::parseCode( const TQString& inputText ) { TQString temp = inputText; // Replace newlines with tabs. - temp.replace("\n","\t"); + temp.tqreplace("\n","\t"); // Remove leading spaces. - temp.replace(TQRegExp("\\t +"), "\t"); + temp.tqreplace(TQRegExp("\\t +"), "\t"); // Remove trailing spaces. - temp.replace(TQRegExp(" +\\t"), "\t"); + temp.tqreplace(TQRegExp(" +\\t"), "\t"); // Remove blank lines. - temp.replace(TQRegExp("\t\t+"),"\t"); + temp.tqreplace(TQRegExp("\t\t+"),"\t"); return temp; } @@ -474,16 +474,16 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r TQRegExp sentenceDelimiter = TQRegExp( re ); TQString temp = inputText; // Replace sentence delimiters with tab. - temp.replace(sentenceDelimiter, m_configuredSentenceBoundary); + temp.tqreplace(sentenceDelimiter, m_configuredSentenceBoundary); // Replace remaining newlines with spaces. - temp.replace("\n"," "); - temp.replace("\r"," "); + temp.tqreplace("\n"," "); + temp.tqreplace("\r"," "); // Remove leading spaces. - temp.replace(TQRegExp("\\t +"), "\t"); + temp.tqreplace(TQRegExp("\\t +"), "\t"); // Remove trailing spaces. - temp.replace(TQRegExp(" +\\t"), "\t"); + temp.tqreplace(TQRegExp(" +\\t"), "\t"); // Remove blank lines. - temp.replace(TQRegExp("\t\t+"),"\t"); + temp.tqreplace(TQRegExp("\t\t+"),"\t"); return temp; } @@ -503,7 +503,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r { // Examine just the first 500 chars to see if it is code. TQString p = m_text.left( 500 ); - if ( p.contains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) ) + if ( p.tqcontains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) ) textType = ttCode; else textType = ttPlain; @@ -515,7 +515,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r if ( re.isEmpty() ) re = m_configuredRe; // Replace spaces, tabs, and formfeeds with a single space. - m_text.replace(TQRegExp("[ \\t\\f]+"), " "); + m_text.tqreplace(TQRegExp("[ \\t\\f]+"), " "); // Perform the filtering based on type of text. switch ( textType ) @@ -534,7 +534,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r } // Clear app-specified sentence delimiter. App must call setSbRegExp for each conversion. - m_re = TQString::null; + m_re = TQString(); // kdDebug() << "SbdThread::run: filtered text = " << m_text << endl; @@ -562,11 +562,11 @@ bool SbdThread::event ( TQEvent * e ) /** * Constructor. */ -SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterProc(parent, name) +SbdProc::SbdProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterProc(tqparent, name) { // kdDebug() << "SbdProc::SbdProc: Running" << endl; - m_sbdThread = new SbdThread( parent, *name + "_thread" ); + m_sbdThread = new SbdThread( tqparent, *name + "_thread" ); connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); } @@ -603,7 +603,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])(\\s|$|(\\n *\\n))" ); m_sbdThread->setConfiguredSbRegExp( m_configuredRe ); TQString sb = config->readEntry( "SentenceBoundary", "\\1\t" ); - sb.replace( "\\t", "\t" ); + sb.tqreplace( "\\t", "\t" ); m_sbdThread->setConfiguredSentenceBoundary( sb ); m_appIdList = config->readListEntry( "AppID" ); m_languageCodeList = config->readListEntry( "LanguageCodes" ); @@ -672,14 +672,14 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ TQString languageCode = talkerCode->languageCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) + if ( !m_languageCodeList.tqcontains( languageCode ) ) { if ( !talkerCode->countryCode().isEmpty() ) { languageCode += '_' + talkerCode->countryCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) return false; + if ( !m_languageCodeList.tqcontains( languageCode ) ) return false; } else return false; } } @@ -692,7 +692,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -737,7 +737,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ /*virtual*/ void SbdProc::ackFinished() { m_state = fsIdle; - m_sbdThread->setText( TQString::null ); + m_sbdThread->setText( TQString() ); } /** diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index 4592c29..49f7b09 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -45,7 +45,7 @@ #ifndef _SBDPROC_H_ #define _SBDPROC_H_ -// Qt includes. +// TQt includes. #include #include #include @@ -60,15 +60,16 @@ class KConfig; class TQDomElement; class TQDomNode; -class SbdThread: public TQObject, public QThread +class SbdThread: public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - SbdThread( TQObject *parent = 0, const char *name = 0); + SbdThread( TQObject *tqparent = 0, const char *name = 0); /** * Destructor. @@ -203,7 +204,7 @@ class SbdThread: public TQObject, public QThread 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 ); @@ -240,12 +241,13 @@ class SbdThread: public TQObject, public QThread class SbdProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - SbdProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + SbdProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui index 917cdf8..6046580 100644 --- a/kttsd/filters/stringreplacer/editreplacementwidget.ui +++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui @@ -1,7 +1,7 @@ EditReplacementWidget Gary Cramblitt <garycramblitt@comcast.net> - + EditReplacementWidget @@ -21,7 +21,7 @@ 255 - + 0 0 @@ -31,15 +31,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + typeButtonGroup @@ -61,15 +61,15 @@ unnamed - + - layout3 + tqlayout3 unnamed - + wordRadioButton @@ -88,7 +88,7 @@ true - + regexpRadioButton @@ -108,7 +108,7 @@ - + caseCheckBox @@ -126,23 +126,23 @@ - + - layout2 + tqlayout2 unnamed - + - layout6 + tqlayout6 unnamed - + substLabel @@ -157,14 +157,14 @@ &Replace with: - + AlignVCenter|AlignRight matchLineEdit - + matchLabel @@ -179,7 +179,7 @@ &Match: - + AlignVCenter|AlignRight @@ -188,9 +188,9 @@ - + - layout5 + tqlayout5 @@ -254,7 +254,7 @@ matchButton substLineEdit - + klineedit.h kpushbutton.h diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 72f50d8..8bce00d 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -59,19 +59,19 @@ /** * Constructor */ -StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name), +StringReplacerConf::StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name), m_editDlg(0), m_editWidget(0) { // 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 (Qt::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&)), @@ -244,7 +244,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) item = new KListViewItem(m_widget->substLView, item, wordTypeStr, matchCaseStr, match, subst); } - return TQString::null; + return TQString(); } /** @@ -308,7 +308,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename) } // Application ID - TQString appId = m_widget->appIdLineEdit->text().replace(" ", ""); + TQString appId = m_widget->appIdLineEdit->text().tqreplace(" ", ""); if ( !appId.isEmpty() ) { TQStringList appIdList = TQStringList::split(",", appId); @@ -359,7 +359,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename) // kdDebug() << "StringReplacerConf::saveToFile: writing out " << doc.toString() << endl; file.close(); - return TQString::null; + return TQString(); } /** @@ -400,7 +400,7 @@ bool StringReplacerConf::supportsMultiInstance() { return true; } */ TQString StringReplacerConf::userPlugInName() { - if ( m_widget->substLView->childCount() == 0 ) return TQString::null; + if ( m_widget->substLView->childCount() == 0 ) return TQString(); TQString instName = m_widget->nameLineEdit->text(); if ( instName.isEmpty() ) { @@ -442,7 +442,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() if (!countryCode.isEmpty()) language += " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; item = new KListViewItem(langLView, language, locale); - if (m_languageCodeList.contains(locale)) item->setSelected(true); + if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); } // Sort by language. langLView->setSorting(0); @@ -461,7 +461,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() dlg->setHelp("", "kttsd"); dlg->setInitialSize(TQSize(300, 500), false); int dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (dlgResult == TQDialog::Accepted) { m_languageCodeList.clear(); @@ -473,7 +473,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) @@ -488,11 +488,11 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages"); if ( !s1.isEmpty() ) { - s2.replace( s1, language ); - s2.replace( i18n("Multiple Languages"), language ); + s2.tqreplace( s1, language ); + s2.tqreplace( i18n("Multiple Languages"), language ); } - s2.replace(" ()", ""); - if ( !s2.contains("(") && !language.isEmpty() ) s2 += " (" + language + ")"; + s2.tqreplace(" ()", ""); + if ( !s2.tqcontains("(") && !language.isEmpty() ) s2 += " (" + language + ")"; m_widget->nameLineEdit->setText(s2); configChanged(); } diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index 1606390..4de870c 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -24,7 +24,7 @@ #ifndef _STRINGREPLACERCONF_H_ #define _STRINGREPLACERCONF_H_ -// Qt includes. +// TQt includes. #include // KDE includes. @@ -43,12 +43,13 @@ class EditReplacementWidget; class StringReplacerConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - StringReplacerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui index e88307f..c1882a0 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui +++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui @@ -2,7 +2,7 @@ StringReplacerConfWidget Widget for configuring String Replacer Filter for KTTSD. Gary Cramblitt <garycramblitt@comcast.net> - + StringReplacerConfWidget @@ -21,22 +21,22 @@ unnamed - + - layout3 + tqlayout3 unnamed - + nameLabel &Name: - + AlignVCenter|AlignRight @@ -57,7 +57,7 @@ - + applyGroupBox @@ -71,22 +71,22 @@ unnamed - + - layout11 + tqlayout11 unnamed - + languageLabel Lan&guage is: - + AlignVCenter|AlignRight @@ -97,14 +97,14 @@ What's this text - + appIdLabel - Application &ID contains: + Application &ID tqcontains: - + AlignVCenter|AlignRight @@ -116,17 +116,17 @@ - + - layout13 + tqlayout13 unnamed - + - layout12 + tqlayout12 @@ -168,9 +168,9 @@ - + - layout6 + tqlayout6 @@ -241,9 +241,9 @@ - + - layout24 + tqlayout24 @@ -301,9 +301,9 @@ true - + - layout23 + tqlayout23 @@ -329,7 +329,7 @@ What's this text - + upButton @@ -348,7 +348,7 @@ Click to move selected word up in the list. Words higher in the list are applied first. - + downButton @@ -427,7 +427,7 @@ Expanding - + 20 20 @@ -457,7 +457,7 @@ languageBrowseButton appIdLineEdit - + klineedit.h klineedit.h diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 8987d79..4cee1e7 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -44,8 +44,8 @@ /** * Constructor. */ -StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, const TQStringList& ) : - KttsFilterProc(parent, name) +StringReplacerProc::StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList& ) : + KttsFilterProc(tqparent, name) { } @@ -180,14 +180,14 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ TQString languageCode = talkerCode->languageCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) + if ( !m_languageCodeList.tqcontains( languageCode ) ) { if ( !talkerCode->countryCode().isEmpty() ) { languageCode += '_' + talkerCode->countryCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) return inputText; + if ( !m_languageCodeList.tqcontains( languageCode ) ) return inputText; } else return inputText; } } @@ -200,7 +200,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -217,7 +217,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ for ( int index = 0; index < listCount; ++index ) { //kdDebug() << "newtext = " << newText << " matching " << m_matchList[index].pattern() << " replacing with " << m_substList[index] << endl; - newText.replace( m_matchList[index], m_substList[index] ); + newText.tqreplace( m_matchList[index], m_substList[index] ); } m_wasModified = true; return newText; diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index b679113..175bda8 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -25,7 +25,7 @@ #ifndef _STRINGREPLACERPROC_H_ #define _STRINGREPLACERPROC_H_ -// Qt includes. +// TQt includes. #include #include #include @@ -38,12 +38,13 @@ class StringReplacerProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - StringReplacerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index cc811a3..b351df9 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -49,17 +49,17 @@ /** * Constructor */ -TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +TalkerChooserConf::TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // 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 (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if kdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -147,7 +147,7 @@ void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){ config->setGroup( configGroup ); config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() ); config->writeEntry( "MatchRegExp", m_widget->reLineEdit->text() ); - config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); config->writeEntry( "TalkerCode", m_talkerCode.getTalkerCode()); } @@ -167,7 +167,7 @@ void TalkerChooserConf::defaults(){ // Default App ID is blank. m_widget->appIdLineEdit->setText( "" ); // Default to using default Talker. - m_talkerCode = TalkerCode( TQString::null, false ); + m_talkerCode = TalkerCode( TQString(), false ); m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() ); } @@ -188,11 +188,11 @@ bool TalkerChooserConf::supportsMultiInstance() { return true; } */ TQString TalkerChooserConf::userPlugInName() { - if (m_widget->talkerLineEdit->text().isEmpty()) return TQString::null; + if (m_widget->talkerLineEdit->text().isEmpty()) return TQString(); if (m_widget->appIdLineEdit->text().isEmpty() && - m_widget->reLineEdit->text().isEmpty()) return TQString::null; + m_widget->reLineEdit->text().isEmpty()) return TQString(); TQString instName = m_widget->nameLineEdit->text(); - if (instName.isEmpty()) return TQString::null; + if (instName.isEmpty()) return TQString(); return instName; } @@ -260,10 +260,10 @@ void TalkerChooserConf::slotSaveButton_clicked() void TalkerChooserConf::slotClearButton_clicked() { - m_widget->nameLineEdit->setText( TQString::null ); - m_widget->reLineEdit->setText( TQString::null ); - m_widget->appIdLineEdit->setText( TQString::null ); - m_talkerCode = TalkerCode( TQString::null, false ); + m_widget->nameLineEdit->setText( TQString() ); + m_widget->reLineEdit->setText( TQString() ); + m_widget->appIdLineEdit->setText( TQString() ); + m_talkerCode = TalkerCode( TQString(), false ); m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() ); configChanged(); } diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index 38a6c49..be501a2 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -24,7 +24,7 @@ #ifndef _TALKERCHOOSERCONF_H_ #define _TALKERCHOOSERCONF_H_ -// Qt includes. +// TQt includes. #include // KDE includes. @@ -45,12 +45,13 @@ class EditReplacementWidget; class TalkerChooserConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui index 3cdee2e..3ee9947 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui +++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui @@ -2,7 +2,7 @@ TalkerChooserConfWidget Widget for configuring Talker Chooser Filter for KTTSD. Gary Cramblitt <garycramblitt@comcast.net> - + TalkerChooserConfWidget @@ -21,22 +21,22 @@ unnamed - + - layout3 + tqlayout3 unnamed - + nameLabel &Name: - + AlignVCenter|AlignRight @@ -57,7 +57,7 @@ - + applyGroupBox @@ -71,22 +71,22 @@ unnamed - + - layout11 + tqlayout11 unnamed - + reLabel - Te&xt contains: + Te&xt tqcontains: - + AlignVCenter|AlignRight @@ -97,14 +97,14 @@ What's this text - + appIdLabel - Application &ID contains: + Application &ID tqcontains: - + AlignVCenter|AlignRight @@ -116,17 +116,17 @@ - + - layout13 + tqlayout13 unnamed - + - layout12 + tqlayout12 @@ -165,15 +165,15 @@ - + - layout19_2 + tqlayout19_2 unnamed - + talkerLabel @@ -226,9 +226,9 @@ - + - layout6 + tqlayout6 @@ -304,7 +304,7 @@ reEditorButton appIdLineEdit - + klineedit.h klineedit.h diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 5758df2..8d4aeb0 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include // KDE includes. @@ -38,8 +38,8 @@ /** * Constructor. */ -TalkerChooserProc::TalkerChooserProc( TQObject *parent, const char *name, const TQStringList& /*args*/ ) : - KttsFilterProc(parent, name) +TalkerChooserProc::TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) : + KttsFilterProc(tqparent, name) { // kdDebug() << "TalkerChooserProc::TalkerChooserProc: Running" << endl; } @@ -107,7 +107,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){ { if ( !m_re.isEmpty() ) { - int pos = inputText.find( TQRegExp(m_re) ); + int pos = inputText.tqfind( TQRegExp(m_re) ); if ( pos < 0 ) return inputText; } // If appId doesn't match, return input unmolested. @@ -119,7 +119,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h index 8c9ab01..a422000 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.h +++ b/kttsd/filters/talkerchooser/talkerchooserproc.h @@ -31,12 +31,13 @@ class TalkerChooserProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - TalkerChooserProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/xhtml2ssml/Doxyfile b/kttsd/filters/xhtml2ssml/Doxyfile index 0061358..6313df1 100644 --- a/kttsd/filters/xhtml2ssml/Doxyfile +++ b/kttsd/filters/xhtml2ssml/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ @@ -120,7 +120,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = yes diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp index 5649cc9..916ec48 100644 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp +++ b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp @@ -63,7 +63,7 @@ bool XHTMLToSSMLParser::startElement(const TQString &, const TQString &, const T // append to the output string. TQString toelement = m_xhtml2ssml[fromelement]; if(toelement) - m_output.append(XMLElement::fromQString(toelement).startTag()); + m_output.append(XMLElement::fromTQString(toelement).startTag()); return true; } @@ -71,7 +71,7 @@ bool XHTMLToSSMLParser::endElement(const TQString &, const TQString &, const TQS TQString fromelement = qName; TQString toelement = m_xhtml2ssml[fromelement]; if(toelement) - m_output.append(XMLElement::fromQString(toelement).endTag()); + m_output.append(XMLElement::fromTQString(toelement).endTag()); return true; } @@ -94,10 +94,10 @@ bool XHTMLToSSMLParser::readFileConfigEntry(const TQString &line) { if(line.stripWhiteSpace().startsWith("#")) { return true; } - // break into QStringList + // break into TQStringList // the second parameter to split is the string, with all space simplified and all space around the : removed, i.e // "something : somethingelse" -> "something:somethingelse" - TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().replace(" :", ":").replace(": ", ":")); + TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().tqreplace(" :", ":").tqreplace(": ", ":")); if(keyvalue.count() != 2) return false; m_xhtml2ssml[keyvalue[0]] = keyvalue[1]; diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.h b/kttsd/filters/xhtml2ssml/xhtml2ssml.h index 4668d90..a4eae56 100644 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.h +++ b/kttsd/filters/xhtml2ssml/xhtml2ssml.h @@ -25,7 +25,7 @@ #include #include -typedef TQMap QStringMap; +typedef TQMap TQStringMap; class TQString; class XHTMLToSSMLParser : public TQXmlDefaultHandler { @@ -53,7 +53,7 @@ public: private: /// Dict of xhtml tags -> ssml tags - QStringMap m_xhtml2ssml; + TQStringMap m_xhtml2ssml; /// The output of the conversion TQString m_output; }; diff --git a/kttsd/filters/xhtml2ssml/xmlelement.cpp b/kttsd/filters/xhtml2ssml/xmlelement.cpp index 920fd57..45952ae 100644 --- a/kttsd/filters/xhtml2ssml/xmlelement.cpp +++ b/kttsd/filters/xhtml2ssml/xmlelement.cpp @@ -74,12 +74,12 @@ TQString XMLElement::attribute(const TQString &attr) { return m_attrmapper[attr]; } -TQString XMLElement::toQString() { +TQString XMLElement::toTQString() { TQString tag = startTag(); return tag.left(tag.length() - 1).right(tag.length() - 2); } -XMLElement XMLElement::fromQString(const TQString &str) { +XMLElement XMLElement::fromTQString(const TQString &str) { TQStringList sections = TQStringList::split(" ", str); TQString tagname = sections[0]; XMLElement e(tagname.latin1()); @@ -91,7 +91,7 @@ XMLElement XMLElement::fromQString(const TQString &str) { for(int i = 0; i < sectionsCount; ++i) { TQStringList list = TQStringList::split("=", sections[i]); if(list.count() != 2) { - std::cerr << "XMLElement::fromQString: Cannot convert list: " << list.join("|") << ". `" << str << "' is not in valid format.\n"; + std::cerr << "XMLElement::fromTQString: Cannot convert list: " << list.join("|") << ". `" << str << "' is not in valid format.\n"; return XMLElement(" "); } e.setAttribute(list[0], list[1].left(list[1].length() - 1).right(list[1].length() -2)); diff --git a/kttsd/filters/xhtml2ssml/xmlelement.h b/kttsd/filters/xhtml2ssml/xmlelement.h index f92e933..11c7cef 100644 --- a/kttsd/filters/xhtml2ssml/xmlelement.h +++ b/kttsd/filters/xhtml2ssml/xmlelement.h @@ -75,11 +75,11 @@ public: /// Had issues with TQMap and custom classes. For now you can just convert to/from TQString and use /// That as the key/value pair. /// @returns A TQString representation of the XMLAttribute. - TQString toQString(); + TQString toTQString(); /// Create an XMLElement from a TQString. /// @param str The TQString to convert from. Must be of the following syntax- "foo name=\"bar\"" - static XMLElement fromQString(const TQString &str); + static XMLElement fromTQString(const TQString &str); private: /// The name of the tag. diff --git a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl index 2c1f3be..f289252 100644 --- a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl +++ b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl @@ -52,22 +52,22 @@ - + - + - + - + diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index c70c449..dd4bb54 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include @@ -43,17 +43,17 @@ /** * Constructor */ -XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +XmlTransformerConf::XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // 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 (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Set up defaults. defaults(); @@ -125,7 +125,7 @@ void XmlTransformerConf::save(KConfig* config, const TQString& configGroup){ config->writeEntry( "XsltprocPath", realFilePath( m_widget->xsltprocPath->url() ) ); config->writeEntry( "RootElement", m_widget->rootElementLineEdit->text() ); config->writeEntry( "DocType", m_widget->doctypeLineEdit->text() ); - config->writeEntry( "AppID", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry( "AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); } /** @@ -170,13 +170,13 @@ bool XmlTransformerConf::supportsMultiInstance() { return true; } TQString XmlTransformerConf::userPlugInName() { TQString filePath = realFilePath(m_widget->xsltprocPath->url()); - if (filePath.isEmpty()) return TQString::null; - if (getLocation(filePath).isEmpty()) return TQString::null; + if (filePath.isEmpty()) return TQString(); + if (getLocation(filePath).isEmpty()) return TQString(); filePath = realFilePath(m_widget->xsltPath->url()); - if (filePath.isEmpty()) return TQString::null; - if (getLocation(filePath).isEmpty()) return TQString::null; - if (!TQFileInfo(filePath).isFile()) return TQString::null; + if (filePath.isEmpty()) return TQString(); + if (getLocation(filePath).isEmpty()) return TQString(); + if (!TQFileInfo(filePath).isFile()) return TQString(); return m_widget->nameLineEdit->text(); } diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index caec175..c10b90b 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -24,7 +24,7 @@ #ifndef _XMLTRANSFORMERCONF_H_ #define _XMLTRANSFORMERCONF_H_ -// Qt includes. +// TQt includes. #include // KDE includes. @@ -40,12 +40,13 @@ class XmlTransformerConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui index 4975d9c..cd00de3 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui +++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui @@ -1,7 +1,7 @@ XmlTransformerConfWidget Gary Cramblitt <garycramblitt@comcast.net> - + XmlTransformerConfWidget @@ -20,9 +20,9 @@ unnamed - + - layout5 + tqlayout5 @@ -57,22 +57,22 @@ - + - layout6 + tqlayout6 unnamed - + nameLabel &Name: - + AlignVCenter|AlignRight @@ -83,14 +83,14 @@ What's this text - + xsltLabel &XSLT file: - + AlignVCenter|AlignRight @@ -100,14 +100,14 @@ Enter the full path to an XML Style Language - Transforms (XSLT) stylesheet file. XSLT files usually end with extension .xsl. - + xsltprocLabel xsltproc &executable: - + AlignVCenter|AlignRight @@ -119,7 +119,7 @@ - + applyGroupBox @@ -133,9 +133,9 @@ unnamed - + - layout6 + tqlayout6 @@ -167,22 +167,22 @@ - + - layout5 + tqlayout5 unnamed - + rootElementLabel &Root element is: - + AlignVCenter|AlignRight @@ -193,14 +193,14 @@ What's this text - + doctypeLabel or DOC&TYPE is: - + AlignVCenter|AlignRight @@ -210,14 +210,14 @@ This filter will be applied only to text having the specified DOCTYPE specification. If blank, applies to all text. You may enter more than one DOCTYPE separated by commas. Example: "xhtml". - + appIdLabel - and Application &ID contains: + and Application &ID tqcontains: - + AlignVCenter|AlignRight @@ -233,7 +233,7 @@ - + klineedit.h kurlrequester.h diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index b4b9f71..f9fc2e6 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include #include @@ -44,8 +44,8 @@ /** * Constructor. */ -XmlTransformerProc::XmlTransformerProc( TQObject *parent, const char *name, const TQStringList& ) : - KttsFilterProc(parent, name) +XmlTransformerProc::XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList& ) : + KttsFilterProc(tqparent, name) { m_xsltProc = 0; } @@ -198,7 +198,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) found = false; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -227,7 +227,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) // This will change & inside a CDATA section, which is not good, and also within comments and // processing instructions, which is OK because we don't speak those anyway. TQString text = inputText; - text.replace(TQRegExp("&(?!amp;)"),"&"); + text.tqreplace(TQRegExp("&(?!amp;)"),"&"); *wstream << text; inFile.close(); #if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0) @@ -282,7 +282,7 @@ void XmlTransformerProc::processOutput() if (exitStatus != 0) { - kdDebug() << "XmlTransformerProc::processOutput: xsltproc abnormal exit. Status = " << exitStatus << endl; + kdDebug() << "XmlTransformerProc::processOutput: xsltproc abnormal exit. tqStatus = " << exitStatus << endl; m_state = fsFinished; TQFile::remove(m_outFilename); emit filteringFinished(); @@ -346,7 +346,7 @@ void XmlTransformerProc::processOutput() /*virtual*/ void XmlTransformerProc::ackFinished() { m_state = fsIdle; - m_text = TQString::null; + m_text = TQString(); } /** @@ -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; } diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index d50adeb..4f8b82b 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -24,7 +24,7 @@ #ifndef _XMLTRANSFORMERPROC_H_ #define _XMLTRANSFORMERPROC_H_ -// Qt includes. +// TQt includes. #include #include @@ -36,12 +36,13 @@ class KProcess; class XmlTransformerProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - XmlTransformerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. -- cgit v1.2.3