From 6687cd2515bdebbd8f0c92261f3acf8777441ca6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:28:00 -0600 Subject: Rename old tq methods that no longer need a unique name --- ksayit/Freeverb_plugin/freeverb_setup.ui | 16 ++++++++-------- ksayit/KTTSD_Lib/KTTSDlibSetup.ui | 4 ++-- ksayit/KTTSD_Lib/kttsdlib.cpp | 2 +- ksayit/KTTSD_Lib/kttsdlib.h | 2 +- ksayit/src/DocTreeView.ui | 2 +- ksayit/src/KSayItView.ui | 2 +- ksayit/src/doctreeviewimpl.cpp | 2 +- ksayit/src/fx_setup.ui | 14 +++++++------- ksayit/src/ksayit.cpp | 4 ++-- ksayit/src/ksayitviewimpl.h | 2 +- ksayit/src/voicesetupdlg.cpp | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) (limited to 'ksayit') diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index 6172a8e..44e6e87 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -20,7 +20,7 @@ 0 - + 360 300 @@ -56,7 +56,7 @@ 0 - + 0 260 @@ -161,7 +161,7 @@ 0 - + 0 260 @@ -260,7 +260,7 @@ 0 - + 0 260 @@ -359,7 +359,7 @@ 0 - + 0 260 @@ -458,7 +458,7 @@ 0 - + 0 260 @@ -587,7 +587,7 @@ Expanding - + 180 20 @@ -598,7 +598,7 @@ OK_Button - + 60 0 diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui index 94f421a..9df5c07 100644 --- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui +++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -95,7 +95,7 @@ Expanding - + 40 20 diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 707ebab..342e43c 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -81,7 +81,7 @@ int KTTSDLib::getActions() } -int KTTSDLib::gettqStatus() const +int KTTSDLib::getStatus() const { return TTS::AUDIOFILE; } diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index d0e902b..d205b79 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -93,7 +93,7 @@ public: void sayText(); - int gettqStatus() const; + int getStatus() const; void stop(); diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui index 1222c83..be3c4d6 100644 --- a/ksayit/src/DocTreeView.ui +++ b/ksayit/src/DocTreeView.ui @@ -20,7 +20,7 @@ 0 - + 100 200 diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui index a95a90e..90d8332 100644 --- a/ksayit/src/KSayItView.ui +++ b/ksayit/src/KSayItView.ui @@ -23,7 +23,7 @@ TextEdit - + 400 200 diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 98b76b1..8eb34ab 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -927,7 +927,7 @@ void DocTreeViewImpl::slotNewDate() date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); // get current date TQString today; - today = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(Qt::LocalTime), true); + today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true); date->setText( 1, today); date->setValue( KSayItGlobal::RAWDATA, today ); date->setValue( KSayItGlobal::RTFDATA, today ); diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui index 77f2cd9..fb7285e 100644 --- a/ksayit/src/fx_setup.ui +++ b/ksayit/src/fx_setup.ui @@ -50,7 +50,7 @@ listBox_Available - + 150 170 @@ -77,7 +77,7 @@ Expanding - + 20 40 @@ -88,7 +88,7 @@ toolButton_add - + 30 32767 @@ -105,7 +105,7 @@ toolButton_remove - + 30 32767 @@ -128,7 +128,7 @@ Expanding - + 20 40 @@ -157,7 +157,7 @@ listBox_Active - + 150 170 @@ -189,7 +189,7 @@ Expanding - + 40 20 diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index cefaba6..25db48a 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -322,12 +322,12 @@ void KSayItApp::initView() { // create the main widget view = new KSayItViewImpl(this); - view->setMinimumSize(view->tqsizeHint()); + view->setMinimumSize(view->sizeHint()); setCentralWidget(view); // connections connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool))); - connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)), + connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &))); diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h index 6128fe2..105c0f2 100644 --- a/ksayit/src/ksayitviewimpl.h +++ b/ksayit/src/ksayitviewimpl.h @@ -41,7 +41,7 @@ public: signals: void signalSetCaption(const TQString &caption); - void signalShowtqStatus(const TQString &status); + void signalShowStatus(const TQString &status); void signalEnableCopyCut(bool enable); /** Emitted when the text in the TextEditor view cahnges. diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 298f32f..d8df70a 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -88,7 +88,7 @@ void VoiceSetupDlg::initFXPage() connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) ); // Disable/enable FX-Setup depending on TTS-libs capability - int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE; + int status = m_kttslib->getStatus() & TTS::AUDIOFILE; if ( status ){ m_fxPage->setEnabled(true); } else { @@ -105,7 +105,7 @@ void VoiceSetupDlg::slotPageChanged(TQWidget *page) if ( page != m_fxPage ) return; - int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE; + int status = m_kttslib->getStatus() & TTS::AUDIOFILE; if ( status ){ m_fxPage->setEnabled(true); } else { @@ -120,7 +120,7 @@ void VoiceSetupDlg::slotOk() { kdDebug(100200) << "+++ entering VoiceSetupDlg::slotOK()" << endl; - int status = m_kttslib->gettqStatus(); + int status = m_kttslib->getStatus(); if ( (status & TTS::AUDIOFILE) == 0 ){ emit signalRemoveAllFX(); } -- cgit v1.2.3