Rename a number of old tq methods that are no longer tq specific

14 files changed, 89 insertions, 89 deletions

diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp
index 9b3ed18d..8504ce93 100644
--- a/languages/ruby/debugger/breakpoint.cpp
+++ b/languages/ruby/debugger/breakpoint.cpp
@@ -70,7 +70,7 @@ Breakpoint::~Breakpoint()
 TQString Breakpoint::dbgRemoveCommand() const
 {
 //    if (dbgId_>0)
-//        return TQString("delete %1").tqarg(dbgId_); // gdb command - not translatable
+//        return TQString("delete %1").arg(dbgId_); // gdb command - not translatable
 
     return TQString();
 }
@@ -161,9 +161,9 @@ TQString FilePosBreakpoint::dbgSetCommand() const
 {
     TQString cmdStr;
     if (fileName_.isEmpty())
-        cmdStr = TQString("break %1").tqarg(lineNo_);  // gdb command - not translatable
+        cmdStr = TQString("break %1").arg(lineNo_);  // gdb command - not translatable
     else {
-        cmdStr = TQString("break %1:%2").tqarg(fileName_).tqarg(lineNo_);
+        cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_);
     }
 
     if (isTemporary())
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h
index 9f3a79fc..953eaca8 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 bc02d7aa..e74759f8 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -31,7 +31,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
@@ -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);
@@ -75,7 +75,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     buttonbox->addStretch();
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->tqlayout();
+    buttonbox->layout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 3b13b148..b49c9af8 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -34,7 +34,7 @@
 #include <tqapplication.h>
 #include <tqcursor.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -126,8 +126,8 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         offset_ = parentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
-        setPalette(TQPalette(tqcolorGroup().background()));
-        tqrepaint();
+        setPalette(TQPalette(colorGroup().background()));
+        repaint();
     }
 }
 
@@ -140,8 +140,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     offset_ = TQPoint(0,0);
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
-    setPalette(TQPalette(tqcolorGroup().background()));
-    tqrepaint();
+    setPalette(TQPalette(colorGroup().background()));
+    repaint();
 }
 
 // **************************************************************************
@@ -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 5b3cc649..f82b2133 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 2d6437fe..5d468de7 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."));
+        int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_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").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
-        popup->tqsetWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
+		id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
+        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)));
 
 }
 
@@ -478,7 +478,7 @@ bool RubyDebuggerPart::startDebugger()
         {
             KMessageBox::error(
                 mainWindow()->main(),
-                i18n("Could not locate the debugging shell '%1'.").tqarg( shell ),
+                i18n("Could not locate the debugging shell '%1'.").arg( shell ),
                 i18n("Debugging Shell Not Found") );
             return false;
         }
@@ -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 61558bb1..cdae0880 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/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index 72b148b6..5d3a606e 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str)
 		ThreadStackItem* thread;
         thread = new ThreadStackItem(	this,
 										thread_re.cap(2).toInt(),
-										TQString("%1 %2").tqarg(thread_re.cap(2)).tqarg(thread_re.cap(3)) );
+										TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) );
 		// The thread with a '+' is always the viewedthread
         if (thread_re.cap(1) == "+") {
             viewedThread_ = thread;
@@ -148,7 +148,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str)
 		}
 		
 		int frameNo = frame_re.cap(1).toInt();
-		TQString frameName = TQString("T%1#%2 %3").tqarg(viewedThread_->threadNo()).tqarg(frame_re.cap(1)).tqarg(method);
+		TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method);
 		new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName);
 		
 		// Tell the Variable Tree that this frame is active
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index 03d42788..9b5ad22a 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -39,7 +39,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 
 #include <stdlib.h>
@@ -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;
         }
@@ -904,7 +904,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( )
 {
     if (m_add->popup())
     {
-        m_add->popup()->popup(mapToGlobal(this->tqgeometry().topLeft()));
+        m_add->popup()->popup(mapToGlobal(this->geometry().topLeft()));
     }
 }
 
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index d98695af..3e751168 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -49,7 +49,7 @@
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <iostream>
 #include <ctype.h>
@@ -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
@@ -341,14 +341,14 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->prune();
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->tqrepaint();
+    varTree_->repaint();
 
     frameStack_->clear();
 
     if (msgBox)
         KMessageBox::error(0, i18n("rdb message:\n")+msg);
 
-    emit dbgtqStatus (msg, state_);
+    emit dbgStatus (msg, state_);
 }
 
 // **************************************************************************
