From c04ba2b3810f5a0187b3ca3b89661d0befca9e08 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 11 Jan 2024 10:29:46 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- ksayit/KTTSD_Lib/kttsdlib.cpp | 12 ++-- ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp | 4 +- ksayit/src/contextmenuhandler.cpp | 36 +++++------ ksayit/src/ksayit.cpp | 114 ++++++++++++++++----------------- ksayit/src/ksayitsystemtray.cpp | 16 ++--- ksayit/src/voicesetupdlg.cpp | 8 +-- 6 files changed, 95 insertions(+), 95 deletions(-) (limited to 'ksayit') diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 32e66e4..31be41d 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -32,12 +32,12 @@ KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl) { TDEGlobal::locale()->insertCatalogue("libKTTSD"); m_talker = new kttsdlibtalker2(static_cast(this), "kttsdlibtalker"); - connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)), - this, TQT_SLOT(slotTextFinished(const uint)) ); - connect(m_talker, TQT_SIGNAL(signalTextStopped(const uint)), - this, TQT_SLOT(slotTextStopped(const uint)) ); - connect(m_talker, TQT_SIGNAL(signalTextStarted(const uint)), - this, TQT_SLOT(slotTextStarted(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextFinished(const uint)), + this, TQ_SLOT(slotTextFinished(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextStopped(const uint)), + this, TQ_SLOT(slotTextStopped(const uint)) ); + connect(m_talker, TQ_SIGNAL(signalTextStarted(const uint)), + this, TQ_SLOT(slotTextStarted(const uint)) ); // reset list of currently processed jobs while ( !jobList.empty() ){ diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index 1dc4196..7228768 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -55,8 +55,8 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() // invoke the Control Center Module TDEProcess *kcmproc = new TDEProcess(); - connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) ); + connect(kcmproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotKCMProcessExited(TDEProcess*)) ); (*kcmproc) << "tdecmshell"; (*kcmproc) << "kcmkttsd"; kcmproc->start(TDEProcess::NotifyOnExit); diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index abee221..69cb5a2 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -158,75 +158,75 @@ void ContextMenuHandler::initActions() // User defined actions renameItem = new TDEAction (i18n("Rename..."), 0, - m_DocTreeView, TQT_SLOT (slotRenameItem()), NULL ); + m_DocTreeView, TQ_SLOT (slotRenameItem()), NULL ); deleteItem = new TDEAction (i18n("Delete..."), 0, - m_DocTreeView, TQT_SLOT (slotDeleteItem()), NULL ); + m_DocTreeView, TQ_SLOT (slotDeleteItem()), NULL ); newBookInfo = new TDEAction ( i18n("Overview"), 0, - m_DocTreeView, TQT_SLOT (slotNewBookInfo()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewBookInfo()), NULL ); newChapter = new TDEAction ( i18n("Chapter"), 0, - m_DocTreeView, TQT_SLOT (slotNewChapter()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewChapter()), NULL ); newKeywordSet = new TDEAction ( i18n("Keywords"), 0, - m_DocTreeView, TQT_SLOT (slotNewKeywordSet()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewKeywordSet()), NULL ); newKeyword = new TDEAction ( i18n("Keyword"), 0, - m_DocTreeView, TQT_SLOT (slotNewKeyword()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewKeyword()), NULL ); newAbstract = new TDEAction ( i18n("Abstract"), 0, - m_DocTreeView, TQT_SLOT (slotNewAbstract()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAbstract()), NULL ); newAuthorGroup = new TDEAction ( i18n("Authors"), 0, - m_DocTreeView, TQT_SLOT (slotNewAuthorGroup()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAuthorGroup()), NULL ); newAuthor = new TDEAction ( i18n("Author"), 0, - m_DocTreeView, TQT_SLOT (slotNewAuthor()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewAuthor()), NULL ); newDate = new TDEAction ( i18n("Date"), 0, - m_DocTreeView, TQT_SLOT (slotNewDate()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewDate()), NULL ); newReleaseInfo = new TDEAction ( i18n("Release Info"), 0, - m_DocTreeView, TQT_SLOT (slotNewReleaseInfo()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewReleaseInfo()), NULL ); newTitle = new TDEAction ( i18n("Title"), 0, - m_DocTreeView, TQT_SLOT (slotNewTitle()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewTitle()), NULL ); newParagraph = new TDEAction ( i18n("Paragraph"), 0, - m_DocTreeView, TQT_SLOT (slotNewParagraph()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewParagraph()), NULL ); newSection_1 = new TDEAction ( i18n("Section Level 1"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_1()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_1()), NULL ); newSection_2 = new TDEAction ( i18n("Section Level 2"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_2()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_2()), NULL ); newSection_3 = new TDEAction ( i18n("Section Level 3"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_3()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_3()), NULL ); newSection_4 = new TDEAction ( i18n("Section Level 4"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_4()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_4()), NULL ); newSection_5 = new TDEAction ( i18n("Section Level 5"), 0, - m_DocTreeView, TQT_SLOT (slotNewSection_5()), NULL ); + m_DocTreeView, TQ_SLOT (slotNewSection_5()), NULL ); } diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index b2aad06..67c466f 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -83,27 +83,27 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, readOptions(); // connect TTS plugin handler to this object - connect(m_kttslib, TQT_SIGNAL(signalFinished()), - this, TQT_SLOT(slotTTSFinished()) ); + connect(m_kttslib, TQ_SIGNAL(signalFinished()), + this, TQ_SLOT(slotTTSFinished()) ); // only used if library thinks it has to call the preferences dialog. // e.g. when it detects a bad configuration. - connect(m_kttslib, TQT_SIGNAL(signalCallPreferences()), - this, TQT_SLOT(slotPreferences()) ); + connect(m_kttslib, TQ_SIGNAL(signalCallPreferences()), + this, TQ_SLOT(slotPreferences()) ); // init Clipboard cb = TQApplication::clipboard(); - connect(cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardChanged()) ); + connect(cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardChanged()) ); // create SystemTray object tray = new KSayItSystemTray(this, "system_tray"); - connect(tray, TQT_SIGNAL(signalCallPreferences()), this, TQT_SLOT(slotPreferences()) ); - connect(tray, TQT_SIGNAL(signalSayActivated()), this, TQT_SLOT(slotSayText()) ); - connect(tray, TQT_SIGNAL(signalSayClipboard()), this, TQT_SLOT(slotSayClipboard()) ); - connect(tray, TQT_SIGNAL(signalShutUpActivated()), this, TQT_SLOT(slotStopActivated()) ); - connect(tray, TQT_SIGNAL(signalPauseActivated()), this, TQT_SLOT(slotPauseActivated()) ); - connect(tray, TQT_SIGNAL(signalNextActivated()), this, TQT_SLOT(slotNextSentenceActivated()) ); - connect(tray, TQT_SIGNAL(signalPrevActivated()), this, TQT_SLOT(slotPrevSentenceActivated()) ); + connect(tray, TQ_SIGNAL(signalCallPreferences()), this, TQ_SLOT(slotPreferences()) ); + connect(tray, TQ_SIGNAL(signalSayActivated()), this, TQ_SLOT(slotSayText()) ); + connect(tray, TQ_SIGNAL(signalSayClipboard()), this, TQ_SLOT(slotSayClipboard()) ); + connect(tray, TQ_SIGNAL(signalShutUpActivated()), this, TQ_SLOT(slotStopActivated()) ); + connect(tray, TQ_SIGNAL(signalPauseActivated()), this, TQ_SLOT(slotPauseActivated()) ); + connect(tray, TQ_SIGNAL(signalNextActivated()), this, TQ_SLOT(slotNextSentenceActivated()) ); + connect(tray, TQ_SIGNAL(signalPrevActivated()), this, TQ_SLOT(slotPrevSentenceActivated()) ); tray->show(); tray->setEnabled(true); @@ -141,61 +141,61 @@ KSayItApp::~KSayItApp() void KSayItApp::initActions() { // Standard-Actions - open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - save = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - saveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotCloseMainWindow()), actionCollection()); - cut = KStdAction::cut(view, TQT_SLOT(slotCut()), actionCollection()); - copy = KStdAction::copy(view, TQT_SLOT(slotCopy()), actionCollection()); - paste = KStdAction::paste(view, TQT_SLOT(slotPaste()), actionCollection()); - preferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actionCollection()); + open = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + save = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + saveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotCloseMainWindow()), actionCollection()); + cut = KStdAction::cut(view, TQ_SLOT(slotCut()), actionCollection()); + copy = KStdAction::copy(view, TQ_SLOT(slotCopy()), actionCollection()); + paste = KStdAction::paste(view, TQ_SLOT(slotPaste()), actionCollection()); + preferences = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbar()), actionCollection()); KStdAction::showToolbar("mainToolBar", actionCollection()); - statusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), actionCollection()); + statusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()), actionCollection()); // User defined actions say = new TDEAction (i18n("Say"), TQt::Key_F9, - this, TQT_SLOT (slotSayText()), + this, TQ_SLOT (slotSayText()), actionCollection(), "say_it"); pause = new TDEAction (i18n("Pause"), TQt::Key_Pause, - this, TQT_SLOT (slotPauseActivated()), + this, TQ_SLOT (slotPauseActivated()), actionCollection(), "pause"); shutup = new TDEAction (i18n("Shut Up"), TQt::Key_F10, - this, TQT_SLOT (slotStopActivated()), + this, TQ_SLOT (slotStopActivated()), actionCollection(), "shut_up"); next_sentence = new TDEAction (i18n("Next Sentence"), TQt::Key_Next, - this, TQT_SLOT (slotNextSentenceActivated()), + this, TQ_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); prev_sentence = new TDEAction (i18n("Previous Sentence"), TQt::Key_Prior, - this, TQT_SLOT(slotPrevSentenceActivated()), + this, TQ_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); clear = new TDEAction (i18n("Clear"), TQt::Key_F12, - this, TQT_SLOT(slotClear()), + this, TQ_SLOT(slotClear()), actionCollection(), "clear"); edit = new TDEToggleAction( i18n("Edit Text"), 0, - this, TQT_SLOT(slotEditToggled()), + this, TQ_SLOT(slotEditToggled()), actionCollection(), "edittext"); @@ -325,14 +325,14 @@ void KSayItApp::initView() view->setMinimumSize(view->sizeHint()); setCentralWidget(view); // connections - connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)), - this, TQT_SLOT(slotEnableCopyCut(bool))); - connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)), - this, TQT_SLOT(slotStatusMsg(const TQString &))); - connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)), - this, TQT_SLOT(slotSetCaption(const TQString &))); - connect( view, TQT_SIGNAL(signalTextChanged(bool)), - this, TQT_SLOT(slotTextChanged(bool)) ); + connect( view, TQ_SIGNAL(signalEnableCopyCut(bool)), + this, TQ_SLOT(slotEnableCopyCut(bool))); + connect( view, TQ_SIGNAL(signalShowStatus(const TQString &)), + this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect( view, TQ_SIGNAL(signalSetCaption(const TQString &)), + this, TQ_SLOT(slotSetCaption(const TQString &))); + connect( view, TQ_SIGNAL(signalTextChanged(bool)), + this, TQ_SLOT(slotTextChanged(bool)) ); // DockWindow TQDockWindow *docview = new TQDockWindow(TQDockWindow::InDock, this, "docview"); @@ -344,22 +344,22 @@ void KSayItApp::initView() this->setDockEnabled(docview, TQt::DockTop, false); this->setDockEnabled(docview, TQt::DockBottom, false); this->moveDockWindow(docview, TQt::DockLeft); - connect( treeview, TQT_SIGNAL(signalContentChanged(const TQString&)), - this, TQT_SLOT(slotTreeViewChanged(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalSetText(const TQString&)), - this, TQT_SLOT(slotSetText(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalAllNodesProcessed()), - this, TQT_SLOT(slotSayNode()) ); - connect( treeview, TQT_SIGNAL(signalEnableTextedit(bool)), - this, TQT_SLOT(slotEnableTextedit(bool)) ); - connect( treeview, TQT_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)), - this, TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalSetBookmarkFilename(const TQString&)), - this, TQT_SLOT(slotSetBookmarkFilename(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalChangeBookmarkFilename(const TQString&)), - this, TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) ); - connect( treeview, TQT_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)), - this, TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalContentChanged(const TQString&)), + this, TQ_SLOT(slotTreeViewChanged(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalSetText(const TQString&)), + this, TQ_SLOT(slotSetText(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalAllNodesProcessed()), + this, TQ_SLOT(slotSayNode()) ); + connect( treeview, TQ_SIGNAL(signalEnableTextedit(bool)), + this, TQ_SLOT(slotEnableTextedit(bool)) ); + connect( treeview, TQ_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)), + this, TQ_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalSetBookmarkFilename(const TQString&)), + this, TQ_SLOT(slotSetBookmarkFilename(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalChangeBookmarkFilename(const TQString&)), + this, TQ_SLOT(slotChangeBookmarkFilename(const TQString&)) ); + connect( treeview, TQ_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)), + this, TQ_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); } @@ -425,7 +425,7 @@ ASYNC KSayItApp::dcopSayXmlFile(KURL url) ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KSayItApp::slotEditToggled() @@ -451,7 +451,7 @@ void KSayItApp::slotConfigureToolbar() { saveMainWindowSettings( config, "MainWindow" ); KEditToolbar dlg(actionCollection(), KSAYITUI); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); if (dlg.exec()) { createGUI(KSAYITUI); diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index 7276125..42971a5 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/ksayit/src/ksayitsystemtray.cpp @@ -46,36 +46,36 @@ void KSayItSystemTray::initActions() menu = this->contextMenu(); help = new KHelpMenu(this, kapp->aboutData(), false, actionCollection()); // Standard actions - settings = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection()); - help_about = KStdAction::aboutApp(help, TQT_SLOT(aboutApplication()), actionCollection()); - help_kde = KStdAction::aboutKDE(help, TQT_SLOT(aboutKDE()), actionCollection()); + settings = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actionCollection()); + help_about = KStdAction::aboutApp(help, TQ_SLOT(aboutApplication()), actionCollection()); + help_kde = KStdAction::aboutKDE(help, TQ_SLOT(aboutKDE()), actionCollection()); // User defined actions say = new TDEAction(i18n("Say"), "media-playback-start", 0, - this, TQT_SLOT (slotSayActivated()), + this, TQ_SLOT (slotSayActivated()), actionCollection(), "say_it"); shutup = new TDEAction(i18n("Shut Up"), "media-playback-stop", 0, - this, TQT_SLOT (slotStopActivated()), + this, TQ_SLOT (slotStopActivated()), actionCollection(), "shut_up"); pause = new TDEAction (i18n("Pause"), "media-playback-pause", 0, - this, TQT_SLOT (slotPauseActivated()), + this, TQ_SLOT (slotPauseActivated()), actionCollection(), "pause"); next_sentence = new TDEAction (i18n("Next Sentence"), "2rightarrow", 0, - this, TQT_SLOT (slotNextSentenceActivated()), + this, TQ_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); @@ -83,7 +83,7 @@ void KSayItSystemTray::initActions() prev_sentence = new TDEAction (i18n("Previous Sentence"), "2leftarrow", 0, - this, TQT_SLOT(slotPrevSentenceActivated()), + this, TQ_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 6b1a270..d04aabc 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -51,7 +51,7 @@ VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString { setIconListAllVisible(true); - connect (this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageChanged(TQWidget*))); + connect (this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageChanged(TQWidget*))); initVoicePage(); initFXPage(); @@ -83,9 +83,9 @@ void VoiceSetupDlg::initFXPage() FX_SetupImpl *fxDialog = new FX_SetupImpl(m_fxPage, "fxsetup", m_config, m_fxpluginhandler); fxLayout->addWidget(fxDialog); - connect( this, TQT_SIGNAL(signalOKWasClicked()), fxDialog, TQT_SLOT(slotSaveWasClicked()) ); - connect( this, TQT_SIGNAL(signalRemoveAllFX()), fxDialog, TQT_SLOT(slotRemoveAll()) ); - connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) ); + connect( this, TQ_SIGNAL(signalOKWasClicked()), fxDialog, TQ_SLOT(slotSaveWasClicked()) ); + connect( this, TQ_SIGNAL(signalRemoveAllFX()), fxDialog, TQ_SLOT(slotRemoveAll()) ); + connect( this, TQ_SIGNAL(signalReloadFX()), fxDialog, TQ_SLOT(slotReload()) ); // Disable/enable FX-Setup depending on TTS-libs capability int status = m_kttslib->getStatus() & TTS::AUDIOFILE; -- cgit v1.2.1