6 files changed, 12 insertions, 12 deletions
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index aaf4476b..088aff77 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -117,7 +117,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
-        offset_ = tqparentWidget()->pos() - e->globalPos();
+        offset_ = parentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
         setPalette(TQPalette(tqcolorGroup().background()));
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index 38048f18..a3a1e321 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -431,8 +431,8 @@ or if your executable contains the gdb stub
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index 17321999..51cfe410 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -133,7 +133,7 @@ If custom format string is not enabled, names and values of all expressions will
 <Q_SLOTS>
     <slot>enableOrDisable()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 7877a92c..ba51e871 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -327,7 +327,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
                                this,
                                TQT_SLOT(toggleShowInternalCommands()));
 
-    popup->setItemChecked(id, tqparent_->showInternalCommands_);
+    popup->setItemChecked(id, parent_->showInternalCommands_);
     popup->tqsetWhatsThis(
         id, 
         i18n(
@@ -348,8 +348,8 @@ void OutputText::copyAll()
 {
     /* See comments for allCommandRaw_ for explanations of
        this complex logic, as opposed to calling text(). */
-    TQStringList& raw = tqparent_->showInternalCommands_ ?
-        tqparent_->allCommandsRaw_ : tqparent_->userCommandsRaw_;
+    TQStringList& raw = parent_->showInternalCommands_ ?
+        parent_->allCommandsRaw_ : parent_->userCommandsRaw_;
     TQString text;
     for (unsigned i = 0; i < raw.size(); ++i)
         text += raw[i];
@@ -362,7 +362,7 @@ void OutputText::copyAll()
 
 void OutputText::toggleShowInternalCommands()
 {
-    tqparent_->setShowInternalCommands(!tqparent_->showInternalCommands_);
+    parent_->setShowInternalCommands(!parent_->showInternalCommands_);
 }
 
 
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index ace1c00d..171fdb86 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -121,7 +121,7 @@ class OutputText : public TQTextEdit
 public:
     OutputText(GDBOutputWidget* tqparent) 
     : TQTextEdit(tqparent), 
-      tqparent_(tqparent)
+      parent_(tqparent)
     {}
 
     TQPopupMenu* createPopupMenu(const TQPoint& pos);
@@ -131,7 +131,7 @@ private slots:
     void toggleShowInternalCommands();
 
 private:
-    GDBOutputWidget* tqparent_;
+    GDBOutputWidget* parent_;
 };
 
 }
diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp
index d8ae62b8..46f5251b 100644
--- a/languages/cpp/debugger/gdbparser.cpp
+++ b/languages/cpp/debugger/gdbparser.cpp
@@ -97,7 +97,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
         // - composites (arrays and structures)
         // - pointers to functions. In this case type is
         //   enclosed in "{}". Not sure why it's so, as
-        //   when printing pointer, type is in tqparenthesis.
+        //   when printing pointer, type is in parenthesis.
         if (type == typePointer)
         {
             // Looks like type in braces at the beginning. Strip it.
@@ -126,7 +126,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
 
         // We can't find the first ')', because type can contain '(' and ')'
         // characters if its function pointer. So count opening and closing
-        // tqparentheses.
+        // parentheses.
 
         start = skipDelim(start, '(', ')');
     }