From 28bf3cbba4139c8a0f81dc9d1a2f6c4ed724f22c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:20:30 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1157633 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kttsd/kttsmgr/kttsmgr.cpp | 56 +++++++++++++++++++++++------------------------ kttsd/kttsmgr/kttsmgr.h | 20 ++++++++--------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kttsd/kttsmgr') diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 80b66b9..68bd74d 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -23,7 +23,7 @@ ******************************************************************************/ // Qt includes. -#include +#include // KDE includes. #include @@ -81,7 +81,7 @@ int main (int argc, char *argv[]) KUniqueApplication app; #if KDE_VERSION >= KDE_MAKE_VERSION (3,3,90) - QPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel); + TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel); aboutdata.setProgramLogo(icon.convertToImage()); #endif @@ -135,11 +135,11 @@ int main (int argc, char *argv[]) /* KttsToolTip class */ -KttsToolTip::KttsToolTip ( QWidget* parent ) : QToolTip(parent) +KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) { } -/*virtual*/ void KttsToolTip::maybeTip ( const QPoint & p ) +/*virtual*/ void KttsToolTip::maybeTip ( const TQPoint & p ) { Q_UNUSED(p); @@ -148,11 +148,11 @@ KttsToolTip::KttsToolTip ( QWidget* parent ) : QToolTip(parent) KttsMgrTray* kttsMgrTray = dynamic_cast(parentWidget()); - QRect r(kttsMgrTray->geometry()); + TQRect r(kttsMgrTray->geometry()); if ( !r.isValid() ) return; - QString status = "KTTSMgr - "; + TQString status = "KTTSMgr - "; status += i18n("Text-to-Speech Manager"); status += "

