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 --- ksayit/KTTSD_Lib/KTTSDlibSetup.ui | 20 ++++++++++---------- ksayit/KTTSD_Lib/kttsdlib.cpp | 8 ++++---- ksayit/KTTSD_Lib/kttsdlib.h | 9 +++++---- ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp | 8 ++++---- ksayit/KTTSD_Lib/kttsdlibsetupimpl.h | 5 +++-- ksayit/KTTSD_Lib/kttsdlibtalker2.cpp | 6 +++--- ksayit/KTTSD_Lib/kttsdlibtalker2.h | 5 +++-- 7 files changed, 32 insertions(+), 29 deletions(-) (limited to 'ksayit/KTTSD_Lib') diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui index 8c624e4..29be316 100644 --- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui +++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui @@ -1,6 +1,6 @@ KTTSDlibSetup - + KTTSDlibSetup @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -49,9 +49,9 @@ Horizontal - + - layout1 + tqlayout1 @@ -67,14 +67,14 @@ Expanding - + 40 20 - + kcm_Button @@ -95,7 +95,7 @@ Expanding - + 40 20 @@ -114,8 +114,8 @@ slotLaunchControlcenter() - + slotLaunchControlcenter() - - + + diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index f41670b..9680a88 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -11,7 +11,7 @@ // // #include // nanosleep -// Qt includes +// TQt includes #include #include @@ -27,8 +27,8 @@ #include "kttsdlibsetupimpl.h" -KTTSDLib::KTTSDLib(TQObject *parent, const char *name, KApplication *Appl) - : TQObject(parent, name), m_Appl(Appl) +KTTSDLib::KTTSDLib(TQObject *tqparent, const char *name, KApplication *Appl) + : TQObject(tqparent, name), m_Appl(Appl) { KGlobal::locale()->insertCatalogue("libKTTSD"); m_talker = new kttsdlibtalker2(static_cast(this), "kttsdlibtalker"); @@ -81,7 +81,7 @@ int KTTSDLib::getActions() } -int KTTSDLib::getStatus() const +int KTTSDLib::gettqStatus() const { return TTS::AUDIOFILE; } diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index eb57912..929ef3a 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -45,9 +45,10 @@ class kttsdlibtalker2; /** @author Robert Vogl */ -class KDE_EXPORT KTTSDLib : public QObject +class KDE_EXPORT KTTSDLib : public TQObject { -Q_OBJECT +Q_OBJECT +TQ_OBJECT signals: /** Emitted when the plugin has been finished speeking. */ @@ -70,7 +71,7 @@ public slots: void slotTextStarted(const uint job); public: - KTTSDLib(TQObject *parent=0, const char *name=0, KApplication *Appl=0); + KTTSDLib(TQObject *tqparent=0, const char *name=0, KApplication *Appl=0); ~KTTSDLib(); @@ -92,7 +93,7 @@ public: void sayText(); - int getStatus() const; + int gettqStatus() const; void stop(); diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index 1cb8bc9..0ade8fe 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -12,7 +12,7 @@ #include -// Qt includes +// TQt includes #include // KDE includes @@ -23,8 +23,8 @@ // App specific includes #include "kttsdlibsetupimpl.h" -KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *parent, const char *name) - : KTTSDlibSetup(parent, name) +KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *tqparent, const char *name) + : KTTSDlibSetup(tqparent, name) { } @@ -47,7 +47,7 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() fgets(cmdresult, 18, fp); pclose(fp); } - if ( !TQCString(cmdresult).contains("kcmkttsd") ){ + if ( !TQCString(cmdresult).tqcontains("kcmkttsd") ){ TQString error = i18n("Control Center Module for KTTSD not found."); KMessageBox::sorry(this, error, i18n("Problem")); return; diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h index cd36430..ed49df4 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h @@ -12,7 +12,7 @@ #ifndef KTTSDSETUPIMPL_H #define KTTSDSETUPIMPL_H -// Qt includes +// TQt includes // KDE includes #include @@ -26,8 +26,9 @@ class KTTSDlibSetupImpl : public KTTSDlibSetup { Q_OBJECT + TQ_OBJECT public: - KTTSDlibSetupImpl(TQWidget *parent = 0, const char *name = 0); + KTTSDlibSetupImpl(TQWidget *tqparent = 0, const char *name = 0); ~KTTSDlibSetupImpl(); diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp index c88a96b..10fceb9 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp @@ -12,7 +12,7 @@ #include //sleep -// Qt includes +// TQt includes #include // KDE includes @@ -21,8 +21,8 @@ // App specific includes #include "kttsdlibtalker2.h" -kttsdlibtalker2::kttsdlibtalker2(TQObject *parent, const char *name) - : TQObject(parent, name), DCOPStub("kttsd", "KSpeech") +kttsdlibtalker2::kttsdlibtalker2(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), DCOPStub("kttsd", "KSpeech") { m_client = NULL; diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h index 29b6371..6627a6e 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h @@ -12,7 +12,7 @@ #ifndef KTTSDLIBTALKER2_H #define KTTSDLIBTALKER2_H -// Qt includes +// TQt includes #include #include @@ -29,6 +29,7 @@ class kttsdlibtalker2 : public TQObject, public KSpeech_stub, virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT signals: void signalTextStarted(const uint); @@ -36,7 +37,7 @@ signals: void signalTextStopped(const uint); public: - kttsdlibtalker2(TQObject *parent = 0, const char *name = 0); + kttsdlibtalker2(TQObject *tqparent = 0, const char *name = 0); ~kttsdlibtalker2(); -- cgit v1.2.1