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/kttsmgr/kttsmgr.cpp | 8 ++++---- kttsd/kttsmgr/kttsmgr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kttsd/kttsmgr') diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index f633a11..da9001b 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -148,14 +148,14 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) KttsMgrTray* kttsMgrTray = dynamic_cast(parentWidget()); - TQRect r(kttsMgrTray->geometry()); + TQRect r(kttsMgrTray->tqgeometry()); if ( !r.isValid() ) return; TQString status = "KTTSMgr - "; status += i18n("Text-to-Speech Manager"); status += "

"; - status += kttsMgrTray->getStatus(); + status += kttsMgrTray->gettqStatus(); status += "
"; tip(r, status); @@ -257,7 +257,7 @@ TQString KttsMgrTray::stateToStr(int state) } } -TQString KttsMgrTray::getStatus() +TQString KttsMgrTray::gettqStatus() { if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running"); uint jobCount = getTextJobCount(); @@ -273,7 +273,7 @@ TQString KttsMgrTray::getStatus() int sentenceCount = getTextCount(job); uint seq = moveRelTextSentence(0, job); status += i18n(", current job %1 at sentence %2 of %3 sentences" - ).arg(stateToStr(jobState)).arg(seq).arg(sentenceCount); + ).tqarg(stateToStr(jobState)).tqarg(seq).tqarg(sentenceCount); } } return status; diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h index 92245da..a2a99df 100644 --- a/kttsd/kttsmgr/kttsmgr.h +++ b/kttsd/kttsmgr/kttsmgr.h @@ -55,7 +55,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee ~KttsMgrTray(); void setExitWhenFinishedSpeaking(); - TQString getStatus(); + TQString gettqStatus(); protected: // ASYNC textStarted(const TQCString& appId, uint jobNum); -- cgit v1.2.1