"; status += kttsMgrTray->getStatus(); @@ -163,15 +163,15 @@ KttsToolTip::KttsToolTip ( QWidget* parent ) : QToolTip(parent) /* KttsMgrTray class */ -KttsMgrTray::KttsMgrTray(QWidget *parent): +KttsMgrTray::KttsMgrTray(TQWidget *parent): DCOPStub("kttsd", "KSpeech"), DCOPObject("kkttsmgr_kspeechsink"), KSystemTray(parent, "kttsmgrsystemtray") { - QPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small); + TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small); setPixmap (icon); - // QToolTip::add(this, i18n("Text-to-speech manager")); + // TQToolTip::add(this, i18n("Text-to-speech manager")); m_toolTip = new KttsToolTip(this); int id; @@ -179,25 +179,25 @@ KttsMgrTray::KttsMgrTray(QWidget *parent): if (id != -1) contextMenu()->changeTitle(id, icon, "KTTSMgr"); id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("klipper", KIcon::Small), - i18n("&Speak Clipboard Contents"), this, SLOT(speakClipboardSelected())); + i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected())); id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("stop", KIcon::Small), - i18n("&Hold"), this, SLOT(holdSelected())); + i18n("&Hold"), this, TQT_SLOT(holdSelected())); id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("exec", KIcon::Small), - i18n("Resume"), this, SLOT(resumeSelected())); + i18n("Resume"), this, TQT_SLOT(resumeSelected())); id = contextMenu()->insertSeparator(); id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("contents", KIcon::Small), - i18n("KTTS &Handbook"), this, SLOT(helpSelected())); + i18n("KTTS &Handbook"), this, TQT_SLOT(helpSelected())); id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small), - i18n("&About KTTSMgr"), this, SLOT(aboutSelected())); + i18n("&About KTTSMgr"), this, TQT_SLOT(aboutSelected())); - connect(this, SIGNAL(quitSelected()), this, SLOT(quitSelected())); + connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected())); // If --autoexit option given, exit when speaking stops. KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->isSet("autoexit")) { connectDCOPSignal("kttsd", "KSpeech", - "textFinished(QCString,uint)", - "textFinished(QCString,uint)", + "textFinished(TQCString,uint)", + "textFinished(TQCString,uint)", false); // Install an event filter so we can check when KTTSMgr becomes inconified to the systray. parent->installEventFilter(this); @@ -209,15 +209,15 @@ KttsMgrTray::~KttsMgrTray() delete m_toolTip; } -void KttsMgrTray::textFinished(const QCString& /*appId*/, uint /*jobNum*/) +void KttsMgrTray::textFinished(const TQCString& /*appId*/, uint /*jobNum*/) { // kdDebug() << "KttsMgrTray::textFinished: running" << endl; exitWhenFinishedSpeaking(); } -/*virtual*/ bool KttsMgrTray::eventFilter( QObject* /*o*/, QEvent* e ) +/*virtual*/ bool KttsMgrTray::eventFilter( TQObject* /*o*/, TQEvent* e ) { - if ( e->type() == QEvent::Hide ) exitWhenFinishedSpeaking(); + if ( e->type() == TQEvent::Hide ) exitWhenFinishedSpeaking(); return false; } @@ -225,8 +225,8 @@ void KttsMgrTray::exitWhenFinishedSpeaking() { // kdDebug() << "KttsMgrTray::exitWhenFinishedSpeaking: running" << endl; if ( parentWidget()->isShown() ) return; - QString jobNums = getTextJobNumbers(); - QStringList jobNumsList = QStringList::split(jobNums, ","); + TQString jobNums = getTextJobNumbers(); + TQStringList jobNumsList = TQStringList::split(jobNums, ","); uint jobNumsListCount = jobNumsList.count(); // Since there can only be 2 Finished jobs at a time, more than 2 jobs means at least // one job is not Finished. @@ -244,7 +244,7 @@ void KttsMgrTray::exitWhenFinishedSpeaking() * @param state KTTSD job state * @return Display string for the state. */ -QString KttsMgrTray::stateToStr(int state) +TQString KttsMgrTray::stateToStr(int state) { switch( state ) { @@ -257,11 +257,11 @@ QString KttsMgrTray::stateToStr(int state) } } -QString KttsMgrTray::getStatus() +TQString KttsMgrTray::getStatus() { if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running"); uint jobCount = getTextJobCount(); - QString status = i18n("1 job", "%n jobs", jobCount); + TQString status = i18n("1 job", "%n jobs", jobCount); if (jobCount > 0) { uint job = getCurrentTextJob(); @@ -283,8 +283,8 @@ void KttsMgrTray::speakClipboardSelected() { if (!isKttsdRunning()) { - QString error; - if (KApplication::startServiceByDesktopName("kttsd", QStringList(), &error) != 0) + TQString error; + if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error) != 0) kdError() << "Starting KTTSD failed with message " << error << endl; } speakClipboard(); @@ -298,7 +298,7 @@ void KttsMgrTray::aboutSelected() void KttsMgrTray::helpSelected() { - kapp->invokeHelp(QString::null,"kttsd"); + kapp->invokeHelp(TQString::null,"kttsd"); } void KttsMgrTray::quitSelected() diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h index e13233a..21f54a7 100644 --- a/kttsd/kttsmgr/kttsmgr.h +++ b/kttsd/kttsmgr/kttsmgr.h @@ -26,8 +26,8 @@ #define KTTSMGR_H // Qt includes. -#include -#include +#include +#include // KDE includes. #include @@ -39,10 +39,10 @@ class KttsToolTip: public QToolTip { public: - KttsToolTip ( QWidget* parent ); + KttsToolTip ( TQWidget* parent ); protected: - virtual void maybeTip ( const QPoint & p ); + virtual void maybeTip ( const TQPoint & p ); }; class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpeechSink @@ -50,16 +50,16 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee Q_OBJECT public: - KttsMgrTray(QWidget *parent=0); + KttsMgrTray(TQWidget *parent=0); ~KttsMgrTray(); void setExitWhenFinishedSpeaking(); - QString getStatus(); + TQString getStatus(); protected: - // ASYNC textStarted(const QCString& appId, uint jobNum); - ASYNC textFinished(const QCString& appId, uint jobNum); - virtual bool eventFilter( QObject* o, QEvent* e ); + // ASYNC textStarted(const TQCString& appId, uint jobNum); + ASYNC textFinished(const TQCString& appId, uint jobNum); + virtual bool eventFilter( TQObject* o, TQEvent* e ); private slots: @@ -76,7 +76,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee * @param state KTTSD job state * @return Display string for the state. */ - QString stateToStr(int state); + TQString stateToStr(int state); bool isKttsdRunning(); void exitWhenFinishedSpeaking(); -- cgit v1.2.1