@@ -394,9 +394,9 @@ void RDBController::parseProgramLocation(char *buf)
 	}
 	
     if (stateIsOn(s_appBusy))
-        actOnProgramPause(i18n("No source: %1").tqarg(sourceFile));
+        actOnProgramPause(i18n("No source: %1").arg(sourceFile));
     else
-        emit dbgtqStatus (i18n("No source: %1").tqarg(sourceFile), state_);
+        emit dbgStatus (i18n("No source: %1").arg(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").arg(sourceFile), state_);
 }
 
 // **************************************************************************
@@ -492,7 +492,7 @@ void RDBController::parseRequestedData(char *buf)
         varTree_->viewport()->setUpdatesEnabled(false);
         item->expandValue(buf);
         varTree_->viewport()->setUpdatesEnabled(true);
-        varTree_->tqrepaint();
+        varTree_->repaint();
     }
 }
 
@@ -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").arg(TQString(buf)), state_);
     }
 }
 
@@ -517,7 +517,7 @@ void RDBController::parseDisplay(char *buf, char * expr)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->watchRoot()->setWatchExpression(buf, expr);
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->tqrepaint();
+    varTree_->repaint();
 }
 
 // **************************************************************************
@@ -538,7 +538,7 @@ void RDBController::parseUpdateDisplay(char *buf)
 	}
 
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->tqrepaint();
+    varTree_->repaint();
 }
 
 // **************************************************************************
@@ -549,7 +549,7 @@ void RDBController::parseGlobals(char *buf)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->globalRoot()->setGlobals(buf);
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->tqrepaint();
+    varTree_->repaint();
 }
 
 // **************************************************************************
@@ -584,7 +584,7 @@ void RDBController::parseLocals(char type, char *buf)
 	}
 
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->tqrepaint();
+    varTree_->repaint();
 }
 
 
@@ -766,9 +766,9 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString&
     // BUT the app hasn't been started yet! A run command is about to be issued
     // by whoever is controlling us.
 	
-    if (!dbgProcess_->writeStdin(TQString("%1\n").tqarg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
+    if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
         kdDebug(9012) << "failed to write Unix domain socket path to rdb " 
-		<< TQString("%1\n").tqarg(unixSocketPath_.data()).latin1() << endl;
+		<< TQString("%1\n").arg(unixSocketPath_.data()).latin1() << endl;
 	}
 	
 	setStateOff(s_programExited);
@@ -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 ea249fe2..cba5a8b4 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -30,8 +30,8 @@
 #include <klocale.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 
@@ -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 7655bf19..dd95913d 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 2dd28b31..47e76c47 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -30,7 +30,7 @@
 
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -39,7 +39,7 @@
 #include <klocale.h>
 
 #include <tqpoint.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 
 // **************************************************************************
@@ -202,7 +202,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 			emit removeWatchExpression(((WatchVarItem*)item)->displayId());
             delete item;
         } else if (res == idCopyToClipboard) {
-            TQClipboard *qb = KApplication::tqclipboard();
+            TQClipboard *qb = KApplication::clipboard();
             TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " +
                             "\"" + item->text( VALUE_COLUMN ) + "\" }";
 
@@ -280,7 +280,7 @@ void VariableTree::prune()
 
 // **************************************************************************
 
-// The debugger has moved onto the next program pause, so tqinvalidate 
+// The debugger has moved onto the next program pause, so invalidate 
 // everything in the Variable Tree
 void VariableTree::nextActivationId() 
 { 
@@ -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());
 		}
@@ -635,7 +635,7 @@ void VarItem::setText(int column, const TQString &data)
     }
 
     TQListViewItem::setText(column, data);
-    tqrepaint();
+    repaint();
 }
 
 // **************************************************************************
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index 60e73218..9e2b8ce9 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -276,7 +276,7 @@ public:
 	virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").tqarg(RTTI_VAR_FRAME_ROOT).tqarg(text(column));
+		return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column));
 	}
 
     void addLocals(char *variables);
@@ -311,7 +311,7 @@ public:
 	virtual int rtti() const { return RTTI_WATCH_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").tqarg(RTTI_WATCH_ROOT).tqarg(text(column));
+		return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column));
 	}
 
 	void setWatchExpression(char * buf, char * expr);
@@ -334,7 +334,7 @@ public:
 	virtual int rtti() const { return RTTI_GLOBAL_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").tqarg(RTTI_GLOBAL_ROOT).tqarg(text(column));
+		return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column));
 	}
 	
     void setOpen(bool open);