6 files changed, 12 insertions, 12 deletions
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index bde8d623..e96d7395 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     buttonbox->addStretch();
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     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/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index eee96cb9..72bb4c93 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -102,7 +102,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -208,7 +208,7 @@ check this option.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -303,7 +303,7 @@ check this option.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 89497fb2..af608d22 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const
     TQPushButton* b = new TQPushButton("...", box);
     // This is exactly what is done in TQDesigner source in the
     // similar context. Haven't had any success making the good look
-    // with tqlayout, I suppose that sizeHint for button is always larger
+    // with layout, I suppose that sizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index a3a35faa..c5a25e50 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -356,8 +356,8 @@ void OutputText::copyAll()
 
     // Make sure the text is pastable both with Ctrl-C and with
     // middle click.
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
+    TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
+    TQApplication::clipboard()->setText(text, TQClipboard::Selection);
 }
 
 void OutputText::toggleShowInternalCommands()
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index e61c7d29..3c136fbe 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -84,7 +84,7 @@ namespace GDBDebugger
         {
             TQVBoxLayout* l = new TQVBoxLayout(this);
 
-            // Grid tqlayout: labels + address field
+            // Grid layout: labels + address field
             TQGridLayout* gl = new TQGridLayout(l);
 
             gl->setColSpacing(0, 2);
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 0803fa82..c37822bd 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
 
 void VariableTree::copyToClipboard(TQListViewItem* item)
 {
-    TQClipboard *qb = KApplication::tqclipboard();
+    TQClipboard *qb = KApplication::clipboard();
     TQString text = item->text( 1 );
 
     qb->setText( text, TQClipboard::Clipboard );
@@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
             s = s.mid(i+2);
     }
 
-    // A hack to nicely display TQStrings. The content of TQString is tqunicode
+    // A hack to nicely display TQStrings. The content of TQString is unicode
     // for for ASCII only strings we get ascii character mixed with \000.
     // Remove those \000 now.
 
@@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes()
         else
             varTree->controller()->addCommand(
                 new ValueSpecialRepresentationCommand(
-                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\""));
+                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\""));
 
         return true;
     }
@@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if (!alive_)
     {
         /* Draw this as disabled. */
-        TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(),
+        TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(),
                                  column, width, align);
     }
     else