diff options
Diffstat (limited to 'languages/ruby/debugger')
-rw-r--r-- | languages/ruby/debugger/dbgcontroller.h | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgpsdlg.cpp | 4 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgtoolbar.cpp | 36 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgtoolbar.h | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/debuggerpart.cpp | 16 | ||||
-rw-r--r-- | languages/ruby/debugger/debuggerpart.h | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbbreakpointwidget.cpp | 12 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbcontroller.cpp | 24 | ||||
-rw-r--r-- | languages/ruby/debugger/rdboutputwidget.cpp | 6 | ||||
-rw-r--r-- | languages/ruby/debugger/rdboutputwidget.h | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/variablewidget.cpp | 2 |
11 files changed, 54 insertions, 54 deletions
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index b134d213..83986eb0 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -151,7 +151,7 @@ signals: void rdbStdout (const char *output); void rdbStderr (const char *output); void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); - void dbgtqStatus (const TQString &status, int statusFlag); + void dbgStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index be258778..e7d616a0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -64,8 +64,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) heading_->setFont(KGlobalSettings::fixedFont()); heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - heading_->setMaximumHeight(heading_->tqsizeHint().height()); -// heading_->setMinimumSize(heading_->tqsizeHint()); + heading_->setMaximumHeight(heading_->sizeHint().height()); +// heading_->setMinimumSize(heading_->sizeHint()); topLayout->addWidget(heading_, 5); topLayout->addWidget(pids_, 5); diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 5f24ec46..2c0d8178 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -126,7 +126,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) offset_ = parentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); - setPalette(TQPalette(tqcolorGroup().background())); + setPalette(TQPalette(colorGroup().background())); tqrepaint(); } } @@ -140,7 +140,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) offset_ = TQPoint(0,0); setFrameStyle(TQFrame::Panel|TQFrame::Raised); TQApplication::restoreOverrideCursor(); - setPalette(TQPalette(tqcolorGroup().background())); + setPalette(TQPalette(colorGroup().background())); tqrepaint(); } @@ -168,7 +168,7 @@ public: DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private: TQPixmap pixmap_; @@ -197,19 +197,19 @@ void DbgButton::drawButtonLabel(TQPainter *painter) painter->drawPixmap(x, y, pixmap_); if (hasText) { - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text()); } } // ************************************************************************** -TQSize DbgButton::tqsizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else - return TQPushButton::tqsizeHint(); + return TQPushButton::sizeHint(); } // ************************************************************************** @@ -351,12 +351,12 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, nextLayout->addWidget(bNext); -// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width()); -// w = TQMAX(w, bInterrupt->tqsizeHint().width()); -// w = TQMAX(w, bView->tqsizeHint().width()); +// int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width()); +// w = TQMAX(w, bInterrupt->sizeHint().width()); +// w = TQMAX(w, bView->sizeHint().width()); // they should have the same height, so don't be too fussy -// int h = bFinish->tqsizeHint().height(); +// int h = bFinish->sizeHint().height(); // // bNext->setMinimumHeight(h); // bNexti->setMinimumHeight(h); @@ -390,10 +390,10 @@ void DbgToolBar::slotKdevFocus() // If anyone has a way of determining what window the app is _actually_ running on // then please fix and send a patch. - if (winModule_->activeWindow() != tqtopLevelWidget()->winId()) + if (winModule_->activeWindow() != topLevelWidget()->winId()) activeWindow_ = winModule_->activeWindow(); - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); } // ************************************************************************** @@ -407,7 +407,7 @@ void DbgToolBar::slotPrevFocus() // If the app is active then the app button is highlighted, otherwise // kdev button is highlighted. -void DbgToolBar::slotDbgtqStatus(const TQString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_appBusy; if (appIndicator != appIsActive_) { @@ -421,11 +421,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } @@ -473,7 +473,7 @@ void DbgToolBar::slotActivateAndUndock() if (!docked_) return; - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); slotUndock(); } diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h index 907bda2a..8a4f8048 100644 --- a/languages/ruby/debugger/dbgtoolbar.h +++ b/languages/ruby/debugger/dbgtoolbar.h @@ -64,7 +64,7 @@ public: virtual ~DbgToolBar(); private slots: - void slotDbgtqStatus(const TQString&, int); + void slotDbgStatus(const TQString&, int); void slotDock(); void slotUndock(); void slotIconifyAndDock(); diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 4bc0895f..7f191ac7 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -312,16 +312,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); - popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); + 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").tqarg(squeezed), this, TQT_SLOT(contextWatch()) ); - popup->tqsetWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); + 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").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); - popup->tqsetWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); + popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -412,8 +412,8 @@ void RubyDebuggerPart::setupController() // controller -> this - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - this, TQT_SLOT(slottqStatus(const TQString&, int))); + 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))); @@ -428,8 +428,8 @@ void RubyDebuggerPart::setupController() rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); connect( controller, TQT_SIGNAL(rdbStderr(const char*)), rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); } @@ -683,7 +683,7 @@ void RubyDebuggerPart::slotRefreshBPState( const Breakpoint& BP) } -void RubyDebuggerPart::slottqStatus(const TQString &msg, int state) +void RubyDebuggerPart::slotStatus(const TQString &msg, int state) { TQString stateIndicator; diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index f35970fb..c4df8e14 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -76,7 +76,7 @@ private slots: void slotStepOut(); void slotRefreshBPState(const Breakpoint&); - void slottqStatus(const TQString &msg, int state); + void slotStatus(const TQString &msg, int state); void slotShowStep(const TQString &fileName, int lineNum); void slotGotoSource(const TQString &fileName, int lineNum); diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 8607b73e..ccd08803 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -56,7 +56,7 @@ enum Column { Control = 0, Enable = 1, Type = 2, - tqStatus = 3, + Status = 3, Location = 4 }; @@ -149,7 +149,7 @@ void BreakpointTableRow::setRow() TQString status=m_breakpoint->statusDisplay(m_activeFlag); - table()->setText(row(), tqStatus, status); + table()->setText(row(), Status, status); TQString displayType = m_breakpoint->displayType(); table()->setText(row(), Location, m_breakpoint->location()); @@ -159,7 +159,7 @@ void BreakpointTableRow::setRow() table()->setText(row(), Type, displayType); table()->adjustColumn(Type); - table()->adjustColumn(tqStatus); + table()->adjustColumn(Status); table()->adjustColumn(Location); } } @@ -221,14 +221,14 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); - m_table->setColumnReadOnly(tqStatus, true); + m_table->setColumnReadOnly(Status, true); m_table->setColumnWidth( Enable, 20); TQHeader *header = m_table->horizontalHeader(); header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); - header->setLabel( tqStatus, i18n("Status") ); + header->setLabel( Status, i18n("Status") ); header->setLabel( Location, i18n("Location") ); m_table->show(); @@ -773,7 +773,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col) } case Type: - case tqStatus: + case Status: default: break; } diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 5dd15586..613b9a42 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -236,7 +236,7 @@ void RDBController::executeCmd() emit rdbStdout( prettyCmd.latin1() ); if (!stateIsOn(s_silent)) - emit dbgtqStatus("", state_); + emit dbgStatus("", state_); } // ************************************************************************** @@ -301,7 +301,7 @@ void RDBController::actOnProgramPause(const TQString &msg) if (stateIsOn(s_silent)) return; - emit dbgtqStatus (msg, state_); + emit dbgStatus (msg, state_); // We're always at frame one when the program stops // and we must reset the active flag @@ -348,7 +348,7 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox) if (msgBox) KMessageBox::error(0, i18n("rdb message:\n")+msg); - emit dbgtqStatus (msg, state_); + emit dbgStatus (msg, state_); } // ************************************************************************** @@ -396,7 +396,7 @@ void RDBController::parseProgramLocation(char *buf) if (stateIsOn(s_appBusy)) actOnProgramPause(i18n("No source: %1").tqarg(sourceFile)); else - emit dbgtqStatus (i18n("No source: %1").tqarg(sourceFile), state_); + emit dbgStatus (i18n("No source: %1").tqarg(sourceFile), state_); } // ************************************************************************** @@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf) } } - emit dbgtqStatus(i18n("No source: %1").tqarg(sourceFile), state_); + emit dbgStatus(i18n("No source: %1").tqarg(sourceFile), state_); } // ************************************************************************** @@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf) { if (!stateIsOn(s_silent)) { emit showStepInSource("", -1, ""); - emit dbgtqStatus (i18n("No source: %1").tqarg(TQString(buf)), state_); + emit dbgStatus (i18n("No source: %1").tqarg(TQString(buf)), state_); } } @@ -797,7 +797,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->tqprocessEvents(20); + kapp->processEvents(20); now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; @@ -816,7 +816,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->tqprocessEvents(20); + kapp->processEvents(20); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -833,7 +833,7 @@ void RDBController::slotStopDebugger() delete tty_; tty_ = 0; state_ = s_dbgNotStarted | s_appNotStarted | s_silent; - emit dbgtqStatus (i18n("Debugger stopped"), state_); + emit dbgStatus (i18n("Debugger stopped"), state_); } @@ -1175,7 +1175,7 @@ void RDBController::slotDbgWroteStdin(KProcess *) { // setStateOff(s_waitForWrite); // if (!stateIsOn(s_silent)) - // emit dbgtqStatus ("", state_); + // emit dbgStatus ("", state_); // executeCmd(); } @@ -1203,7 +1203,7 @@ void RDBController::slotAcceptConnection(int masterSocket) this, TQT_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); - emit dbgtqStatus ("", state_); + emit dbgStatus ("", state_); cmdList_.clear(); rdbOutputLen_ = 0; @@ -1283,7 +1283,7 @@ void RDBController::slotDbgProcessExited(KProcess*) { destroyCmds(); state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown)); - emit dbgtqStatus (i18n("Process exited"), state_); + emit dbgStatus (i18n("Process exited"), state_); emit rdbStdout("(rdb:1) Process exited\n"); frameStack_->clear(); varTree_->clear(); diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 7c489ed4..6eef01c7 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -65,7 +65,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : userRDBCmdEntry->setStretchFactor(m_userRDBCmdEditor, 1); m_Interrupt = new TQToolButton( this, "add breakpoint" ); - m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, ( TQSizePolicy::SizeType)0, 0, 0, @@ -79,7 +79,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : topLayout->addWidget(m_rdbView, 10); topLayout->addLayout(userRDBCmdEntry); - slotDbgtqStatus( "", s_dbgNotStarted); + slotDbgStatus( "", s_dbgNotStarted); connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); @@ -133,7 +133,7 @@ void RDBOutputWidget::slotRDBCmd() /***************************************************************************/ -void RDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag) +void RDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h index efb33536..9cbb5c40 100644 --- a/languages/ruby/debugger/rdboutputwidget.h +++ b/languages/ruby/debugger/rdboutputwidget.h @@ -48,7 +48,7 @@ public: public slots: void slotReceivedStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgtqStatus (const TQString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotRDBCmd(); diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 0348e8f9..ec9c0b78 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -428,7 +428,7 @@ void VariableTree::maybeTip(const TQPoint &p) { VarItem * item = dynamic_cast<VarItem*>( itemAt(p) ); if (item != 0) { - TQRect r = tqitemRect(item); + TQRect r = itemRect(item); if (r.isValid()) { tip(r, item->tipText()); } |