diff options
Diffstat (limited to 'languages/ruby')
-rw-r--r-- | languages/ruby/app_templates/kapp/app.rb | 24 | ||||
-rw-r--r-- | languages/ruby/app_templates/kapp/appview.rb | 8 | ||||
-rw-r--r-- | languages/ruby/app_templates/kxt/app.rb | 18 | ||||
-rw-r--r-- | languages/ruby/app_templates/qtrubyapp/main.rb | 2 | ||||
-rw-r--r-- | languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb | 26 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgpsdlg.cpp | 8 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgtoolbar.cpp | 26 | ||||
-rw-r--r-- | languages/ruby/debugger/debuggerpart.cpp | 180 | ||||
-rw-r--r-- | languages/ruby/debugger/framestackwidget.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbbreakpointwidget.cpp | 56 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbcontroller.cpp | 28 | ||||
-rw-r--r-- | languages/ruby/debugger/rdboutputwidget.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/debugger/stty.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/variablewidget.cpp | 12 | ||||
-rw-r--r-- | languages/ruby/rubysupport_part.cpp | 44 |
15 files changed, 221 insertions, 221 deletions
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index af807fe9..8d135b19 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -41,10 +41,10 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end @@ -74,19 +74,19 @@ class %{APPNAMESC} < KDE::MainWindow end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.open(self, SLOT('fileOpen()'), actionCollection()) - KDE::StdAction.save(self, SLOT('fileSave()'), actionCollection()) - KDE::StdAction.saveAs(self, SLOT('fileSaveAs()'), actionCollection()) - KDE::StdAction.print(self, SLOT('filePrint()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.open(self, TQ_SLOT('fileOpen()'), actionCollection()) + KDE::StdAction.save(self, TQ_SLOT('fileSave()'), actionCollection()) + KDE::StdAction.saveAs(self, TQ_SLOT('fileSaveAs()'), actionCollection()) + KDE::StdAction.print(self, TQ_SLOT('filePrint()'), actionCollection()) + KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Cus&tom Menuitem"), KDE::Shortcut.new(), - self, SLOT('optionsPreferences()'), + self, TQ_SLOT('optionsPreferences()'), actionCollection(), "custom_action") end diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index 3fed1ce1..b81155b0 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -71,10 +71,10 @@ class %{APPNAMESC}View < TQt::Widget return end - connect(@html, SIGNAL('setWindowCaption(const TQString&)'), - self, SLOT('slotSetTitle(const TQString&)')) - connect(@html, SIGNAL('setStatusBarText(const TQString&)'), - self, SLOT('slotOnURL(const TQString&)')) + connect(@html, TQ_SIGNAL('setWindowCaption(const TQString&)'), + self, TQ_SLOT('slotSetTitle(const TQString&)')) + connect(@html, TQ_SIGNAL('setStatusBarText(const TQString&)'), + self, TQ_SLOT('slotOnURL(const TQString&)')) end diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index 59a7c266..f7a18399 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -40,23 +40,23 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const TQString&)'), - self, SLOT('changeStatusbar(const TQString&)')) - connect(@view, SIGNAL('signalChangeCaption(const TQString&)'), - self, SLOT('changeCaption(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Swi&tch Colors"), KDE::Shortcut.new(), - @view, SLOT('switchColors()'), + @view, TQ_SLOT('switchColors()'), actionCollection(), "switch_action") end @@ -76,7 +76,7 @@ class %{APPNAMESC} < KDE::MainWindow # to the names of the variables in the .kcfg file dialog = KDE::ConfigDialog.new(self, "settings", Settings.instance, KDE::DialogBase::Swallow) dialog.addPage(Prefs.new(), i18n("General"), "package_settings") - connect(dialog, SIGNAL('settingsChanged()'), @view, SLOT('settingsChanged()')) + connect(dialog, TQ_SIGNAL('settingsChanged()'), @view, TQ_SLOT('settingsChanged()')) dialog.show() end diff --git a/languages/ruby/app_templates/qtrubyapp/main.rb b/languages/ruby/app_templates/qtrubyapp/main.rb index 431ea442..f76c9dac 100644 --- a/languages/ruby/app_templates/qtrubyapp/main.rb +++ b/languages/ruby/app_templates/qtrubyapp/main.rb @@ -5,6 +5,6 @@ a = TQt::Application.new( ARGV ) mw = %{APPNAMESC}.new mw.caption = "%{APPNAMESC}" mw.show -a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') ) +a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') ) a.exec diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index df98824d..1f399323 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -18,15 +18,15 @@ class %{APPNAMESC} < TQt::MainWindow openIcon = TQt::Pixmap.new( "fileopen.xpm" ) fileOpen = TQt::ToolButton.new( TQt::IconSet.new(openIcon), tr("Open File"), nil, - self, SLOT('choose()'), fileTools, "open file" ) + self, TQ_SLOT('choose()'), fileTools, "open file" ) saveIcon = TQt::Pixmap.new( "filesave.xpm" ) fileSave = TQt::ToolButton.new( TQt::IconSet.new(saveIcon), tr("Save File"), nil, - self, SLOT('save()'), fileTools, "save file" ) + self, TQ_SLOT('save()'), fileTools, "save file" ) printIcon = TQt::Pixmap.new( "fileprint.xpm" ) filePrint = TQt::ToolButton.new( TQt::IconSet.new(printIcon), tr("Print File"), nil, - self, SLOT('print()'), fileTools, "print file" ) + self, TQ_SLOT('print()'), fileTools, "print file" ) TQt::WhatsThis.whatsThisButton( fileTools ) @@ -58,40 +58,40 @@ class %{APPNAMESC} < TQt::MainWindow menuBar().insertItem( tr("&File"), file ) - file.insertItem( tr("&New"), self, SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) + file.insertItem( tr("&New"), self, TQ_SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) id = file.insertItem( TQt::IconSet.new(openIcon), tr("&Open..."), - self, SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) + self, TQ_SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) file.setWhatsThis( id, fileOpenText ) id = file.insertItem( TQt::IconSet.new(saveIcon), tr("&Save"), - self, SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) + self, TQ_SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) file.setWhatsThis( id, fileSaveText ) - id = file.insertItem( tr("Save &As..."), self, SLOT('saveAs()') ) + id = file.insertItem( tr("Save &As..."), self, TQ_SLOT('saveAs()') ) file.setWhatsThis( id, fileSaveText ) file.insertSeparator() id = file.insertItem( TQt::IconSet.new(printIcon), tr("&Print..."), - self, SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) + self, TQ_SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) file.setWhatsThis( id, filePrintText ) file.insertSeparator() - file.insertItem( tr("&Close"), self, SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) + file.insertItem( tr("&Close"), self, TQ_SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) - file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) + file.insertItem( tr("&Quit"), $tqApp, TQ_SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) menuBar().insertSeparator() help = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&Help"), help ) - help.insertItem( tr("&About"), self, SLOT('about()'), TQt::KeySequence.new(Key_F1) ) - help.insertItem( tr("About &Qt"), self, SLOT('aboutQt()') ) + help.insertItem( tr("&About"), self, TQ_SLOT('about()'), TQt::KeySequence.new(Key_F1) ) + help.insertItem( tr("About &Qt"), self, TQ_SLOT('aboutQt()') ) help.insertSeparator() - help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) + help.insertItem( tr("What's &This"), self, TQ_SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) @e = TQt::TextEdit.new( self, "editor" ) @e.setFocus() diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index b012f0be..f17c3ce0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -78,8 +78,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); psProc_ = new KShellProcess("/bin/sh"); #ifdef USE_SOLARIS @@ -106,8 +106,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); // Default display to 40 chars wide, default height is okay diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 938ee0c0..83b12d8d 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -117,9 +117,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -242,8 +242,8 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -271,7 +271,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, { winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -306,14 +306,14 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index bfa5de96..b5210bdb 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -148,19 +148,19 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ mainWindow()->setViewAvailable(rdbOutputWidget, false); // rdbBreakpointWidget -> this - connect( rdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( rdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -171,26 +171,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", 0, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -201,7 +201,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step &Into"), "dbgstep", 0, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -212,7 +212,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -224,48 +224,48 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - rdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + rdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&)) ); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } RubyDebuggerPart::~RubyDebuggerPart() @@ -311,16 +311,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (econtext->url().isLocalFile()) { - int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); + int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQ_SLOT(toggleBreakpoint()) ); popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQ_SLOT(contextWatch()) ); popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQ_SLOT(contextRubyInspect()) ); popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -362,74 +362,74 @@ void RubyDebuggerPart::setupController() controller = new RDBController(variableTree, framestackWidget, *projectDom()); // this -> controller - connect( this, TQT_SIGNAL(rubyInspect(const TQString&)), - controller, TQT_SLOT(slotRubyInspect(const TQString&))); + connect( this, TQ_SIGNAL(rubyInspect(const TQString&)), + controller, TQ_SLOT(slotRubyInspect(const TQString&))); // variableTree -> framestackWidget - connect( variableTree, TQT_SIGNAL(selectFrame(int, int)), - framestackWidget, TQT_SLOT(slotSelectFrame(int, int))); + connect( variableTree, TQ_SIGNAL(selectFrame(int, int)), + framestackWidget, TQ_SLOT(slotSelectFrame(int, int))); // framestackWidget -> variableTree - connect( framestackWidget, TQT_SIGNAL(frameActive(int, int, const TQString&)), - variableTree, TQT_SLOT(slotFrameActive(int, int, const TQString&))); + connect( framestackWidget, TQ_SIGNAL(frameActive(int, int, const TQString&)), + variableTree, TQ_SLOT(slotFrameActive(int, int, const TQString&))); // variableTree -> controller - connect( variableTree, TQT_SIGNAL(expandItem(VarItem*, const TQCString&)), - controller, TQT_SLOT(slotExpandItem(VarItem*, const TQCString&))); - connect( variableTree, TQT_SIGNAL(fetchGlobals(bool)), - controller, TQT_SLOT(slotFetchGlobals(bool))); - connect( variableTree, TQT_SIGNAL(addWatchExpression(const TQString&, bool)), - controller, TQT_SLOT(slotAddWatchExpression(const TQString&, bool))); - connect( variableTree, TQT_SIGNAL(removeWatchExpression(int)), - controller, TQT_SLOT(slotRemoveWatchExpression(int))); + connect( variableTree, TQ_SIGNAL(expandItem(VarItem*, const TQCString&)), + controller, TQ_SLOT(slotExpandItem(VarItem*, const TQCString&))); + connect( variableTree, TQ_SIGNAL(fetchGlobals(bool)), + controller, TQ_SLOT(slotFetchGlobals(bool))); + connect( variableTree, TQ_SIGNAL(addWatchExpression(const TQString&, bool)), + controller, TQ_SLOT(slotAddWatchExpression(const TQString&, bool))); + connect( variableTree, TQ_SIGNAL(removeWatchExpression(int)), + controller, TQ_SLOT(slotRemoveWatchExpression(int))); // framestackWidget -> controller - connect( framestackWidget, TQT_SIGNAL(selectFrame(int,int,const TQString&)), - controller, TQT_SLOT(slotSelectFrame(int,int,const TQString&))); + connect( framestackWidget, TQ_SIGNAL(selectFrame(int,int,const TQString&)), + controller, TQ_SLOT(slotSelectFrame(int,int,const TQString&))); // rdbBreakpointWidget -> controller - connect( rdbBreakpointWidget, TQT_SIGNAL(clearAllBreakpoints()), - controller, TQT_SLOT(slotClearAllBreakpoints())); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - controller, TQT_SLOT(slotBPState(const Breakpoint &))); + connect( rdbBreakpointWidget, TQ_SIGNAL(clearAllBreakpoints()), + controller, TQ_SLOT(slotClearAllBreakpoints())); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + controller, TQ_SLOT(slotBPState(const Breakpoint &))); // rdbOutputWidget -> controller - connect( rdbOutputWidget, TQT_SIGNAL(userRDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserRDBCmd(const TQString&))); - connect( rdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( rdbOutputWidget, TQ_SIGNAL(userRDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserRDBCmd(const TQString&))); + connect( rdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); // controller -> rdbBreakpointWidget - connect( controller, TQT_SIGNAL(acceptPendingBPs()), - rdbBreakpointWidget, TQT_SLOT(slotSetPendingBPs())); - connect( controller, TQT_SIGNAL(unableToSetBPNow(int)), - rdbBreakpointWidget, TQT_SLOT(slotUnableToSetBPNow(int))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointList (char*)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBrkptList(char*))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointSet(char*, int)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBreakpointSet(char*, int))); + connect( controller, TQ_SIGNAL(acceptPendingBPs()), + rdbBreakpointWidget, TQ_SLOT(slotSetPendingBPs())); + connect( controller, TQ_SIGNAL(unableToSetBPNow(int)), + rdbBreakpointWidget, TQ_SLOT(slotUnableToSetBPNow(int))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointList (char*)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBrkptList(char*))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointSet(char*, int)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBreakpointSet(char*, int))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> rdbOutputWidget - connect( controller, TQT_SIGNAL(rdbStdout(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); - connect( controller, TQT_SIGNAL(rdbStderr(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(rdbStdout(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStdout(const char*)) ); + connect( controller, TQ_SIGNAL(rdbStderr(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); } diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 4d90092f..024cff2c 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -51,8 +51,8 @@ FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) setSorting(0); header()->hide(); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 0c1fea0b..92170f52 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -239,34 +239,34 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); m_ctxMenu->insertItem( i18n( "Delete" ), BW_ITEM_Delete ); - connect( addMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_delete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveBreakpoint()) ); - connect( m_edit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditBreakpoint()) ); - connect( m_removeAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveAllBreakpoints()) ); - - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); - - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); - - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); - connect( m_table, TQT_SIGNAL(insertPressed()), - this, TQT_SLOT(slotAddBreakpoint())); + connect( addMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); + connect( m_delete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveBreakpoint()) ); + connect( m_edit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditBreakpoint()) ); + connect( m_removeAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveAllBreakpoints()) ); + + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); + + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); + + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(insertPressed()), + this, TQ_SLOT(slotAddBreakpoint())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 16ce7179..94204089 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -130,8 +130,8 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack bind(masterSocket_, (const struct sockaddr*) &sockaddr, sizeof(sockaddr)); listen(masterSocket_, 1); acceptNotifier_ = new TQSocketNotifier(masterSocket_, TQSocketNotifier::Read, this); - TQObject::connect( acceptNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAcceptConnection(int)) ); + TQObject::connect( acceptNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAcceptConnection(int)) ); configure(); cmdList_.setAutoDelete(true); @@ -696,8 +696,8 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -716,17 +716,17 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -1199,8 +1199,8 @@ void RDBController::slotAcceptConnection(int masterSocket) } socketNotifier_ = new TQSocketNotifier(socket_, TQSocketNotifier::Read, 0); - TQObject::connect( socketNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotReadFromSocket(int)) ); + TQObject::connect( socketNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); emit dbgStatus ("", state_); diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 575d60ad..52ba2c0f 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -81,8 +81,8 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userRDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotRDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 73ea4784..bacb21d9 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -131,7 +131,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 94fd4e88..c4173dfb 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -71,8 +71,8 @@ VariableWidget::VariableWidget(TQWidget *parent, const char *name) topLayout->addWidget(varTree_, 10); topLayout->addLayout( vbox ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddWatchExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotAddWatchExpression()) ); } @@ -145,11 +145,11 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(slotPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(slotPressed(TQListViewItem*)) ); watchRoot_ = new WatchRoot(this); } diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index db9576b3..79cbac07 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -49,26 +49,26 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); action->setIcon("ruby_run.png"); action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9, - this, TQT_SLOT(slotRunTestUnderCursor()), + this, TQ_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test.")); - action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQ_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") ); - action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQ_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQ_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQ_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQ_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; @@ -78,14 +78,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); mainWindow()->raiseView( m_shellWidget ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -101,7 +101,7 @@ void RubySupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance())); RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void RubySupportPart::projectOpened() @@ -114,10 +114,10 @@ void RubySupportPart::projectOpened() m_shellWidget->activate(); m_shellWidget->setAutoReactivateOnClose( true ); - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); TQFileInfo program(mainProgram()); @@ -134,7 +134,7 @@ void RubySupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void RubySupportPart::maybeParse(const TQString fileName) @@ -668,7 +668,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQ_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } |