diff options
| author | Michele Calgaro <[email protected]> | 2024-01-11 10:29:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-01-11 10:33:58 +0900 |
| commit | c04ba2b3810f5a0187b3ca3b89661d0befca9e08 (patch) | |
| tree | 066dc3e0519834fae3dc25d6f05f66811c9f2994 | |
| parent | b56bafedd5d0e16aaae8e6364b92767540b20fe0 (diff) | |
| download | tdeaccessibility-c04ba2b3810f5a0187b3ca3b89661d0befca9e08.tar.gz tdeaccessibility-c04ba2b3810f5a0187b3ca3b89661d0befca9e08.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
55 files changed, 708 insertions, 708 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index e93d290..30dc5c5 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -113,7 +113,7 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, accessxFeatures = 0; //startTimer(100); // ten times a second - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); kapp->installX11EventFilter (this); int opcode_rtn, error_rtn; @@ -139,27 +139,27 @@ void KbStateApplet::buildPopupMenu() sizePopup->insertItem(i18n("Small"), 13); sizePopup->insertItem(i18n("Medium"), 20); sizePopup->insertItem(i18n("Large"), 26); - connect(sizePopup,TQT_SIGNAL(activated(int)), this, TQT_SLOT(setIconDim(int))); + connect(sizePopup,TQ_SIGNAL(activated(int)), this, TQ_SLOT(setIconDim(int))); showPopup=new TDEPopupMenu(this); showPopup->setCheckable( true ); - modifierItem=showPopup->insertItem(i18n("Modifier Keys"), this, TQT_SLOT(toggleModifier())); - lockkeysItem=showPopup->insertItem(i18n("Lock Keys"), this, TQT_SLOT(toggleLockkeys())); - mouseItem=showPopup->insertItem(i18n("Mouse Status"), this, TQT_SLOT(toggleMouse())); - accessxItem=showPopup->insertItem(i18n("AccessX Status"), this, TQT_SLOT(toggleAccessX())); + modifierItem=showPopup->insertItem(i18n("Modifier Keys"), this, TQ_SLOT(toggleModifier())); + lockkeysItem=showPopup->insertItem(i18n("Lock Keys"), this, TQ_SLOT(toggleLockkeys())); + mouseItem=showPopup->insertItem(i18n("Mouse Status"), this, TQ_SLOT(toggleMouse())); + accessxItem=showPopup->insertItem(i18n("AccessX Status"), this, TQ_SLOT(toggleAccessX())); popup = new TDEPopupMenu(this); popup->setCheckable( true ); popup->insertTitle(0, i18n("Keyboard Status Applet")); popup->insertItem(i18n("Set Icon Size"),sizePopup); fillSpaceItem = popup->insertItem(i18n("Fill Available Space"), - this, TQT_SLOT(toggleFillSpace())); + this, TQ_SLOT(toggleFillSpace())); popup->insertItem(i18n("Show"),showPopup); - popup->insertItem(i18n("Configure AccessX Features..."), this, TQT_SLOT(configureAccessX())); - popup->insertItem(i18n("Configure Keyboard..."), this, TQT_SLOT(configureKeyboard())); - popup->insertItem(i18n("Configure Mouse..."), this, TQT_SLOT(configureMouse())); + popup->insertItem(i18n("Configure AccessX Features..."), this, TQ_SLOT(configureAccessX())); + popup->insertItem(i18n("Configure Keyboard..."), this, TQ_SLOT(configureKeyboard())); + popup->insertItem(i18n("Configure Mouse..."), this, TQ_SLOT(configureMouse())); popup->insertSeparator(); - popup->insertItem(i18n("About"), this, TQT_SLOT(about())); + popup->insertItem(i18n("About"), this, TQ_SLOT(about())); setCustomMenu(popup); updateMenu(); } @@ -547,8 +547,8 @@ void KbStateApplet::initMasks() { if ((map <= 7) && !(icons[map])) { icons[map] = new KeyIcon (i, instance, this, modifierKeys[i].name); TQToolTip::add (icons[map], i18n (modifierKeys[i].name)); - connect (icons[map], TQT_SIGNAL(stateChangeRequest (KeyIcon*,bool,bool)), - TQT_SLOT(stateChangeRequest (KeyIcon*,bool,bool))); + connect (icons[map], TQ_SIGNAL(stateChangeRequest (KeyIcon*,bool,bool)), + TQ_SLOT(stateChangeRequest (KeyIcon*,bool,bool))); if (modifierKeys[i].isModifier) modifiers.append(icons[map]); else @@ -755,7 +755,7 @@ KeyIcon::KeyIcon (int keyId, TDEInstance *instance, isLocked = false; isLatched = false; updateImages (); - connect (this, TQT_SIGNAL(clicked()), TQT_SLOT(clickedSlot())); + connect (this, TQ_SIGNAL(clicked()), TQ_SLOT(clickedSlot())); } KeyIcon::~KeyIcon () { @@ -862,7 +862,7 @@ MouseIcon::MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name) state = 0; activekey = 0; updateImages (); - connect (this, TQT_SIGNAL(clicked()), TQT_SLOT(clickedSlot())); + connect (this, TQ_SIGNAL(clicked()), TQ_SLOT(clickedSlot())); } MouseIcon::~MouseIcon () { @@ -964,7 +964,7 @@ TimeoutIcon::TimeoutIcon (TDEInstance *instance, const TQString &text, this->featurename = featurename; glyth = " "; setImage (featurename); - connect (&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect (&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); } TimeoutIcon::~TimeoutIcon () { diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index d3d8492..3c4fd66 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -127,91 +127,91 @@ KmagApp::~KmagApp() void KmagApp::initActions() { fileNewWindow = new TDEAction(i18n("New &Window"), "window-new", TDEStdAccel::openNew(), this, - TQT_SLOT(slotFileNewWindow()), actionCollection(),"new_window"); + TQ_SLOT(slotFileNewWindow()), actionCollection(),"new_window"); fileNewWindow->setToolTip(i18n("Open a new KMagnifier window")); refreshSwitch = new TDEAction(i18n("&Stop"), "process-stop", TDEStdAccel::reload(), this, - TQT_SLOT(slotToggleRefresh()), actionCollection(), "start_stop_refresh"); + TQ_SLOT(slotToggleRefresh()), actionCollection(), "start_stop_refresh"); refreshSwitch->setToolTip(i18n("Click to stop window refresh")); refreshSwitch->setWhatsThis(i18n("Clicking on this icon will <b>start</b> / <b>stop</b>\ updating of the display. Stopping the update will zero the processing power\ required (CPU usage)")); m_pSnapshot = new TDEAction(i18n("&Save Snapshot As..."), "ksnapshot", TDEStdAccel::save(), this, - TQT_SLOT(saveZoomPixmap()), actionCollection(),"snapshot"); + TQ_SLOT(saveZoomPixmap()), actionCollection(),"snapshot"); m_pSnapshot->setWhatsThis(i18n("Saves the zoomed view to an image file.")); m_pSnapshot->setToolTip(i18n("Save image to a file")); - m_pPrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection(), "print"); + m_pPrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection(), "print"); m_pPrint->setWhatsThis(i18n("Click on this button to print the current zoomed view.")); - m_pQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection(), "quit"); + m_pQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection(), "quit"); m_pQuit->setStatusText(i18n("Quits the application")); m_pQuit->setWhatsThis (i18n("Quits the application")); - m_pCopy = KStdAction::copy(this, TQT_SLOT(copyToClipBoard()), actionCollection(), "copy"); + m_pCopy = KStdAction::copy(this, TQ_SLOT(copyToClipBoard()), actionCollection(), "copy"); m_pCopy->setWhatsThis(i18n("Click on this button to copy the current zoomed view to the clipboard which you can paste in other applications.")); m_pCopy->setToolTip(i18n("Copy zoomed image to clipboard")); m_pShowMenu = new TDEToggleAction(i18n("Show &Menu"), "showmenu", CTRL+Key_M, this, - TQT_SLOT(slotShowMenu()), actionCollection(),"show_menu"); + TQ_SLOT(slotShowMenu()), actionCollection(),"show_menu"); #ifdef havesetCheckedState m_pShowMenu->setCheckedState(i18n("Hide &Menu")); #endif m_pShowMainToolBar = new TDEToggleAction(i18n("Show Main &Toolbar"), 0, 0, this, - TQT_SLOT(slotShowMainToolBar()), actionCollection(),"show_mainToolBar"); + TQ_SLOT(slotShowMainToolBar()), actionCollection(),"show_mainToolBar"); #ifdef havesetCheckedState m_pShowMainToolBar->setCheckedState(i18n("Hide Main &Toolbar")); #endif m_pShowViewToolBar = new TDEToggleAction(i18n("Show &View Toolbar"), 0, 0, this, - TQT_SLOT(slotShowViewToolBar()), actionCollection(),"show_viewToolBar"); + TQ_SLOT(slotShowViewToolBar()), actionCollection(),"show_viewToolBar"); #ifdef havesetCheckedState m_pShowViewToolBar->setCheckedState(i18n("Hide &View Toolbar")); #endif m_pShowSettingsToolBar = new TDEToggleAction(i18n("Show &Settings Toolbar"), 0, 0, this, - TQT_SLOT(slotShowSettingsToolBar()), actionCollection(),"show_settingsToolBar"); + TQ_SLOT(slotShowSettingsToolBar()), actionCollection(),"show_settingsToolBar"); #ifdef havesetCheckedState m_pShowSettingsToolBar->setCheckedState(i18n("Hide &Settings Toolbar")); #endif m_modeFollowMouse = new TDERadioAction(i18n("&Follow Mouse Mode"), "followmouse", Key_F1, this, - TQT_SLOT(slotModeFollowMouse()), actionCollection(), "mode_followmouse"); + TQ_SLOT(slotModeFollowMouse()), actionCollection(), "mode_followmouse"); m_modeFollowMouse->setToolTip(i18n("Magnify mouse area into window")); m_modeFollowMouse->setWhatsThis(i18n("In this mode the area around the mouse cursor is shown in a normal window.")); m_modeSelWin = new TDERadioAction(i18n("S&election Window Mode"), "window", Key_F2, this, - TQT_SLOT(slotModeSelWin()), actionCollection(), "mode_selectionwindow"); + TQ_SLOT(slotModeSelWin()), actionCollection(), "mode_selectionwindow"); m_modeSelWin->setToolTip(i18n("Magnify selected area into window")); m_modeSelWin->setWhatsThis(i18n("In this mode a selection window is opened. The selected area is shown in a normal window.")); m_modeEdgeTop = new TDERadioAction(i18n("&Top Screen Edge Mode"), 0, 0, this, - TQT_SLOT(slotModeEdgeTop()), actionCollection(),"mode_edgetop"); + TQ_SLOT(slotModeEdgeTop()), actionCollection(),"mode_edgetop"); m_modeEdgeTop->setToolTip(i18n("Magnify mouse area to top screen edge")); m_modeEdgeTop->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the top screen edge.")); m_modeEdgeLeft = new TDERadioAction(i18n("&Left Screen Edge Mode"), 0, 0, this, - TQT_SLOT(slotModeEdgeLeft()), actionCollection(),"mode_edgeleft"); + TQ_SLOT(slotModeEdgeLeft()), actionCollection(),"mode_edgeleft"); m_modeEdgeLeft->setToolTip(i18n("Magnify mouse area to left screen edge")); m_modeEdgeLeft->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the left screen edge.")); m_modeEdgeRight = new TDERadioAction(i18n("&Right Screen Edge Mode"), 0, 0, this, - TQT_SLOT(slotModeEdgeRight()), actionCollection(),"mode_edgeright"); + TQ_SLOT(slotModeEdgeRight()), actionCollection(),"mode_edgeright"); m_modeEdgeRight->setToolTip(i18n("Magnify mouse area to right screen edge")); m_modeEdgeRight->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the right screen edge.")); m_modeEdgeBottom = new TDERadioAction(i18n("&Bottom Screen Edge Mode"), 0, 0, this, - TQT_SLOT(slotModeEdgeBottom()), actionCollection(),"mode_edgebottom"); + TQ_SLOT(slotModeEdgeBottom()), actionCollection(),"mode_edgebottom"); m_modeEdgeBottom->setToolTip(i18n("Magnify mouse area to bottom screen edge")); m_modeEdgeBottom->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the bottom screen edge.")); m_hideCursor = new TDEToggleAction(i18n("Hide Mouse &Cursor"), "hidemouse", Key_F4, this, - TQT_SLOT(slotToggleHideCursor()), actionCollection(), "hidecursor"); + TQ_SLOT(slotToggleHideCursor()), actionCollection(), "hidecursor"); #ifdef havesetCheckedState m_hideCursor->setCheckedState(i18n("Show Mouse &Cursor")); #endif m_hideCursor->setToolTip(i18n("Hide the mouse cursor")); - m_pZoomIn = KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection(), "zoom_in"); + m_pZoomIn = KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection(), "zoom_in"); m_pZoomIn->setWhatsThis(i18n("Click on this button to <b>zoom-in</b> on the selected region.")); m_pZoomBox = new TDESelectAction(i18n("&Zoom"),0,actionCollection(),"zoom"); @@ -219,11 +219,11 @@ void KmagApp::initActions() m_pZoomBox->setWhatsThis(i18n("Select the zoom factor.")); m_pZoomBox->setToolTip(i18n("Zoom factor")); - m_pZoomOut = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection(), "zoom_out"); + m_pZoomOut = KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection(), "zoom_out"); m_pZoomOut->setWhatsThis(i18n("Click on this button to <b>zoom-out</b> on the selected region.")); m_pInvert = new TDEToggleAction(i18n("&Invert Colors"), 0, Key_F6, this, - TQT_SLOT(slotToggleInvert()), actionCollection(), "invert"); + TQ_SLOT(slotToggleInvert()), actionCollection(), "invert"); m_pRotationBox = new TDESelectAction(i18n("&Rotation"),0,actionCollection(),"rotation"); m_pRotationBox->setItems(rotationArrayString); @@ -232,8 +232,8 @@ void KmagApp::initActions() // KHelpMenu *newHelpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData()); - m_keyConf = KStdAction::keyBindings( this, TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf"); - m_toolConf = KStdAction::configureToolbars( this, TQT_SLOT( slotEditToolbars() ), + m_keyConf = KStdAction::keyBindings( this, TQ_SLOT( slotConfKeys() ), actionCollection(), "key_conf"); + m_toolConf = KStdAction::configureToolbars( this, TQ_SLOT( slotEditToolbars() ), actionCollection(), "toolbar_conf"); m_pFPSBox = new TDESelectAction(i18n("Re&fresh"),0,actionCollection(),"fps_selector"); @@ -260,21 +260,21 @@ void KmagApp::initView() void KmagApp::initConnections() { // change in zoom value -> update the view - connect(this, TQT_SIGNAL(updateZoomValue(float)), m_zoomView, TQT_SLOT(setZoom(float))); - connect(this, TQT_SIGNAL(updateRotationValue(int)), m_zoomView, TQT_SLOT(setRotation(int))); - connect(this, TQT_SIGNAL(updateFPSValue(float)), m_zoomView, TQT_SLOT(setRefreshRate(float))); + connect(this, TQ_SIGNAL(updateZoomValue(float)), m_zoomView, TQ_SLOT(setZoom(float))); + connect(this, TQ_SIGNAL(updateRotationValue(int)), m_zoomView, TQ_SLOT(setRotation(int))); + connect(this, TQ_SIGNAL(updateFPSValue(float)), m_zoomView, TQ_SLOT(setRefreshRate(float))); // change in zoom index -> update the selector - connect(this, TQT_SIGNAL(updateZoomIndex(int)), m_pZoomBox, TQT_SLOT(setCurrentItem(int))); - connect(this, TQT_SIGNAL(updateRotationIndex(int)), m_pRotationBox, TQT_SLOT(setCurrentItem(int))); - connect(this, TQT_SIGNAL(updateFPSIndex(int)), m_pFPSBox, TQT_SLOT(setCurrentItem(int))); + connect(this, TQ_SIGNAL(updateZoomIndex(int)), m_pZoomBox, TQ_SLOT(setCurrentItem(int))); + connect(this, TQ_SIGNAL(updateRotationIndex(int)), m_pRotationBox, TQ_SLOT(setCurrentItem(int))); + connect(this, TQ_SIGNAL(updateFPSIndex(int)), m_pFPSBox, TQ_SLOT(setCurrentItem(int))); // selector selects a zoom index -> set the zoom index - connect(m_pZoomBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setZoomIndex(int))); - connect(m_pRotationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRotationIndex(int))); - connect(m_pFPSBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setFPSIndex(int))); + connect(m_pZoomBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setZoomIndex(int))); + connect(m_pRotationBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setRotationIndex(int))); + connect(m_pFPSBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setFPSIndex(int))); - connect(m_zoomView, TQT_SIGNAL(contextMenu(TQPoint)), this, TQT_SLOT(contextMenu(TQPoint))); + connect(m_zoomView, TQ_SIGNAL(contextMenu(TQPoint)), this, TQ_SLOT(contextMenu(TQPoint))); } /** @@ -419,7 +419,7 @@ bool KmagApp::queryExit() ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// /** @@ -935,7 +935,7 @@ void KmagApp::slotEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ) ); if ( dlg.exec() ) createGUI(); } diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index ba49fe3..997327b 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -162,7 +162,7 @@ void KMagSelRect::show() { if (selectionwindow == 0) { selectionwindow = new KMagSelWin (selWindowParent, "selectionwindow"); - connect (selectionwindow, TQT_SIGNAL (resized ()), this, TQT_SLOT (selWinResized ())); + connect (selectionwindow, TQ_SIGNAL (resized ()), this, TQ_SLOT (selWinResized ())); update(); selectionwindow->show(); @@ -226,32 +226,32 @@ KMagSelWin::KMagSelWin ( TQWidget * parent, const char * name, WFlags ) : titleBar->setPaletteBackgroundColor (getTitleColor ()); titleBar->setPaletteForegroundColor (getTextColor ()); titleBar->setText(i18n("Selection Window")+" - "+i18n("KMagnifier")); - connect (titleBar, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); - connect (titleBar, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (titleMoved (TQPoint))); + connect (titleBar, TQ_SIGNAL (startResizing ()), this, TQ_SLOT (startResizing ())); + connect (titleBar, TQ_SIGNAL (resized (TQPoint)), this, TQ_SLOT (titleMoved (TQPoint))); topLeftCorner = new KMagSelWinCorner (this, "topleft"); topLeftCorner->setCursor (TQt::SizeFDiagCursor); topLeftCorner->setPaletteBackgroundColor (getTitleBtnColor ()); - connect (topLeftCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); - connect (topLeftCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (topLeftResized (TQPoint))); + connect (topLeftCorner, TQ_SIGNAL (startResizing ()), this, TQ_SLOT (startResizing ())); + connect (topLeftCorner, TQ_SIGNAL (resized (TQPoint)), this, TQ_SLOT (topLeftResized (TQPoint))); topRightCorner = new KMagSelWinCorner (this, "topright"); topRightCorner->setCursor (TQt::SizeBDiagCursor); topRightCorner->setPaletteBackgroundColor (getTitleBtnColor ()); - connect (topRightCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); - connect (topRightCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (topRightResized (TQPoint))); + connect (topRightCorner, TQ_SIGNAL (startResizing ()), this, TQ_SLOT (startResizing ())); + connect (topRightCorner, TQ_SIGNAL (resized (TQPoint)), this, TQ_SLOT (topRightResized (TQPoint))); bottomLeftCorner = new KMagSelWinCorner (this, "bottomleft"); bottomLeftCorner->setCursor (TQt::SizeBDiagCursor); bottomLeftCorner->setPaletteBackgroundColor (getTitleBtnColor ()); - connect (bottomLeftCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); - connect (bottomLeftCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (bottomLeftResized (TQPoint))); + connect (bottomLeftCorner, TQ_SIGNAL (startResizing ()), this, TQ_SLOT (startResizing ())); + connect (bottomLeftCorner, TQ_SIGNAL (resized (TQPoint)), this, TQ_SLOT (bottomLeftResized (TQPoint))); bottomRightCorner = new KMagSelWinCorner (this, "bottomright"); bottomRightCorner->setCursor (TQt::SizeFDiagCursor); bottomRightCorner->setPaletteBackgroundColor (getTitleBtnColor ()); - connect (bottomRightCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); - connect (bottomRightCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (bottomRightResized (TQPoint))); + connect (bottomRightCorner, TQ_SIGNAL (startResizing ()), this, TQ_SLOT (startResizing ())); + connect (bottomRightCorner, TQ_SIGNAL (resized (TQPoint)), this, TQ_SLOT (bottomRightResized (TQPoint))); } KMagSelWin::~KMagSelWin() diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index bb44444..b9531e2 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -147,12 +147,12 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) setRefreshRate(10); // connect it to grabFrame() - connect(&m_grabTimer, TQT_SIGNAL(timeout()), TQT_SLOT(grabFrame())); + connect(&m_grabTimer, TQ_SIGNAL(timeout()), TQ_SLOT(grabFrame())); // start the grabTimer m_grabTimer.start(static_cast<int>(1000.0/m_fps)); // connect it to updateMouseView() - connect(&m_mouseViewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateMouseView())); + connect(&m_mouseViewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateMouseView())); // start the grabTimer @ 25 frames per second! m_mouseViewTimer.start(25); diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index ad5cbc1..728ffaf 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -255,28 +255,28 @@ KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent init_vars(); resetSettings(); - connect(movementEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(dwellTimeEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(dragTimeEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(cbDrag, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(cbStroke, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(cbClick, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(settingsChanged())); - connect(cbStart, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(settingsChanged())); - - connect(buttonStartStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(startStopSelected())); + connect(movementEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(dwellTimeEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(dragTimeEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(cbDrag, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(cbStroke, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(cbClick, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(settingsChanged())); + connect(cbStart, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(settingsChanged())); + + connect(buttonStartStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(startStopSelected())); buttonDefault->setGuiItem(KStdGuiItem::defaults()); - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(defaultSelected())); - connect(buttonReset, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetSelected())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(defaultSelected())); + connect(buttonReset, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetSelected())); buttonApply->setGuiItem(KStdGuiItem::apply()); - connect(buttonApply, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySelected())); + connect(buttonApply, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySelected())); buttonHelp->setGuiItem(KStdGuiItem::help()); - connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(helpSelected())); + connect(buttonHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(helpSelected())); buttonClose->setGuiItem(KStdGuiItem::close()); - connect(buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSelected())); + connect(buttonClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSelected())); #if TDE_VERSION >= TDE_MAKE_VERSION (3,1,90) buttonQuit->setGuiItem(KStdGuiItem::quit()); #endif // KDE 3.2 - connect(buttonQuit, TQT_SIGNAL(clicked()), this, TQT_SLOT(quitSelected())); + connect(buttonQuit, TQ_SIGNAL(clicked()), this, TQ_SLOT(quitSelected())); // When we first start, it's nice to not click immediately. // So, tell MT we're just starting @@ -285,11 +285,11 @@ KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent startTimer(100); trayIcon = new KMouseToolTray (this, "systemTrayIcon"); updateStartStopText (); - connect(trayIcon, TQT_SIGNAL(startStopSelected()), this, TQT_SLOT(startStopSelected())); - connect(trayIcon, TQT_SIGNAL(configureSelected()), this, TQT_SLOT(configureSelected())); - connect(trayIcon, TQT_SIGNAL(aboutSelected()), this, TQT_SLOT(aboutSelected())); - connect(trayIcon, TQT_SIGNAL(helpSelected()), this, TQT_SLOT(helpSelected())); - connect(trayIcon, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected())); + connect(trayIcon, TQ_SIGNAL(startStopSelected()), this, TQ_SLOT(startStopSelected())); + connect(trayIcon, TQ_SIGNAL(configureSelected()), this, TQ_SLOT(configureSelected())); + connect(trayIcon, TQ_SIGNAL(aboutSelected()), this, TQ_SLOT(aboutSelected())); + connect(trayIcon, TQ_SIGNAL(helpSelected()), this, TQ_SLOT(helpSelected())); + connect(trayIcon, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitSelected())); aboutDlg = new TDEAboutApplication (0, "KMouseToolDlg", false); } @@ -610,15 +610,15 @@ void KMouseTool::aboutSelected() KMouseToolTray::KMouseToolTray (TQWidget *parent, const char *name) : KSystemTray (parent, name) { - startStopId = contextMenu()->insertItem (i18n("&Start"), this, TQT_SIGNAL(startStopSelected())); + startStopId = contextMenu()->insertItem (i18n("&Start"), this, TQ_SIGNAL(startStopSelected())); contextMenu()->insertSeparator(); contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small), - i18n("&Configure KMouseTool..."), this, TQT_SIGNAL(configureSelected())); + i18n("&Configure KMouseTool..."), this, TQ_SIGNAL(configureSelected())); contextMenu()->insertSeparator(); contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::Small), - i18n("KMousetool &Handbook"), this, TQT_SIGNAL(helpSelected())); + i18n("KMousetool &Handbook"), this, TQ_SIGNAL(helpSelected())); contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kmousetool", TDEIcon::Small), - i18n("&About KMouseTool"), this, TQT_SIGNAL(aboutSelected())); + i18n("&About KMouseTool"), this, TQ_SIGNAL(aboutSelected())); } KMouseToolTray::~KMouseToolTray() { diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 285f00e..a34e602 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -51,10 +51,10 @@ KMouthApp::KMouthApp(TQWidget* , const char* name):TDEMainWindow(0, name) initPhraseList(); initActions(); optionsDialog = new OptionsDialog(this); - connect (optionsDialog, TQT_SIGNAL(configurationChanged ()), - this, TQT_SLOT(slotConfigurationChanged ())); - connect (optionsDialog, TQT_SIGNAL(configurationChanged ()), - phraseList, TQT_SLOT(configureCompletion ())); + connect (optionsDialog, TQ_SIGNAL(configurationChanged ()), + this, TQ_SLOT(slotConfigurationChanged ())); + connect (optionsDialog, TQ_SIGNAL(configurationChanged ()), + phraseList, TQ_SLOT(configureCompletion ())); phrases = new TDEActionCollection (this); @@ -95,57 +95,57 @@ bool KMouthApp::configured() { void KMouthApp::initActions() { // The "File" menu - fileOpen = new TDEAction(i18n("&Open as History..."), "phrasehistory_open", TDEStdAccel::open(), this, TQT_SLOT(slotFileOpen()), actionCollection(),"file_open"); + fileOpen = new TDEAction(i18n("&Open as History..."), "phrasehistory_open", TDEStdAccel::open(), this, TQ_SLOT(slotFileOpen()), actionCollection(),"file_open"); fileOpen->setStatusText(i18n("Opens an existing file as history")); fileOpen->setWhatsThis (i18n("Opens an existing file as history")); - fileSaveAs = new TDEAction(i18n("Save &History As..."), "phrasehistory_save", TDEStdAccel::save(), this, TQT_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); + fileSaveAs = new TDEAction(i18n("Save &History As..."), "phrasehistory_save", TDEStdAccel::save(), this, TQ_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); fileSaveAs->setStatusText(i18n("Saves the actual history as...")); fileSaveAs->setWhatsThis (i18n("Saves the actual history as...")); - filePrint = new TDEAction(i18n("&Print History..."), "phrasehistory_print", TDEStdAccel::print(), this, TQT_SLOT(slotFilePrint()), actionCollection(),"file_print"); + filePrint = new TDEAction(i18n("&Print History..."), "phrasehistory_print", TDEStdAccel::print(), this, TQ_SLOT(slotFilePrint()), actionCollection(),"file_print"); filePrint->setStatusText(i18n("Prints out the actual history")); filePrint->setWhatsThis (i18n("Prints out the actual history")); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setWhatsThis (i18n("Quits the application")); // The "Edit" menu - editCut = KStdAction::cut(phraseList, TQT_SLOT(cut()), actionCollection()); + editCut = KStdAction::cut(phraseList, TQ_SLOT(cut()), actionCollection()); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the selected section and puts it to the clipboard. If there is some text selected in the edit field it is placed it on the clipboard. Otherwise the selected sentences in the history (if any) are placed on the clipboard.")); - editCopy = KStdAction::copy(phraseList, TQT_SLOT(copy()), actionCollection()); + editCopy = KStdAction::copy(phraseList, TQ_SLOT(copy()), actionCollection()); editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); editCopy->setWhatsThis (i18n("Copies the selected section to the clipboard. If there is some text selected in the edit field it is copied to the clipboard. Otherwise the selected sentences in the history (if any) are copied to the clipboard.")); - editPaste = KStdAction::paste(phraseList, TQT_SLOT(paste()), actionCollection()); + editPaste = KStdAction::paste(phraseList, TQ_SLOT(paste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents at the current cursor position into the edit field.")); - editSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQT_SLOT(speak()), actionCollection(),"edit_speak"); + editSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQ_SLOT(speak()), actionCollection(),"edit_speak"); editSpeak->setStatusText(i18n("Speaks the currently active sentence(s)")); editSpeak->setWhatsThis (i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); // The "Phrase book" menu - phrasebookEdit = new TDEAction(i18n("&Edit..."), 0, 0, this, TQT_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); + phrasebookEdit = new TDEAction(i18n("&Edit..."), 0, 0, this, TQ_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); // The "Options" menu - viewMenuBar = KStdAction::showMenubar(this, TQT_SLOT(slotViewMenuBar()), actionCollection()); - viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), actionCollection()); + viewMenuBar = KStdAction::showMenubar(this, TQ_SLOT(slotViewMenuBar()), actionCollection()); + viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), actionCollection()); viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewToolBar->setWhatsThis (i18n("Enables/disables the toolbar")); - viewPhrasebookBar = new TDEToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, this, TQT_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); + viewPhrasebookBar = new TDEToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, this, TQ_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); viewPhrasebookBar->setStatusText(i18n("Enables/disables the phrasebook bar")); viewPhrasebookBar->setWhatsThis (i18n("Enables/disables the phrasebook bar")); - viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotViewStatusBar()), actionCollection()); + viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), actionCollection()); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setWhatsThis (i18n("Enables/disables the statusbar")); - configureTTS = new TDEAction (i18n("&Configure KMouth..."), "configure", 0, this, TQT_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); + configureTTS = new TDEAction (i18n("&Configure KMouth..."), "configure", 0, this, TQ_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); configureTTS->setStatusText(i18n("Opens the configuration dialog")); configureTTS->setWhatsThis (i18n("Opens the configuration dialog")); @@ -153,27 +153,27 @@ void KMouthApp::initActions() { // The "Help" menu will automatically get created. // The popup menu of the list of spoken sentences - phraseListSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQT_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); + phraseListSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQ_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); phraseListSpeak->setStatusText(i18n("Speaks the currently selected phrases in the history")); phraseListSpeak->setWhatsThis (i18n("Speaks the currently selected phrases in the history")); - phraseListRemove = new TDEAction (i18n("&Delete"), "edit-delete", 0, phraseList, TQT_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); + phraseListRemove = new TDEAction (i18n("&Delete"), "edit-delete", 0, phraseList, TQ_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); phraseListRemove->setStatusText(i18n("Deletes the currently selected phrases from the history")); phraseListRemove->setWhatsThis (i18n("Deletes the currently selected phrases from the history")); - phraseListCut = new TDEAction (i18n("Cu&t"), "edit-cut", 0, phraseList, TQT_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); + phraseListCut = new TDEAction (i18n("Cu&t"), "edit-cut", 0, phraseList, TQ_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); phraseListCut->setStatusText(i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); phraseListCut->setWhatsThis (i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); - phraseListCopy = new TDEAction (i18n("&Copy"), "edit-copy", 0, phraseList, TQT_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); + phraseListCopy = new TDEAction (i18n("&Copy"), "edit-copy", 0, phraseList, TQ_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); phraseListCut->setStatusText(i18n("Copies the currently selected phrases from the history to the clipboard")); phraseListCut->setWhatsThis (i18n("Copies the currently selected phrases from the history to the clipboard")); - phraselistSelectAll = new TDEAction (i18n("Select &All Entries"), 0, 0, phraseList, TQT_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); + phraselistSelectAll = new TDEAction (i18n("Select &All Entries"), 0, 0, phraseList, TQ_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); phraselistSelectAll->setStatusText(i18n("Selects all phrases in the history")); phraselistSelectAll->setWhatsThis (i18n("Selects all phrases in the history")); - phraselistDeselectAll = new TDEAction (i18n("D&eselect All Entries"), 0, 0, phraseList, TQT_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); + phraselistDeselectAll = new TDEAction (i18n("D&eselect All Entries"), 0, 0, phraseList, TQ_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); phraselistDeselectAll->setStatusText(i18n("Deselects all phrases in the history")); phraselistDeselectAll->setWhatsThis (i18n("Deselects all phrases in the history")); @@ -302,7 +302,7 @@ void KMouthApp::enableMenuEntries(bool existSelectedEntries, bool existDeselecte } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KMouthApp::slotFileOpen() { @@ -358,10 +358,10 @@ void KMouthApp::slotEditPhrasebook () { PhraseBookDialog *phraseBookDialog = PhraseBookDialog::get(); // As we do not know whether the we are already connected to the slot, // we first disconnect and then connect again. - disconnect (phraseBookDialog, TQT_SIGNAL(phrasebookConfirmed (PhraseBook &)), - this, TQT_SLOT(slotPhrasebookConfirmed (PhraseBook &))); - connect (phraseBookDialog, TQT_SIGNAL(phrasebookConfirmed (PhraseBook &)), - this, TQT_SLOT(slotPhrasebookConfirmed (PhraseBook &))); + disconnect (phraseBookDialog, TQ_SIGNAL(phrasebookConfirmed (PhraseBook &)), + this, TQ_SLOT(slotPhrasebookConfirmed (PhraseBook &))); + connect (phraseBookDialog, TQ_SIGNAL(phrasebookConfirmed (PhraseBook &)), + this, TQ_SLOT(slotPhrasebookConfirmed (PhraseBook &))); // As we do not know whether the phrase book edit window is already open, // we first open and then raise it, so that it is surely the top window. @@ -458,7 +458,7 @@ void KMouthApp::slotPhrasebookConfirmed (PhraseBook &book) { delete phrases; phrases = new TDEActionCollection (this, actionCollection()); - book.addToGUI (popup, toolbar, phrases, this, TQT_SLOT(slotPhraseSelected (const TQString &))); + book.addToGUI (popup, toolbar, phrases, this, TQ_SLOT(slotPhraseSelected (const TQString &))); TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/"); if (!bookLocation.isNull() && !bookLocation.isEmpty()) { diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h index 2e1140e..92fabeb 100644 --- a/kmouth/phrasebook/phrasebook.h +++ b/kmouth/phrasebook/phrasebook.h @@ -176,7 +176,7 @@ public: PhraseAction (const TQString& phrase, const TQString& cut, const TQObject* receiver, const char* slot, TDEActionCollection* parent) : TDEAction (phrase, "phrase", TDEShortcut(cut), 0, 0, parent, phrase.latin1()) { this->phrase = phrase; - connect (this, TQT_SIGNAL(slotActivated (const TQString &)), receiver, slot); + connect (this, TQ_SIGNAL(slotActivated (const TQString &)), receiver, slot); }; ~PhraseAction () { } diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 012f4dc..c26c7d5 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -303,17 +303,17 @@ void PhraseBookDialog::initGUI () { treeView->setAllColumnsShowFocus (true); treeView->setSelectionMode (TQListView::Extended); TQWhatsThis::add (treeView, i18n("This list contains the current phrase book in a tree structure. You can select and modify individual phrases and sub phrase books")); - connect (treeView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect (treeView, TQT_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); - connect (treeView, TQT_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), this, TQT_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); - connect (treeView, TQT_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), this, TQT_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); + connect (treeView, TQ_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); + connect (treeView, TQ_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), this, TQ_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQ_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), this, TQ_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); mainLayout->addWidget (treeView); buttonBox = new ButtonBoxWidget (page, "buttonbox"); - connect (buttonBox->lineEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotTextChanged(const TQString &))); - connect (buttonBox->noKey, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey())); - connect (buttonBox->customKey, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey())); - connect (buttonBox->keyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&))); + connect (buttonBox->lineEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotTextChanged(const TQString &))); + connect (buttonBox->noKey, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey())); + connect (buttonBox->customKey, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey())); + connect (buttonBox->keyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&))); mainLayout->addWidget (buttonBox); treeView->setFocus(); @@ -322,23 +322,23 @@ void PhraseBookDialog::initGUI () { void PhraseBookDialog::initActions() { // The file menu - fileNewPhrase = new TDEAction (i18n("&New Phrase"), "phrase_new", 0, this, TQT_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); + fileNewPhrase = new TDEAction (i18n("&New Phrase"), "phrase_new", 0, this, TQ_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); fileNewPhrase->setStatusText(i18n("Adds a new phrase")); fileNewPhrase->setWhatsThis (i18n("Adds a new phrase")); - fileNewBook = new TDEAction (i18n("New Phrase &Book"), "phrasebook_new", 0, this, TQT_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); + fileNewBook = new TDEAction (i18n("New Phrase &Book"), "phrasebook_new", 0, this, TQ_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); fileNewBook->setStatusText(i18n("Adds a new phrase book into which other books and phrases can be placed")); fileNewBook->setWhatsThis (i18n("Adds a new phrase book into which other books and phrases can be placed")); - fileSave = KStdAction::save(this, TQT_SLOT(slotSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection()); fileSave->setStatusText(i18n("Saves the phrase book onto the hard disk")); fileSave->setWhatsThis (i18n("Saves the phrase book onto the hard disk")); - fileImport = new TDEAction (i18n("&Import..."), "phrasebook_open", 0, this, TQT_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); + fileImport = new TDEAction (i18n("&Import..."), "phrasebook_open", 0, this, TQ_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); fileImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); fileImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); - toolbarImport = new TDEToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, this, TQT_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); + toolbarImport = new TDEToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, this, TQ_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); toolbarImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); toolbarImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); @@ -346,32 +346,32 @@ void PhraseBookDialog::initActions() { fileImportStandardBook->setStatusText(i18n("Imports a standard phrase book and adds its contents to the phrase book")); fileImportStandardBook->setWhatsThis (i18n("Imports a standard phrase book and adds its contents to the phrase book")); - fileExport = new TDEAction (i18n("&Export..."), "phrasebook_save", 0, this, TQT_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); + fileExport = new TDEAction (i18n("&Export..."), "phrasebook_save", 0, this, TQ_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); fileExport->setStatusText(i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); fileExport->setWhatsThis (i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); - filePrint = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); filePrint->setStatusText(i18n("Prints the currently selected phrase(s) or phrase book(s)")); filePrint->setWhatsThis (i18n("Prints the currently selected phrase(s) or phrase book(s)")); - fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(close()), actionCollection()); fileClose->setStatusText(i18n("Closes the window")); fileClose->setWhatsThis (i18n("Closes the window")); // The edit menu - editCut = KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); editCut->setStatusText(i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); - editCopy = KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); editCopy->setStatusText(i18n("Copies the currently selected entry from the phrase book to the clipboard")); editCopy->setWhatsThis (i18n("Copies the currently selected entry from the phrase book to the clipboard")); - editPaste = KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents to actual position")); - editDelete = new TDEAction (i18n("&Delete"), "edit-delete", 0, this, TQT_SLOT(slotRemove()), actionCollection(),"edit_delete"); + editDelete = new TDEAction (i18n("&Delete"), "edit-delete", 0, this, TQ_SLOT(slotRemove()), actionCollection(),"edit_delete"); editDelete->setStatusText(i18n("Deletes the selected entries from the phrase book")); editDelete->setWhatsThis (i18n("Deletes the selected entries from the phrase book")); @@ -462,7 +462,7 @@ void PhraseBookDialog::initStandardPhraseBooks () { currentNamePath = dirs; TDEAction *book = new StandardPhraseBookInsertAction ( - url, (*it).name, this, TQT_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); + url, (*it).name, this, TQ_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); parent->insert(book); if (parent == fileImportStandardBook) book->plug(toolbarImport->popupMenu()); diff --git a/kmouth/phrasebook/phrasebookdialog.h b/kmouth/phrasebook/phrasebookdialog.h index 7c04336..96260f9 100644 --- a/kmouth/phrasebook/phrasebookdialog.h +++ b/kmouth/phrasebook/phrasebookdialog.h @@ -100,7 +100,7 @@ public: StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, TDEActionCollection* parent) : TDEAction (name, "phrasebook", 0, 0, 0, parent, 0) { this->url = url; - connect (this, TQT_SIGNAL(slotActivated (const KURL &)), receiver, slot); + connect (this, TQ_SIGNAL(slotActivated (const KURL &)), receiver, slot); }; ~StandardPhraseBookInsertAction () { }; diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index 6a2bac2..f08e95a 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -81,8 +81,8 @@ PhraseTree::PhraseTree (TQWidget *parent, const char *name) phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", TDEIcon::Small); phrase = TDEGlobal::iconLoader()->loadIcon("phrase", TDEIcon::Small); - connect (this, TQT_SIGNAL(expanded (TQListViewItem *)), this, TQT_SLOT(itemExpanded (TQListViewItem *))); - connect (this, TQT_SIGNAL(collapsed (TQListViewItem *)), this, TQT_SLOT(itemCollapsed (TQListViewItem *))); + connect (this, TQ_SIGNAL(expanded (TQListViewItem *)), this, TQ_SLOT(itemExpanded (TQListViewItem *))); + connect (this, TQ_SIGNAL(collapsed (TQListViewItem *)), this, TQ_SLOT(itemCollapsed (TQListViewItem *))); } PhraseTree::~PhraseTree (){ diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index a283406..cbef4fd 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -82,13 +82,13 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam TQWhatsThis::add (speakButton, i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); rowLayout->addWidget(speakButton); - connect(dictionaryCombo, TQT_SIGNAL (activated (const TQString &)), completion, TQT_SLOT (setWordList(const TQString &))); - connect(completion, TQT_SIGNAL (wordListsChanged (const TQStringList &)), this, TQT_SLOT (configureCompletionCombo (const TQStringList &))); - connect(listBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged())); - connect(listBox, TQT_SIGNAL(contextMenuRequested (TQListBoxItem *, const TQPoint &)), TQT_SLOT(contextMenuRequested (TQListBoxItem *, const TQPoint &))); - connect(lineEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SLOT(lineEntered(const TQString &))); - connect(lineEdit, TQT_SIGNAL(textChanged (const TQString &)), TQT_SLOT(textChanged(const TQString &))); - connect(speakButton, TQT_SIGNAL( clicked ()), TQT_SLOT(speak())); + connect(dictionaryCombo, TQ_SIGNAL (activated (const TQString &)), completion, TQ_SLOT (setWordList(const TQString &))); + connect(completion, TQ_SIGNAL (wordListsChanged (const TQStringList &)), this, TQ_SLOT (configureCompletionCombo (const TQStringList &))); + connect(listBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged())); + connect(listBox, TQ_SIGNAL(contextMenuRequested (TQListBoxItem *, const TQPoint &)), TQ_SLOT(contextMenuRequested (TQListBoxItem *, const TQPoint &))); + connect(lineEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SLOT(lineEntered(const TQString &))); + connect(lineEdit, TQ_SIGNAL(textChanged (const TQString &)), TQ_SLOT(textChanged(const TQString &))); + connect(speakButton, TQ_SIGNAL( clicked ()), TQ_SLOT(speak())); } PhraseList::~PhraseList() { diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp index ae68838..ad80946 100644 --- a/kmouth/speech.cpp +++ b/kmouth/speech.cpp @@ -206,10 +206,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS // 3. create a new process process << command; - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); - connect(&process, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(wroteStdin(TDEProcess *)), this, TQ_SLOT(wroteStdin(TDEProcess *))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); // 4. start the process if (stdIn) { diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h index 12869aa..384cd1f 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h @@ -17,7 +17,7 @@ void CreationSourceDetailsUI::init() { loadLanguageList(languageButton); languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); - connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); + connect (languageButton, TQ_SIGNAL(activated(int)), this, TQ_SLOT(languageButton_activated(int))); } void CreationSourceDetailsUI::languageButton_activated (int) { diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 7211768..920fdd1 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -72,11 +72,11 @@ DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *parent, const char mergeWidget = new MergeWidget (this, "merge source page", dictionaryNames, dictionaryFiles, dictionaryLanguages); addPage (mergeWidget, i18n("Source of New Dictionary (2)")); - connect (creationSource->fileButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->directoryButton,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->kdeDocButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->mergeButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->emptyButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->fileButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->directoryButton,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->kdeDocButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->mergeButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->emptyButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); calculateAppropriate (true); } @@ -301,7 +301,7 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name, checkbox->setChecked (true); numInput->setRange (1, 100, 10, true); numInput->setValue (100); - connect (checkbox, TQT_SIGNAL (toggled(bool)), numInput, TQT_SLOT(setEnabled(bool))); + connect (checkbox, TQ_SIGNAL (toggled(bool)), numInput, TQ_SLOT(setEnabled(bool))); dictionaries.insert(*fIt, checkbox); weights.insert(*fIt, numInput); diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index ffb6715..9d72f3a 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -123,10 +123,10 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag, checkInsertPos( pi, text, index ); pi->insertItem( text, p, count(), index ); m_tags->append( tag ); - connect( p, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( p, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SIGNAL( highlighted( int ) ) ); + connect( p, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( p, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SIGNAL( highlighted( int ) ) ); } void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, @@ -169,10 +169,10 @@ void KLanguageButton::clear() setPopup( m_popup ); - connect( m_popup, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( m_popup, TQT_SIGNAL( highlighted( int ) ), - TQT_SIGNAL( highlighted( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( highlighted( int ) ), + TQ_SIGNAL( highlighted( int ) ) ); setText( TQString() ); setIconSet( TQIconSet() ); diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h index 6ce5e75..f1c3728 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui.h +++ b/kmouth/wordcompletion/wordcompletionui.ui.h @@ -17,7 +17,7 @@ void WordCompletionUI::init() { loadLanguageList(languageButton); languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); - connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); + connect (languageButton, TQ_SIGNAL(activated(int)), this, TQ_SLOT(languageButton_activated(int))); } void WordCompletionUI::languageButton_activated (int) { diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index 6e6002d..2ba1fb2 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -95,15 +95,15 @@ WordCompletionWidget::WordCompletionWidget(TQWidget *parent, const char *name) : dictionaryList->setSorting (-1); // no sorted list // Connect the signals from hte KCMKTTSDWidget to this class - connect (addButton, TQT_SIGNAL (clicked()), this, TQT_SLOT(addDictionary()) ); - connect (deleteButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (deleteDictionary()) ); - connect (moveUpButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (moveUp()) ); - connect (moveDownButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (moveDown()) ); - connect (exportButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (exportDictionary()) ); - - connect (dictionaryList, TQT_SIGNAL (selectionChanged()), this, TQT_SLOT (selectionChanged()) ); - connect (dictionaryName, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (nameChanged (const TQString &)) ); - connect (languageButton, TQT_SIGNAL (activated (int)), this, TQT_SLOT (languageSelected(int)) ); + connect (addButton, TQ_SIGNAL (clicked()), this, TQ_SLOT(addDictionary()) ); + connect (deleteButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (deleteDictionary()) ); + connect (moveUpButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (moveUp()) ); + connect (moveDownButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (moveDown()) ); + connect (exportButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (exportDictionary()) ); + + connect (dictionaryList, TQ_SIGNAL (selectionChanged()), this, TQ_SLOT (selectionChanged()) ); + connect (dictionaryName, TQ_SIGNAL (textChanged (const TQString &)), this, TQ_SLOT (nameChanged (const TQString &)) ); + connect (languageButton, TQ_SIGNAL (activated (int)), this, TQ_SLOT (languageSelected(int)) ); // Object for the KCMKTTSD configuration config = new TDEConfig("kmouthrc"); 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<TQObject*>(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; diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index fbb56ac..d5ca9d9 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -74,7 +74,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n view->insertChildClient( this ); setInstance( KGenericFactory<KateKttsdPlugin>::instance() ); TDEGlobal::locale()->insertCatalogue("kttsd"); - (void) new TDEAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); + (void) new TDEAction( i18n("Speak Text"), "kttsd", 0, this, TQ_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); setXMLFile( "tdetexteditor_kttsdui.rc" ); } diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index f718664..005f8c3 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -73,24 +73,24 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args m_widget->reButton->setEnabled( m_reEditorInstalled ); if ( m_reEditorInstalled ) - connect( m_widget->reButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReButton_clicked()) ); + connect( m_widget->reButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReButton_clicked()) ); - connect( m_widget->reLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->sbLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); + connect( m_widget->reLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->sbLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); // Set up defaults. defaults(); diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index ba4f3b7..357a95b 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -567,7 +567,7 @@ SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args { // kdDebug() << "SbdProc::SbdProc: Running" << endl; m_sbdThread = new SbdThread( parent, *name + "_thread" ); - connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); + connect( m_sbdThread, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotSbdThreadFilteringFinished()) ); } /** @@ -753,7 +753,7 @@ bool SbdProc::init(TDEConfig* config, const TQString& configGroup){ delete m_sbdThread; m_sbdThread = new SbdThread(); m_sbdThread->setConfiguredSbRegExp( m_configuredRe ); - connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); + connect( m_sbdThread, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotSbdThreadFilteringFinished()) ); m_state = fsIdle; emit filteringStopped(); } diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index a57b5c8..e226f68 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -74,30 +74,30 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons layout->addWidget(m_widget); m_widget->substLView->setSortColumn(-1); - connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - connect(m_widget->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddButton_clicked())); - connect(m_widget->upButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUpButton_clicked())); - connect(m_widget->downButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDownButton_clicked())); - connect(m_widget->editButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditButton_clicked())); - connect(m_widget->removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); - connect(m_widget->substLView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(enableDisableButtons())); - connect(m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + connect(m_widget->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddButton_clicked())); + connect(m_widget->upButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUpButton_clicked())); + connect(m_widget->downButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDownButton_clicked())); + connect(m_widget->editButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditButton_clicked())); + connect(m_widget->removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); + connect(m_widget->substLView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(enableDisableButtons())); + connect(m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); // Determine if tdeutils Regular Expression Editor is installed. m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -581,14 +581,14 @@ void StringReplacerConf::addOrEditSubstitution(bool isAdd) m_editWidget->substLineEdit->setText( item->text(3) ); } // The match box may not be blank. - connect( m_editWidget->matchLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMatchLineEdit_textChanged(const TQString&)) ); - connect( m_editWidget->regexpRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTypeButtonGroup_clicked()) ); - connect( m_editWidget->wordRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTypeButtonGroup_clicked()) ); - connect( m_editWidget->matchButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMatchButton_clicked()) ); + connect( m_editWidget->matchLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMatchLineEdit_textChanged(const TQString&)) ); + connect( m_editWidget->regexpRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTypeButtonGroup_clicked()) ); + connect( m_editWidget->wordRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTypeButtonGroup_clicked()) ); + connect( m_editWidget->matchButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMatchButton_clicked()) ); // Display the box in a dialog. m_editDlg = new KDialogBase( KDialogBase::Swallow, diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 676a25d..350c77d 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -65,23 +65,23 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const m_reEditorInstalled = !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); m_widget->reEditorButton->setEnabled(m_reEditorInstalled); - connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->reLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->reEditorButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotReEditorButton_clicked())); - connect(m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->talkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTalkerButton_clicked())); + connect(m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->reLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->reEditorButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotReEditorButton_clicked())); + connect(m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->talkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTalkerButton_clicked())); - connect(m_widget->loadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoadButton_clicked())); - connect(m_widget->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveButton_clicked())); - connect(m_widget->clearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearButton_clicked())); + connect(m_widget->loadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoadButton_clicked())); + connect(m_widget->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveButton_clicked())); + connect(m_widget->clearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearButton_clicked())); // Set up defaults. defaults(); diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 0a27174..2f3538f 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -59,18 +59,18 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons defaults(); // Connect signals. - connect( m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect( m_widget->xsltPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->xsltprocPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->rootElementLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->doctypeLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); - connect( m_widget->appIdLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( m_widget->nameLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect( m_widget->xsltPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->xsltprocPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->rootElementLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->doctypeLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); + connect( m_widget->appIdLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); } /** diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 9a279b9..b341337 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -250,12 +250,12 @@ bool XmlTransformerProc::init(TDEConfig* config, const TQString& configGroup) // m_xsltProc->args() << endl; m_state = fsFiltering; - connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_xsltProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_xsltProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_xsltProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_xsltProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_xsltProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); if (!m_xsltProc->start(TDEProcess::NotifyOnExit, static_cast<TDEProcess::Communication>(TDEProcess::Stdout | TDEProcess::Stderr))) { diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index 8de3429..170c7a6 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -65,10 +65,10 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char applyFilter(); // Connect widgets to slots. - connect(languageRadioButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyFilter())); - connect(synthesizerRadioButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyFilter())); - connect(languageSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(applyFilter())); - connect(synthesizerSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(applyFilter())); + connect(languageRadioButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyFilter())); + connect(synthesizerRadioButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyFilter())); + connect(languageSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(applyFilter())); + connect(synthesizerSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(applyFilter())); } AddTalker::~AddTalker() diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 03c7b85..8cbd792 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -163,13 +163,13 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) // Construct a popup menu for the Sentence Boundary Detector buttons on Filter tab. m_sbdPopmenu = new TQPopupMenu( m_kttsmgrw, "SbdPopupMenu" ); - m_sbdPopmenu->insertItem( i18n("&Edit..."), this, TQT_SLOT(slot_configureSbdFilter()), 0, sbdBtnEdit ); + m_sbdPopmenu->insertItem( i18n("&Edit..."), this, TQ_SLOT(slot_configureSbdFilter()), 0, sbdBtnEdit ); m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("go-up", TDEIcon::Small), - i18n("U&p"), this, TQT_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp ); + i18n("U&p"), this, TQ_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp ); m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("go-down", TDEIcon::Small), - i18n("Do&wn"), this, TQT_SLOT(slot_lowerSbdFilterPriority()), 0, sbdBtnDown ); - m_sbdPopmenu->insertItem( i18n("&Add..."), this, TQT_SLOT(slot_addSbdFilter()), 0, sbdBtnAdd ); - m_sbdPopmenu->insertItem( i18n("&Remove"), this, TQT_SLOT(slot_removeSbdFilter()), 0, sbdBtnRemove ); + i18n("Do&wn"), this, TQ_SLOT(slot_lowerSbdFilterPriority()), 0, sbdBtnDown ); + m_sbdPopmenu->insertItem( i18n("&Add..."), this, TQ_SLOT(slot_addSbdFilter()), 0, sbdBtnAdd ); + m_sbdPopmenu->insertItem( i18n("&Remove"), this, TQ_SLOT(slot_removeSbdFilter()), 0, sbdBtnRemove ); m_kttsmgrw->sbdButton->setPopup( m_sbdPopmenu ); // If aRts is available, enable its radio button. @@ -248,94 +248,94 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) // Connect the signals from the KCMKtssMgrWidget to this class. // Talker tab. - connect(m_kttsmgrw->addTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_addTalker())); - connect(m_kttsmgrw->higherTalkerPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_higherTalkerPriority())); - connect(m_kttsmgrw->lowerTalkerPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_lowerTalkerPriority())); - connect(m_kttsmgrw->removeTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_removeTalker())); - connect(m_kttsmgrw->configureTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_configureTalker())); - connect(m_kttsmgrw->talkersList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateTalkerButtons())); + connect(m_kttsmgrw->addTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_addTalker())); + connect(m_kttsmgrw->higherTalkerPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_higherTalkerPriority())); + connect(m_kttsmgrw->lowerTalkerPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_lowerTalkerPriority())); + connect(m_kttsmgrw->removeTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_removeTalker())); + connect(m_kttsmgrw->configureTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_configureTalker())); + connect(m_kttsmgrw->talkersList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateTalkerButtons())); // Filter tab. - connect(m_kttsmgrw->addFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_addNormalFilter())); - connect(m_kttsmgrw->higherFilterPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_higherNormalFilterPriority())); - connect(m_kttsmgrw->lowerFilterPriorityButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_lowerNormalFilterPriority())); - connect(m_kttsmgrw->removeFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_removeNormalFilter())); - connect(m_kttsmgrw->configureFilterButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slot_configureNormalFilter())); - connect(m_kttsmgrw->filtersList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateFilterButtons())); - //connect(m_kttsmgrw->filtersList, TQT_SIGNAL(stateChanged()), - // this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->sbdsList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateSbdButtons())); + connect(m_kttsmgrw->addFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_addNormalFilter())); + connect(m_kttsmgrw->higherFilterPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_higherNormalFilterPriority())); + connect(m_kttsmgrw->lowerFilterPriorityButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_lowerNormalFilterPriority())); + connect(m_kttsmgrw->removeFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_removeNormalFilter())); + connect(m_kttsmgrw->configureFilterButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slot_configureNormalFilter())); + connect(m_kttsmgrw->filtersList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateFilterButtons())); + //connect(m_kttsmgrw->filtersList, TQ_SIGNAL(stateChanged()), + // this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->sbdsList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateSbdButtons())); // Audio tab. - connect(m_kttsmgrw->gstreamerRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotGstreamerRadioButton_toggled(bool))); - connect(m_kttsmgrw->alsaRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAlsaRadioButton_toggled(bool))); - connect(m_kttsmgrw->pcmComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPcmComboBox_activated())); - connect(m_kttsmgrw->akodeRadioButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotAkodeRadioButton_toggled(bool))); - connect(m_kttsmgrw->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_kttsmgrw->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_kttsmgrw->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->keepAudioCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(keepAudioCheckBox_toggled(bool))); - connect(m_kttsmgrw->keepAudioPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_kttsmgrw->gstreamerRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotGstreamerRadioButton_toggled(bool))); + connect(m_kttsmgrw->alsaRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAlsaRadioButton_toggled(bool))); + connect(m_kttsmgrw->pcmComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPcmComboBox_activated())); + connect(m_kttsmgrw->akodeRadioButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotAkodeRadioButton_toggled(bool))); + connect(m_kttsmgrw->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_kttsmgrw->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_kttsmgrw->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->keepAudioCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(keepAudioCheckBox_toggled(bool))); + connect(m_kttsmgrw->keepAudioPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); // General tab. - connect(m_kttsmgrw->enableKttsdCheckBox, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(enableKttsdToggled(bool))); + connect(m_kttsmgrw->enableKttsdCheckBox, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(enableKttsdToggled(bool))); // Notify tab. - connect(m_kttsmgrw->notifyEnableCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotNotifyEnableCheckBox_toggled(bool))); - connect(m_kttsmgrw->notifyExcludeEventsWithSoundCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_kttsmgrw->notifyAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyAddButton_clicked())); - connect(m_kttsmgrw->notifyRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyRemoveButton_clicked())); - connect(m_kttsmgrw->notifyClearButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyClearButton_clicked())); - connect(m_kttsmgrw->notifyLoadButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyLoadButton_clicked())); - connect(m_kttsmgrw->notifySaveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifySaveButton_clicked())); - connect(m_kttsmgrw->notifyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotNotifyListView_selectionChanged())); - connect(m_kttsmgrw->notifyPresentComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotNotifyPresentComboBox_activated(int))); - connect(m_kttsmgrw->notifyActionComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotNotifyActionComboBox_activated(int))); - connect(m_kttsmgrw->notifyTestButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyTestButton_clicked())); - connect(m_kttsmgrw->notifyMsgLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotNotifyMsgLineEdit_textChanged(const TQString&))); - connect(m_kttsmgrw->notifyTalkerButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNotifyTalkerButton_clicked())); + connect(m_kttsmgrw->notifyEnableCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotNotifyEnableCheckBox_toggled(bool))); + connect(m_kttsmgrw->notifyExcludeEventsWithSoundCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_kttsmgrw->notifyAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyAddButton_clicked())); + connect(m_kttsmgrw->notifyRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyRemoveButton_clicked())); + connect(m_kttsmgrw->notifyClearButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyClearButton_clicked())); + connect(m_kttsmgrw->notifyLoadButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyLoadButton_clicked())); + connect(m_kttsmgrw->notifySaveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifySaveButton_clicked())); + connect(m_kttsmgrw->notifyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotNotifyListView_selectionChanged())); + connect(m_kttsmgrw->notifyPresentComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotNotifyPresentComboBox_activated(int))); + connect(m_kttsmgrw->notifyActionComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotNotifyActionComboBox_activated(int))); + connect(m_kttsmgrw->notifyTestButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyTestButton_clicked())); + connect(m_kttsmgrw->notifyMsgLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotNotifyMsgLineEdit_textChanged(const TQString&))); + connect(m_kttsmgrw->notifyTalkerButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNotifyTalkerButton_clicked())); // Others. - connect(m_kttsmgrw, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( configChanged() ) ); - connect(m_kttsmgrw->mainTab, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(slotTabChanged())); + connect(m_kttsmgrw, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( configChanged() ) ); + connect(m_kttsmgrw->mainTab, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(slotTabChanged())); // Connect KTTSD DCOP signals to our slots. if (!connectDCOPSignal("kttsd", "KSpeech", @@ -2040,9 +2040,9 @@ void KCMKttsMgr::configureTalker() m_configDlg->setMainWidget(m_loadedTalkerPlugIn); m_configDlg->setHelp("configure-plugin", "kttsd"); m_configDlg->enableButtonOK(false); - connect(m_loadedTalkerPlugIn, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( slotConfigTalkerDlg_ConfigChanged() )); - connect(m_configDlg, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( slotConfigTalkerDlg_DefaultClicked() )); - connect(m_configDlg, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT (slotConfigTalkerDlg_CancelClicked() )); + connect(m_loadedTalkerPlugIn, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( slotConfigTalkerDlg_ConfigChanged() )); + connect(m_configDlg, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( slotConfigTalkerDlg_DefaultClicked() )); + connect(m_configDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT (slotConfigTalkerDlg_CancelClicked() )); // Create a Player object for the plugin to use for testing. int playerOption = 0; TQString sinkName; @@ -2098,9 +2098,9 @@ void KCMKttsMgr::configureFilter() m_configDlg->setMainWidget(m_loadedFilterPlugIn); m_configDlg->setHelp("configure-filter", "kttsd"); m_configDlg->enableButtonOK(false); - connect(m_loadedFilterPlugIn, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( slotConfigFilterDlg_ConfigChanged() )); - connect(m_configDlg, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( slotConfigFilterDlg_DefaultClicked() )); - connect(m_configDlg, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT (slotConfigFilterDlg_CancelClicked() )); + connect(m_loadedFilterPlugIn, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( slotConfigFilterDlg_ConfigChanged() )); + connect(m_configDlg, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( slotConfigFilterDlg_DefaultClicked() )); + connect(m_configDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT (slotConfigFilterDlg_CancelClicked() )); // Display the dialog. m_configDlg->exec(); } diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 3bbb37e..5b33fc2 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -79,7 +79,7 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ } } slotEventSrcComboBox_activated(eventSrcComboBox->currentItem()); - connect (eventSrcComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEventSrcComboBox_activated(int))); + connect (eventSrcComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEventSrcComboBox_activated(int))); } SelectEvent::~SelectEvent() { } diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 77725ce..c390b3b 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -202,7 +202,7 @@ void FilterMgr::nextFilter() { m_text = m_filterProc->getOutput(); m_filterProc->ackFinished(); - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); } // if ( m_filterProc->wasModified() ) // kdDebug() << "FilterMgr::nextFilter: Filter# " << m_filterIndex << " modified the text." << endl; @@ -239,10 +239,10 @@ void FilterMgr::nextFilter() if ( m_filterProc->supportsAsync() ) { // kdDebug() << "FilterMgr::nextFilter: calling asyncConvert on filter " << m_filterIndex << endl; - connect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + connect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); if ( !m_filterProc->asyncConvert( m_text, m_talkerCode, m_appId ) ) { - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_filterProc = 0; nextFilter(); } @@ -284,7 +284,7 @@ bool FilterMgr::event ( TQEvent * e ) void FilterMgr::waitForFinished() { if ( m_state != fsFiltering ) return; - disconnect(m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect(m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_async = false; m_filterProc->waitForFinished(); while ( m_state == fsFiltering ) @@ -321,7 +321,7 @@ void FilterMgr::stopFiltering() { if ( m_state != fsFiltering ) return; if ( m_async ) - disconnect( m_filterProc, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilteringFinished()) ); + disconnect( m_filterProc, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilteringFinished()) ); m_filterProc->stopFiltering(); m_state = fsIdle; TQCustomEvent* ev = new TQCustomEvent(TQEvent::User + 302); diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 81b05f2..5d0b7e7 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -69,12 +69,12 @@ bool KTTSD::initializeSpeechData() if (!m_speechData) { m_speechData = new SpeechData(); - connect (m_speechData, TQT_SIGNAL(textSet(const TQCString&, const uint)), - this, TQT_SLOT(slotTextSet(const TQCString&, const uint))); - connect (m_speechData, TQT_SIGNAL(textAppended(const TQCString&, const uint, const int)), - this, TQT_SLOT(slotTextAppended(const TQCString&, const uint, const int))); - connect (m_speechData, TQT_SIGNAL(textRemoved(const TQCString&, const uint)), - this, TQT_SLOT(slotTextRemoved(const TQCString&, const uint))); + connect (m_speechData, TQ_SIGNAL(textSet(const TQCString&, const uint)), + this, TQ_SLOT(slotTextSet(const TQCString&, const uint))); + connect (m_speechData, TQ_SIGNAL(textAppended(const TQCString&, const uint, const int)), + this, TQ_SLOT(slotTextAppended(const TQCString&, const uint, const int))); + connect (m_speechData, TQ_SIGNAL(textRemoved(const TQCString&, const uint)), + this, TQ_SLOT(slotTextRemoved(const TQCString&, const uint))); // Hook KNotify signal. if (!connectDCOPSignal(0, 0, @@ -156,20 +156,20 @@ bool KTTSD::initializeSpeaker() // Create speaker object and load plug ins, checking for the return m_speaker = new Speaker(m_speechData, m_talkerMgr); - connect (m_speaker, TQT_SIGNAL(textStarted(const TQCString&, const uint)), - this, TQT_SLOT(slotTextStarted(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textFinished(const TQCString&, const uint)), - this, TQT_SLOT(slotTextFinished(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textResumed(const TQCString&, const uint)), - this, TQT_SLOT(slotTextResumed(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(sentenceStarted(TQString, TQString, const TQCString&, const uint, const uint)), - this, TQT_SLOT(slotSentenceStarted(TQString, TQString, const TQCString&, const uint, const uint))); - connect (m_speaker, TQT_SIGNAL(sentenceFinished(const TQCString&, const uint, const uint)), this, - TQT_SLOT(slotSentenceFinished(const TQCString&, const uint, const uint))); - connect (m_speaker, TQT_SIGNAL(textStopped(const TQCString&, const uint)), - this, TQT_SLOT(slotTextStopped(const TQCString&, const uint))); - connect (m_speaker, TQT_SIGNAL(textPaused(const TQCString&, const uint)), - this, TQT_SLOT(slotTextPaused(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textStarted(const TQCString&, const uint)), + this, TQ_SLOT(slotTextStarted(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textFinished(const TQCString&, const uint)), + this, TQ_SLOT(slotTextFinished(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textResumed(const TQCString&, const uint)), + this, TQ_SLOT(slotTextResumed(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(sentenceStarted(TQString, TQString, const TQCString&, const uint, const uint)), + this, TQ_SLOT(slotSentenceStarted(TQString, TQString, const TQCString&, const uint, const uint))); + connect (m_speaker, TQ_SIGNAL(sentenceFinished(const TQCString&, const uint, const uint)), this, + TQ_SLOT(slotSentenceFinished(const TQCString&, const uint, const uint))); + connect (m_speaker, TQ_SIGNAL(textStopped(const TQCString&, const uint)), + this, TQ_SLOT(slotTextStopped(const TQCString&, const uint))); + connect (m_speaker, TQ_SIGNAL(textPaused(const TQCString&, const uint)), + this, TQ_SLOT(slotTextPaused(const TQCString&, const uint))); return true; } diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index dbff953..a0636ac 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -152,7 +152,7 @@ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, break; } // Connect timer timeout signal. - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); // Connect plugins to slots. TQPtrList<PlugInProc> plugins = m_talkerMgr->getLoadedPlugIns(); @@ -160,14 +160,14 @@ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, for (int ndx = 0; ndx < pluginsCount; ++ndx) { PlugInProc* speech = plugins.at(ndx); - connect(speech, TQT_SIGNAL(synthFinished()), - this, TQT_SLOT(slotSynthFinished())); - connect(speech, TQT_SIGNAL(sayFinished()), - this, TQT_SLOT(slotSayFinished())); - connect(speech, TQT_SIGNAL(stopped()), - this, TQT_SLOT(slotStopped())); - connect(speech, TQT_SIGNAL(error(bool, const TQString&)), - this, TQT_SLOT(slotError(bool, const TQString&))); + connect(speech, TQ_SIGNAL(synthFinished()), + this, TQ_SLOT(slotSynthFinished())); + connect(speech, TQ_SIGNAL(sayFinished()), + this, TQ_SLOT(slotSayFinished())); + connect(speech, TQ_SIGNAL(stopped()), + this, TQ_SLOT(slotStopped())); + connect(speech, TQ_SIGNAL(error(bool, const TQString&)), + this, TQ_SLOT(slotError(bool, const TQString&))); } } @@ -275,8 +275,8 @@ void Speaker::doUtterances() { // Create an XSLT transformer and transform the text. it->transformer = new SSMLConvert(); - connect(it->transformer, TQT_SIGNAL(transformFinished()), - this, TQT_SLOT(slotTransformFinished())); + connect(it->transformer, TQ_SIGNAL(transformFinished()), + this, TQ_SLOT(slotTransformFinished())); if (it->transformer->transform(it->sentence->text, it->plugin->getSsmlXsltFilename())) { @@ -345,8 +345,8 @@ void Speaker::doUtterances() else { it->audioStretcher = new Stretcher(); - connect(it->audioStretcher, TQT_SIGNAL(stretchFinished()), - this, TQT_SLOT(slotStretchFinished())); + connect(it->audioStretcher, TQ_SIGNAL(stretchFinished()), + this, TQ_SLOT(slotStretchFinished())); if (it->audioStretcher->stretch(it->audioUrl, makeSuggestedFilename(), m_audioStretchFactor)) { diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index e1edc75..2d39153 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -125,8 +125,8 @@ bool SpeechData::readConfig(){ pooledFilterMgr->job = 0; pooledFilterMgr->partNum = 0; // Connect signals from FilterMgr. - connect (filterMgr, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilterMgrFinished())); - connect (filterMgr, TQT_SIGNAL(filteringStopped()), this, TQT_SLOT(slotFilterMgrStopped())); + connect (filterMgr, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilterMgrFinished())); + connect (filterMgr, TQ_SIGNAL(filteringStopped()), this, TQ_SLOT(slotFilterMgrStopped())); m_pooledFilterMgrs.append(pooledFilterMgr); return true; @@ -1136,8 +1136,8 @@ void SpeechData::startJobFiltering(mlJob* job, const TQString& text, bool noSBD) filterMgr->init(config, "General"); pooledFilterMgr->filterMgr = filterMgr; // Connect signals from FilterMgr. - connect (filterMgr, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotFilterMgrFinished())); - connect (filterMgr, TQT_SIGNAL(filteringStopped()), this, TQT_SLOT(slotFilterMgrStopped())); + connect (filterMgr, TQ_SIGNAL(filteringFinished()), this, TQ_SLOT(slotFilterMgrFinished())); + connect (filterMgr, TQ_SIGNAL(filteringStopped()), this, TQ_SLOT(slotFilterMgrStopped())); m_pooledFilterMgrs.append(pooledFilterMgr); } // else kdDebug() << "SpeechData::startJobFiltering: re-using idle pooledFilterMgr for job " << jobNum << " part " << partNum << endl; diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 1625e4a..45923a1 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -239,8 +239,8 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) // kdDebug() << "SSMLConvert::transform: executing command: " << // m_xsltProc->args() << endl; - connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_xsltProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!m_xsltProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { kdDebug() << "SSMLConvert::transform: Error starting xsltproc" << endl; diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index d51aa17..a6a7072 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -180,60 +180,60 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "<b>Resume</b> to make the job speakable, or click <b>Later</b> to move it " "down in the list.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_hold())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_hold())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("application-x-executable", TDEIcon::Small, 0, true), i18n("Resume"), hbox1, "job_resume"); wt = i18n( "<p>Resumes a paused job or changes a Queued job to Waiting. If the job is the " "top speakable job in the list, it begins speaking.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_resume())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_resume())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edit-redo", TDEIcon::Small, 0, true), i18n("R&estart"), hbox1, "job_restart"); wt = i18n( "<p>Rewinds a job to the beginning and changes its state to Waiting. If the job " "is the top speakable job in the list, it begins speaking.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_restart())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_restart())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::Small, 0, true), i18n("Re&move"), hbox1, "job_remove"); wt = i18n( "<p>Deletes the job. If it is currently speaking, it stops speaking. The next " "speakable job in the list begins speaking.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_remove())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_remove())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("go-down", TDEIcon::Small, 0, true), i18n("&Later"), hbox1, "job_later"); wt = i18n( "<p>Moves a job downward in the list so that it will be spoken later. If the job " "is currently speaking, its state changes to Paused.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_move())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_move())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2leftarrow", TDEIcon::Small, 0, true), i18n("Pre&vious Part"), hbox2, "part_prevpart"); wt = i18n( "<p>Rewinds a multi-part job to the previous part.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_par())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_prev_par())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1leftarrow", TDEIcon::Small, 0, true), i18n("&Previous Sentence"), hbox2, "job_prevsentence"); wt = i18n( "<p>Rewinds a job to the previous sentence.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_sen())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_prev_sen())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1rightarrow", TDEIcon::Small, 0, true), i18n("&Next Sentence"), hbox2, "job_nextsentence"); wt = i18n( "<p>Advances a job to the next sentence.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_sen())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_next_sen())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2rightarrow", TDEIcon::Small, 0, true), i18n("Ne&xt Part"), hbox2, "part_nextpart"); wt = i18n( "<p>Advances a multi-part job to the next part.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_par())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_next_par())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("klipper", TDEIcon::Small, 0, true), i18n("&Speak Clipboard"), hbox3, "speak_clipboard"); @@ -242,7 +242,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "to Waiting. If the job is the topmost in the list, it begins speaking. " "The job will be spoken by the topmost Talker in the <b>Talkers</b> tab.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_clipboard())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_speak_clipboard())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small, 0, true), i18n("Spea&k File"), hbox3, "speak_file"); wt = i18n( @@ -250,20 +250,20 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : "You must click the <b>Resume</b> button before the job will be speakable. " "The job will be spoken by the topmost Talker in the <b>Talkers</b> tab.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_file())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_speak_file())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("translate", TDEIcon::Small, 0, true), i18n("Change Talker"), hbox3, "job_changetalker"); wt = i18n( "<p>Prompts you with a list of your configured Talkers from the <b>Talkers</b> tab. " "The job will be spoken using the selected Talker.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_change_talker())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_job_change_talker())); btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("reload_page", TDEIcon::Small, 0, true), i18n("&Refresh"), hbox3, "refresh"); wt = i18n( "<p>Refresh the list of jobs.</p>"); TQWhatsThis::add(btn, wt); - connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_refresh())); + connect (btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_refresh())); // Disable job buttons until a job is selected. enableJobActions(false); @@ -291,8 +291,8 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : // Set the main widget for the part. setWidget(vBox); - connect(m_jobListView, TQT_SIGNAL(selectionChanged(TQListViewItem* )), - this, TQT_SLOT(slot_selectionChanged(TQListViewItem* ))); + connect(m_jobListView, TQ_SIGNAL(selectionChanged(TQListViewItem* )), + this, TQ_SLOT(slot_selectionChanged(TQListViewItem* ))); // Fill the Job List View. refreshJobListView(); diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 713b270..6a369f0 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -179,18 +179,18 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent): if (id != -1) contextMenu()->changeTitle(id, icon, "KTTSMgr"); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("klipper", TDEIcon::Small), - i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected())); + i18n("&Speak Clipboard Contents"), this, TQ_SLOT(speakClipboardSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("process-stop", TDEIcon::Small), - i18n("&Hold"), this, TQT_SLOT(holdSelected())); + i18n("&Hold"), this, TQ_SLOT(holdSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("application-x-executable", TDEIcon::Small), - i18n("Resume"), this, TQT_SLOT(resumeSelected())); + i18n("Resume"), this, TQ_SLOT(resumeSelected())); id = contextMenu()->insertSeparator(); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::Small), - i18n("KTTS &Handbook"), this, TQT_SLOT(helpSelected())); + i18n("KTTS &Handbook"), this, TQ_SLOT(helpSelected())); id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::Small), - i18n("&About KTTSMgr"), this, TQT_SLOT(aboutSelected())); + i18n("&About KTTSMgr"), this, TQ_SLOT(aboutSelected())); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitSelected())); // If --autoexit option given, exit when speaking stops. TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("autoexit")) diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index bdab6d6..c5a33f3 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -111,36 +111,36 @@ SelectTalkerDlg::SelectTalkerDlg( applyTalkerCodeToControls(); enableDisableControls(); - connect(m_widget->useDefaultRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - connect(m_widget->useClosestMatchRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - connect(m_widget->useSpecificTalkerRadioButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged())); - - connect(m_widget->languageBrowseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLanguageBrowseButton_clicked())); - - connect(m_widget->synthComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->genderComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->volumeComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->rateComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - - connect(m_widget->synthCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->genderCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->volumeCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->rateCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - - connect(m_widget->talkersListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotTalkersListView_selectionChanged())); + connect(m_widget->useDefaultRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + connect(m_widget->useClosestMatchRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + connect(m_widget->useSpecificTalkerRadioButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged())); + + connect(m_widget->languageBrowseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLanguageBrowseButton_clicked())); + + connect(m_widget->synthComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->genderComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->volumeComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->rateComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + + connect(m_widget->synthCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->genderCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->volumeCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->rateCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + + connect(m_widget->talkersListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotTalkersListView_selectionChanged())); m_widget->talkersListView->setMinimumHeight( 120 ); } diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index c6c50e5..ccc3565 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -63,8 +63,8 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename, m_stretchProc = new TDEProcess; TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3); *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr; - connect(m_stretchProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_stretchProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!m_stretchProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication)) { kdDebug() << "Stretcher::stretch: Error starting audio stretcher process. Is sox installed?" << endl; diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index cb0c03e..fac97e1 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -87,7 +87,7 @@ void ArtsPlayer::startPlay(const TQString &file) m_playobject = m_factory->createPlayObject(m_currentURL, false); if(m_playobject->object().isNull()) - connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated())); + connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated())); else playObjectCreated(); } @@ -254,7 +254,7 @@ void ArtsPlayer::setupPlayer() m_dispatcher = new KArtsDispatcher; m_server = new KArtsServer; setupArtsObjects(); - connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects())); + connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects())); } void ArtsPlayer::setupVolumeControl() diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 6fc2792..2144b52 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -60,16 +60,16 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList m_widget->characterCodingBox->insertStringList(m_codecList); defaults(); - connect(m_widget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->stdInButton, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configChanged())); - connect(m_widget->urlReq, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->commandTestButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCommandTest_clicked())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->stdInButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configChanged())); + connect(m_widget->urlReq, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->commandTestButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCommandTest_clicked())); } /** Destructor */ @@ -147,7 +147,7 @@ void CommandConf::slotCommandTest_clicked() else { m_commandProc = new CommandProc(); - connect (m_commandProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_commandProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. @@ -167,7 +167,7 @@ void CommandConf::slotCommandTest_clicked() m_progressDlg->setAllowCancel(true); // TODO: Do codec names contain non-ASCII characters? - connect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_commandProc->synth( testMsg, tmpWaveFile, @@ -179,7 +179,7 @@ void CommandConf::slotCommandTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_commandProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_commandProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_commandProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index 1be0d2d..e0f04ec 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -290,14 +290,14 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile m_commandProc->setEnvironment("LANG", language + "." + codec->mimeName()); m_commandProc->setEnvironment("LC_CTYPE", language + "." + codec->mimeName()); *m_commandProc << command; - connect(m_commandProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_commandProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_commandProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_commandProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_commandProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_commandProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_commandProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_commandProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); // 4. start the process diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 64e5b6e..9340fa5 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -68,30 +68,30 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar defaults(); - connect(m_widget->eposServerPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposClientPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencyBox_valueChanged(int))); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencySlider_valueChanged(int))); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposServerOptions, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposClientOptions, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->eposTest, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEposTest_clicked())); + connect(m_widget->eposServerPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposClientPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencyBox_valueChanged(int))); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencySlider_valueChanged(int))); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposServerOptions, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposClientOptions, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->eposTest, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEposTest_clicked())); } /** Destructor */ @@ -214,7 +214,7 @@ void EposConf::slotEposTest_clicked() else { m_eposProc = new EposProc(); - connect (m_eposProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_eposProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "eposplugin-"), ".wav"); @@ -234,7 +234,7 @@ void EposConf::slotEposTest_clicked() // TODO: Whenever server options change, the server must be restarted. // TODO: Do codec names contain non-ASCII characters? - connect (m_eposProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_eposProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_eposProc->synth( testMsg, tmpWaveFile, @@ -251,7 +251,7 @@ void EposConf::slotEposTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_eposProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_eposProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_eposProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index 8d91c66..27d96f0 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -89,10 +89,10 @@ bool EposProc::init(TDEConfig* config, const TQString& configGroup) *m_eposServerProc << m_eposServerExePath; if (!m_eposServerOptions.isEmpty()) *m_eposServerProc << m_eposServerOptions; - connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput); } @@ -173,10 +173,10 @@ void EposProc::synth( *m_eposServerProc << eposServerExePath; if (!eposServerOptions.isEmpty()) *m_eposServerProc << eposServerOptions; - connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposServerProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput); kdDebug() << "EposProc:: Epos server process started" << endl; } @@ -234,14 +234,14 @@ void EposProc::synth( *m_eposProc << "-"; // Read from StdIn. if (!suggestedFilename.isEmpty()) *m_eposProc << " >" + suggestedFilename; - connect(m_eposProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_eposProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_eposProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_eposProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_eposProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_eposProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_eposProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_eposProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (suggestedFilename.isEmpty()) m_state = psSaying; else diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index c38bbd5..81e346c 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -81,37 +81,37 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt // defaults(); - connect(m_widget->festivalPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotFestivalPath_textChanged())); - connect(m_widget->selectVoiceCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotSelectVoiceCombo_activated())); - connect(m_widget->selectVoiceCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->testButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTest_clicked())); - connect(m_widget->rescan, TQT_SIGNAL(clicked()), this, TQT_SLOT(scanVoices())); - connect(m_widget->volumeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(volumeBox_valueChanged(int))); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeBox_valueChanged(int))); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencyBox_valueChanged(int))); - connect(m_widget->volumeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(volumeSlider_valueChanged(int))); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(timeSlider_valueChanged(int))); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(frequencySlider_valueChanged(int))); - connect(m_widget->volumeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->volumeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencyBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->frequencySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(m_widget->preloadCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->characterCodingBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(configChanged())); + connect(m_widget->festivalPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotFestivalPath_textChanged())); + connect(m_widget->selectVoiceCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotSelectVoiceCombo_activated())); + connect(m_widget->selectVoiceCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->testButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTest_clicked())); + connect(m_widget->rescan, TQ_SIGNAL(clicked()), this, TQ_SLOT(scanVoices())); + connect(m_widget->volumeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(volumeBox_valueChanged(int))); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeBox_valueChanged(int))); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencyBox_valueChanged(int))); + connect(m_widget->volumeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(volumeSlider_valueChanged(int))); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(timeSlider_valueChanged(int))); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(frequencySlider_valueChanged(int))); + connect(m_widget->volumeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->volumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencyBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->frequencySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(m_widget->preloadCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->characterCodingBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(configChanged())); } /** Destructor */ @@ -430,10 +430,10 @@ void FestivalIntConf::scanVoices() else { m_festProc = new FestivalIntProc(); - connect (m_festProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_festProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } - connect (m_festProc, TQT_SIGNAL(queryVoicesFinished(const TQStringList&)), - this, TQT_SLOT(slotQueryVoicesFinished(const TQStringList&))); + connect (m_festProc, TQ_SIGNAL(queryVoicesFinished(const TQStringList&)), + this, TQ_SLOT(slotQueryVoicesFinished(const TQStringList&))); m_festProc->queryVoices(exePath); // Display progress dialog modally. @@ -444,8 +444,8 @@ void FestivalIntConf::scanVoices() // Festival responds with the list. When Festival responds with list, // the progress dialog is closed. - disconnect (m_festProc, TQT_SIGNAL(queryVoicesFinished(const TQStringList&)), - this, TQT_SLOT(slotQueryVoicesFinished(const TQStringList&))); + disconnect (m_festProc, TQ_SIGNAL(queryVoicesFinished(const TQStringList&)), + this, TQ_SLOT(slotQueryVoicesFinished(const TQStringList&))); if (!m_progressDlg->wasCancelled()) m_festProc->stopText(); delete m_progressDlg; m_progressDlg = 0; @@ -552,7 +552,7 @@ void FestivalIntConf::slotTest_clicked() else { m_festProc = new FestivalIntProc(); - connect (m_festProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_festProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "festivalintplugin-"), ".wav"); @@ -581,7 +581,7 @@ void FestivalIntConf::slotTest_clicked() m_progressDlg->setAllowCancel(true); // kdDebug() << "FestivalIntConf::slotTest_clicked: calling synth with voiceCode: " << voiceCode << " time percent: " << m_widget->timeBox->value() << endl; - connect (m_festProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_festProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_festProc->synth( realFilePath(m_widget->festivalPath->url()), testMsg, @@ -596,7 +596,7 @@ void FestivalIntConf::slotTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_festProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_festProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_festProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index 1258317..da5e71b 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -184,14 +184,14 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin m_festProc->setEnvironment("LANG", languageCode + "." + codec->mimeName()); m_festProc->setEnvironment("LC_CTYPE", languageCode + "." + codec->mimeName()); // kdDebug() << "FestivalIntProc::startEngine: setting LANG = LC_CTYPE = " << languageCode << "." << codec->mimeName() << endl; - connect(m_festProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_festProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_festProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_festProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess*))); + connect(m_festProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_festProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_festProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_festProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess*))); } if (!m_festProc->isRunning()) { diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 1e15e68..aa33e04 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -57,9 +57,9 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /* defaults(); - connect(m_widget->flitePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->fliteTest, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFliteTest_clicked())); + connect(m_widget->flitePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->fliteTest, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFliteTest_clicked())); } /** Destructor */ @@ -135,7 +135,7 @@ void FliteConf::slotFliteTest_clicked() else { m_fliteProc = new FliteProc(); - connect (m_fliteProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_fliteProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "fliteplugin-"), ".wav"); @@ -154,7 +154,7 @@ void FliteConf::slotFliteTest_clicked() m_progressDlg->setAllowCancel(true); // Play an English test. Flite only supports English. - connect (m_fliteProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_fliteProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_fliteProc->synth( testMsg, tmpWaveFile, @@ -163,7 +163,7 @@ void FliteConf::slotFliteTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_fliteProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_fliteProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_fliteProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index 9ebadd6..269290f 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -112,14 +112,14 @@ void FliteProc::synth( } // kdDebug()<< "FliteProc::synth: Creating Flite object" << endl; m_fliteProc = new TDEProcess; - connect(m_fliteProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_fliteProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_fliteProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_fliteProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_fliteProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_fliteProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_fliteProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_fliteProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (synthFilename.isNull()) m_state = psSaying; else diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 5be75f0..6b47758 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -55,9 +55,9 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList defaults(); - connect(m_widget->freettsPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(m_widget->freettsTest, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFreeTTSTest_clicked())); + connect(m_widget->freettsPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(m_widget->freettsTest, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFreeTTSTest_clicked())); } /** Destructor */ @@ -163,7 +163,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() else { m_freettsProc = new FreeTTSProc(); - connect (m_freettsProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (m_freettsProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "freettsplugin-"), ".wav"); @@ -183,7 +183,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() // I think FreeTTS only officialy supports English, but if anyone knows of someone // whos built up a different language lexicon and has it working with FreeTTS gimme an email at [email protected] - connect (m_freettsProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (m_freettsProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); m_freettsProc->synth( testMsg, tmpWaveFile, @@ -192,7 +192,7 @@ void FreeTTSConf::slotFreeTTSTest_clicked() // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. m_progressDlg->exec(); - disconnect (m_freettsProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (m_freettsProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (m_progressDlg->wasCancelled()) m_freettsProc->stopText(); delete m_progressDlg; m_progressDlg = 0; diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index 95bcd8a..3d5efdb 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -103,14 +103,14 @@ void FreeTTSProc::synth( } m_freettsProc = new TDEProcess; - connect(m_freettsProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_freettsProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(m_freettsProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); - connect(m_freettsProc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess* ))); + connect(m_freettsProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_freettsProc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(m_freettsProc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(m_freettsProc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess* ))); if (synthFilename.isNull()) m_state = psSaying; else diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 9b86384..7f0b51f 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -215,12 +215,12 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList TQString file = locate("data", "LICENSES/LGPL_V2"); i18n("This plugin is distributed under the terms of the GPL v2 or later."); - connect(d->configWidget->voiceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(voiceButton_clicked())); - connect(d->configWidget->testButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(testButton_clicked())); - connect(d->configWidget, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(configChanged (bool))); - connect(d->configWidget->characterCodingBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged())); - connect(d->configWidget->voiceCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(voiceCombo_activated(int))); + connect(d->configWidget->voiceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(voiceButton_clicked())); + connect(d->configWidget->testButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(testButton_clicked())); + connect(d->configWidget, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(configChanged (bool))); + connect(d->configWidget->characterCodingBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged())); + connect(d->configWidget->voiceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(voiceCombo_activated(int))); d->initializeCharacterCodes(); d->initializeVoices(); d->setDefaults(); @@ -330,7 +330,7 @@ void HadifixConf::testButton_clicked () { else { d->hadifixProc = new HadifixProc(); - connect (d->hadifixProc, TQT_SIGNAL(stopped()), this, TQT_SLOT(slotSynthStopped())); + connect (d->hadifixProc, TQ_SIGNAL(stopped()), this, TQ_SLOT(slotSynthStopped())); } // Create a temp file name for the wave file. KTempFile tempFile (locateLocal("tmp", "hadifixplugin-"), ".wav"); @@ -354,7 +354,7 @@ void HadifixConf::testButton_clicked () { // TQString testMsg = "K D E ist eine moderne grafische Arbeitsumgebung für UNIX-Computer."; TQString testMsg = testMessage(d->languageCode); - connect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + connect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); d->hadifixProc->synth (testMsg, realFilePath(d->configWidget->hadifixURL->url()), d->configWidget->isMaleVoice(), @@ -369,7 +369,7 @@ void HadifixConf::testButton_clicked () { // Display progress dialog modally. Processing continues when plugin signals synthFinished, // or if user clicks Cancel button. d->progressDlg->exec(); - disconnect (d->hadifixProc, TQT_SIGNAL(synthFinished()), this, TQT_SLOT(slotSynthFinished())); + disconnect (d->hadifixProc, TQ_SIGNAL(synthFinished()), this, TQ_SLOT(slotSynthFinished())); if (d->progressDlg->wasCancelled()) d->hadifixProc->stopText(); delete d->progressDlg; d->progressDlg = 0; diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 3f2899f..51b1d24 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -197,10 +197,10 @@ void HadifixProc::synth(TQString text, *(d->hadifixProc) << command; // Connect signals from process. - connect(d->hadifixProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(d->hadifixProc, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + connect(d->hadifixProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(d->hadifixProc, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotWroteStdin(TDEProcess *))); // Store off name of wave file to be generated. d->synthFilename = waveFilename; @@ -359,10 +359,10 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString HadifixProc speech; KShellProcess proc; proc << command; - connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &speech, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &speech, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &speech, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &speech, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); speech.stdOut = TQString(); speech.stdErr = TQString(); |