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/app-plugins/kate/katekttsd.cpp | 8 +- kttsd/app-plugins/kate/katekttsd.h | 4 +- kttsd/compat/interfaces/kspeech/kspeech.h | 14 +- kttsd/configure.in.in | 11 +- kttsd/debian/man/kttsd.1 | 6 +- kttsd/debian/man/kttsmgr.1 | 6 +- 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 +- kttsd/kcmkttsmgr/addtalker.cpp | 10 +- kttsd/kcmkttsmgr/addtalker.h | 7 +- kttsd/kcmkttsmgr/addtalkerwidget.ui | 32 ++-- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 102 +++++------ kttsd/kcmkttsmgr/kcmkttsmgr.h | 13 +- kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 202 ++++++++++----------- kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h | 2 +- kttsd/kcmkttsmgr/selectevent.cpp | 32 ++-- kttsd/kcmkttsmgr/selectevent.h | 7 +- kttsd/kcmkttsmgr/selecteventwidget.ui | 8 +- kttsd/kttsd/filtermgr.cpp | 20 +- kttsd/kttsd/filtermgr.h | 7 +- kttsd/kttsd/kttsd.cpp | 42 ++--- kttsd/kttsd/kttsd.h | 8 +- kttsd/kttsd/speaker.cpp | 58 +++--- kttsd/kttsd/speaker.h | 9 +- kttsd/kttsd/speechdata.cpp | 30 +-- kttsd/kttsd/speechdata.h | 3 +- kttsd/kttsd/ssmlconvert.cpp | 18 +- kttsd/kttsd/ssmlconvert.h | 3 +- kttsd/kttsd/talkermgr.cpp | 24 +-- kttsd/kttsd/talkermgr.h | 8 +- kttsd/kttsd/threadedplugin.cpp | 10 +- kttsd/kttsd/threadedplugin.h | 2 +- kttsd/kttsjobmgr/kttsjobmgr.cpp | 34 ++-- kttsd/kttsjobmgr/kttsjobmgr.h | 11 +- kttsd/kttsmgr/kttsmgr.cpp | 28 +-- kttsd/kttsmgr/kttsmgr.h | 11 +- kttsd/libkttsd/filterconf.cpp | 8 +- kttsd/libkttsd/filterconf.h | 9 +- kttsd/libkttsd/filterproc.cpp | 6 +- kttsd/libkttsd/filterproc.h | 7 +- kttsd/libkttsd/notify.cpp | 18 +- kttsd/libkttsd/player.h | 7 +- kttsd/libkttsd/pluginconf.cpp | 12 +- kttsd/libkttsd/pluginconf.h | 17 +- kttsd/libkttsd/pluginproc.cpp | 6 +- kttsd/libkttsd/pluginproc.h | 11 +- kttsd/libkttsd/selecttalkerdlg.cpp | 24 +-- kttsd/libkttsd/selecttalkerdlg.h | 11 +- kttsd/libkttsd/selecttalkerwidget.ui | 70 +++---- kttsd/libkttsd/stretcher.cpp | 6 +- kttsd/libkttsd/stretcher.h | 5 +- kttsd/libkttsd/talkercode.cpp | 16 +- kttsd/libkttsd/talkercode.h | 6 +- kttsd/libkttsd/testplayer.cpp | 12 +- kttsd/libkttsd/testplayer.h | 6 +- kttsd/libkttsd/utils.cpp | 16 +- kttsd/libkttsd/utils.h | 6 +- kttsd/players/akodeplayer/akodeplayer.cpp | 4 +- kttsd/players/akodeplayer/akodeplayer.h | 3 +- kttsd/players/alsaplayer/alsaplayer.cpp | 18 +- kttsd/players/alsaplayer/alsaplayer.h | 7 +- kttsd/players/artsplayer/artsplayer.cpp | 6 +- kttsd/players/artsplayer/artsplayer.h | 3 +- kttsd/players/gstplayer/gstreamerplayer.cpp | 24 +-- kttsd/players/gstplayer/gstreamerplayer.h | 3 +- kttsd/plugins/command/commandconf.cpp | 30 +-- kttsd/plugins/command/commandconf.h | 11 +- kttsd/plugins/command/commandconfwidget.ui | 32 ++-- kttsd/plugins/command/commandproc.cpp | 50 ++--- kttsd/plugins/command/commandproc.h | 7 +- kttsd/plugins/epos/eposconf.cpp | 28 +-- kttsd/plugins/epos/eposconf.h | 11 +- kttsd/plugins/epos/eposconfwidget.ui | 90 ++++----- kttsd/plugins/epos/eposproc.cpp | 26 +-- kttsd/plugins/epos/eposproc.h | 7 +- kttsd/plugins/festivalint/festivalintconf.cpp | 36 ++-- kttsd/plugins/festivalint/festivalintconf.h | 11 +- kttsd/plugins/festivalint/festivalintconfwidget.ui | 62 +++---- kttsd/plugins/festivalint/festivalintproc.cpp | 48 ++--- kttsd/plugins/festivalint/festivalintproc.h | 5 +- kttsd/plugins/flite/fliteconf.cpp | 30 +-- kttsd/plugins/flite/fliteconf.h | 11 +- kttsd/plugins/flite/fliteconfwidget.ui | 18 +- kttsd/plugins/flite/fliteproc.cpp | 22 +-- kttsd/plugins/flite/fliteproc.h | 7 +- kttsd/plugins/freetts/freettsconf.cpp | 32 ++-- kttsd/plugins/freetts/freettsconf.h | 9 +- kttsd/plugins/freetts/freettsconfigwidget.ui | 24 +-- kttsd/plugins/freetts/freettsproc.cpp | 16 +- kttsd/plugins/freetts/freettsproc.h | 5 +- kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl | 2 +- kttsd/plugins/hadifix/hadifixconf.cpp | 38 ++-- kttsd/plugins/hadifix/hadifixconf.h | 9 +- kttsd/plugins/hadifix/hadifixconfigui.ui | 94 +++++----- kttsd/plugins/hadifix/hadifixconfigui.ui.h | 10 +- kttsd/plugins/hadifix/hadifixproc.cpp | 32 ++-- kttsd/plugins/hadifix/hadifixproc.h | 5 +- kttsd/plugins/hadifix/initialconfig.h | 8 +- kttsd/plugins/hadifix/voicefileui.ui | 16 +- kttsd/plugins/hadifix/voicefileui.ui.h | 6 +- 126 files changed, 1291 insertions(+), 1253 deletions(-) (limited to 'kttsd') diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index 47837fb..65017b7 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -17,7 +17,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include #include #include @@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory( "ktexteditor_kttsd" ) ) -KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& ) - : KTextEditor::Plugin ( (KTextEditor::Document*) parent, name ) +KateKttsdPlugin::KateKttsdPlugin( TQObject *tqparent, const char* name, const TQStringList& ) + : KTextEditor::Plugin ( (KTextEditor::Document*) tqparent, name ) { } @@ -80,7 +80,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n void KateKttsdPluginView::slotReadOut() { - KTextEditor::View *v = (KTextEditor::View*)parent(); + KTextEditor::View *v = (KTextEditor::View*)tqparent(); KTextEditor::SelectionInterface *si = KTextEditor::selectionInterface( v->document() ); TQString text; diff --git a/kttsd/app-plugins/kate/katekttsd.h b/kttsd/app-plugins/kate/katekttsd.h index c30f3cf..cfcc750 100644 --- a/kttsd/app-plugins/kate/katekttsd.h +++ b/kttsd/app-plugins/kate/katekttsd.h @@ -28,9 +28,10 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KateKttsdPlugin( TQObject *parent = 0, + KateKttsdPlugin( TQObject *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~KateKttsdPlugin(); @@ -45,6 +46,7 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginVi class KateKttsdPluginView : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: KateKttsdPluginView( KTextEditor::View *view, const char *name=0 ); diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h index d321528..39ca74c 100644 --- a/kttsd/compat/interfaces/kspeech/kspeech.h +++ b/kttsd/compat/interfaces/kspeech/kspeech.h @@ -207,8 +207,8 @@ * "kttsd", object "KSpeech". * @verbatim - MyPart::MyPart(TQWidget *parent, const char *name) : - KParts::ReadOnlyPart(parent, name), + MyPart::MyPart(TQWidget *tqparent, const char *name) : + KParts::ReadOnlyPart(tqparent, name), DCOPStub("kttsd", "KSpeech") { @endverbatim * @@ -293,8 +293,8 @@ * receiving object. * @verbatim - MyPart::MyPart(TQWidget *parent, const char *name) : - KParts::ReadOnlyPart(parent, name), + MyPart::MyPart(TQWidget *tqparent, const char *name) : + KParts::ReadOnlyPart(tqparent, name), DCOPObject("mypart_kspeechsink") { @endverbatim * @@ -441,7 +441,7 @@ * a Spanish synthesizer would likely be unintelligible). So the language * attribute is said to have "priority". * If an application does not specify a language attribute, a default one will be assumed. - * The rest of the attributes are said to be "preferred". If %KTTSD cannot find + * The rest of the attributes are said to be "preferred". If %KTTSD cannot tqfind * a talker with the exact preferred attributes requested, the closest matching * talker will likely still be understandable. * @@ -751,11 +751,11 @@ class KSpeech : virtual public DCOPObject { * with a single space, and then replaces the sentence delimiters using * the following statement: @verbatim - TQString::replace(sentenceDelimiter, "\\1\t"); + TQString::tqreplace(sentenceDelimiter, "\\1\t"); @endverbatim * * which replaces all sentence delimiters with a tab, but - * preserving the first capture text (first parenthesis). In other + * preserving the first capture text (first tqparenthesis). In other * words, the sentence punctuation is preserved. * The tab is later used to separate the text into sentences. * diff --git a/kttsd/configure.in.in b/kttsd/configure.in.in index 4adcfb1..b833cfc 100644 --- a/kttsd/configure.in.in +++ b/kttsd/configure.in.in @@ -280,16 +280,7 @@ kdeversion_save_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" -AC_COMPILE_IFELSE([ -#include -#if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) -#error KDE 3.4 -#endif -], - KTTS_ICONS_DIR="" -, - KTTS_ICONS_DIR="icons" -) +KTTS_ICONS_DIR="icons" CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_save_LIBS" diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1 index 379d7f0..4b8743b 100644 --- a/kttsd/debian/man/kttsd.1 +++ b/kttsd/debian/man/kttsd.1 @@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager .B --style