rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

21 files changed, 98 insertions, 98 deletions

diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h
index 6fe2e0db..b134d213 100644
--- a/languages/ruby/debugger/dbgcontroller.h
+++ b/languages/ruby/debugger/dbgcontroller.h
@@ -127,7 +127,7 @@ public slots:
     virtual void slotBPState(const Breakpoint&)                             = 0;
 
 
-    virtual void slotExpandItem(VarItem *tqparent,
+    virtual void slotExpandItem(VarItem *parent,
                                     const TQCString &userRequest)            = 0;
     virtual void slotSelectFrame(int frame, int thread, 
 	                                const TQString& frameName)               = 0;
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index 1389e0f6..be258778 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -51,8 +51,8 @@ namespace RDBDebugger
 // For use with the internal debugger, but this dialog doesn't know anything
 // about why it's doing it.
 
-Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name)
-    : KDialog(tqparent, name, true),      // modal
+Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
+    : KDialog(parent, name, true),      // modal
       psProc_(0),
       pids_(new TQListBox(this)),
       heading_(new TQLabel(" ", this)),
diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h
index 1f30d6a7..5ab9ebe1 100644
--- a/languages/ruby/debugger/dbgpsdlg.h
+++ b/languages/ruby/debugger/dbgpsdlg.h
@@ -39,7 +39,7 @@ class Dbg_PS_Dialog : public KDialog
   TQ_OBJECT
 
 public:
-    Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 );
+    Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 );
     ~Dbg_PS_Dialog();
 
     int pidSelected();
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 75264b60..5f24ec46 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -74,7 +74,7 @@ namespace RDBDebugger
 class DbgMoveHandle : public TQFrame
 {
 public:
-    DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0);
+    DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0);
     virtual ~DbgMoveHandle();
 
     virtual void mousePressEvent(TQMouseEvent *e);
@@ -89,9 +89,9 @@ private:
 
 // **************************************************************************
 
-DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f)
-    : TQFrame(tqparent, name, f),
-      toolBar_(tqparent),
+DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f)
+    : TQFrame(parent, name, f),
+      toolBar_(parent),
       offset_(TQPoint(0,0)),
       moving_(false)
 {
@@ -117,9 +117,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         KPopupMenu *menu = new KPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
-                         tqparent(), TQT_SLOT(slotDock()));
+                         parent(), TQT_SLOT(slotDock()));
         menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"),
-                         tqparent(), TQT_SLOT(slotIconifyAndDock()));
+                         parent(), TQT_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
@@ -165,7 +165,7 @@ class DbgButton : public TQPushButton
 {
 public:
     DbgButton(const TQPixmap &pixmap, const TQString &text,
-              DbgToolBar *tqparent, const char *name=0);
+              DbgToolBar *parent, const char *name=0);
     virtual ~DbgButton() {};
     void drawButtonLabel(TQPainter *painter);
     TQSize tqsizeHint() const;
@@ -177,8 +177,8 @@ private:
 // **************************************************************************
 
 DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text,
-                     DbgToolBar* tqparent, const char* name)
-    : TQPushButton(tqparent, name),
+                     DbgToolBar* parent, const char* name)
+    : TQPushButton(parent, name),
       pixmap_(pixmap)
 {
     setText(text);
@@ -216,8 +216,8 @@ TQSize DbgButton::tqsizeHint() const
 // **************************************************************************
 // **************************************************************************
 
-DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
-    KSystemTray(tqparent, "DbgDocker"),
+DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
+    KSystemTray(parent, "DbgDocker"),
     toolBar_(toolBar)
 {
     setPixmap(pixmap);
@@ -257,7 +257,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
 // **************************************************************************
 
 DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
-                       TQWidget* tqparent, const char* name)
+                       TQWidget* parent, const char* name)
     : TQFrame(0, name),
       part_(part),
       activeWindow_(0),
@@ -267,10 +267,10 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
       appIsActive_(false),
       docked_(false),
       docker_(0),
-      dockWindow_(new KSystemTray(tqparent))
+      dockWindow_(new KSystemTray(parent))
 {
     winModule_  = new KWinModule(TQT_TQOBJECT(this));
-    docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext"));
+    docker_ = new DbgDocker(parent, this, BarIcon("dbgnext"));
     connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver()));
 
     // Must have noFocus set so that we can see what window was active.
diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h
index 2d059cec..907bda2a 100644
--- a/languages/ruby/debugger/dbgtoolbar.h
+++ b/languages/ruby/debugger/dbgtoolbar.h
@@ -42,7 +42,7 @@ class DbgDocker : public KSystemTray
   TQ_OBJECT
 
 public:
-    DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap);
+    DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap);
     virtual ~DbgDocker()  {};
     virtual void mousePressEvent(TQMouseEvent *e);
 
@@ -60,7 +60,7 @@ class DbgToolBar : public TQFrame
   TQ_OBJECT
 
 public:
-    DbgToolBar(RubyDebuggerPart *part, TQWidget* tqparent, const char* name=0);
+    DbgToolBar(RubyDebuggerPart *part, TQWidget* parent, const char* name=0);
     virtual ~DbgToolBar();
 
 private slots:
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 7a953fe4..4bc0895f 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -72,8 +72,8 @@ static const KDevPluginInfo data("kdevrbdebugger");
 typedef KDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) )
 
-RubyDebuggerPart::RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) :
-    KDevPlugin( &data, tqparent, name ? name : "RubyDebuggerPart" ),
+RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
+    KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ),
     controller(0)
 {
 //    setObjId("RubyDebuggerInterface");
diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h
index 5f3a06a6..f35970fb 100644
--- a/languages/ruby/debugger/debuggerpart.h
+++ b/languages/ruby/debugger/debuggerpart.h
@@ -51,7 +51,7 @@ class RubyDebuggerPart : public KDevPlugin
   TQ_OBJECT
 
 public:
-    RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & );
+    RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & );
     ~RubyDebuggerPart();
     virtual void restorePartialProjectSession(const TQDomElement* el);
     virtual void savePartialProjectSession(TQDomElement* el);
diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index d98582c5..1d9b4b2f 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -41,8 +41,8 @@
 namespace RDBDebugger
 {
 
-FramestackWidget::FramestackWidget(TQWidget *tqparent, const char *name, WFlags f)
-        : TQListView(tqparent, name, f),
+FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f)
+        : TQListView(parent, name, f),
         viewedThread_(0)
 {
     setRootIsDecorated(true);
@@ -211,10 +211,10 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo)
 
 // **************************************************************************
 
-FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, int frameNo, const TQString &frameDesc, const TQString& frameName)
-        : TQListViewItem(tqparent),
+FrameStackItem::FrameStackItem(ThreadStackItem *parent, int frameNo, const TQString &frameDesc, const TQString& frameName)
+        : TQListViewItem(parent),
         frameNo_(frameNo),
-        threadNo_(tqparent->threadNo()),
+        threadNo_(parent->threadNo()),
 		frameName_(frameName)		
 {
 	setText(0, frameDesc);
@@ -239,8 +239,8 @@ TQString FrameStackItem::key(int /*column*/, bool /*ascending*/) const
 // **************************************************************************
 // **************************************************************************
 
-ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc)
-        : TQListViewItem(tqparent),
+ThreadStackItem::ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc)
+        : TQListViewItem(parent),
         threadNo_(threadNo)
 {
     setText(0, threadDesc);
diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h
index 59280f3b..37874fdf 100644
--- a/languages/ruby/debugger/framestackwidget.h
+++ b/languages/ruby/debugger/framestackwidget.h
@@ -36,7 +36,7 @@ class FramestackWidget;
 class ThreadStackItem : public TQListViewItem
 {
 public:
-    ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc);
+    ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc);
     virtual ~ThreadStackItem();
 
 	virtual int rtti() const { return RTTI_THREAD_STACK_ITEM; }
@@ -55,7 +55,7 @@ private:
 class FrameStackItem : public TQListViewItem
 {
 public:
-    FrameStackItem(ThreadStackItem * tqparent, int frameNo, const TQString & frameDesc, const TQString & frameName);
+    FrameStackItem(ThreadStackItem * parent, int frameNo, const TQString & frameDesc, const TQString & frameName);
     virtual ~FrameStackItem();
 
 	virtual int rtti() const { return RTTI_FRAME_STACK_ITEM; }
@@ -85,7 +85,7 @@ class FramestackWidget : public TQListView
   TQ_OBJECT
 
 public:
-    FramestackWidget( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+    FramestackWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 );
     virtual ~FramestackWidget();
 
     void clear();
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index 200f97f4..5fb75098 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -93,9 +93,9 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType,
+BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType,
                                        Breakpoint* bp) :
-        TQTableItem(tqparent, editType, ""),
+        TQTableItem(parent, editType, ""),
         m_breakpoint(bp)
 {
     appendEmptyRow();
@@ -168,8 +168,8 @@ void BreakpointTableRow::setRow()
 /***************************************************************************/
 /***************************************************************************/
 
-RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *tqparent, const char *name) :
-    TQHBox(tqparent, name)
+RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
+    TQHBox(parent, name)
 {
     TQFrame* toolbar = new TQFrame( this );
     TQVBoxLayout *l = new TQVBoxLayout(toolbar, 0, 0);
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h
index ad1e0605..b28b31cc 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.h
+++ b/languages/ruby/debugger/rdbbreakpointwidget.h
@@ -45,7 +45,7 @@ class RDBBreakpointWidget : public TQHBox
   TQ_OBJECT
 
 public:
-    RDBBreakpointWidget( TQWidget* tqparent=0, const char* name=0 );
+    RDBBreakpointWidget( TQWidget* parent=0, const char* name=0 );
     virtual ~RDBBreakpointWidget();
 
     void reset();
diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h
index af72ddbc..a5dd90e6 100644
--- a/languages/ruby/debugger/rdbcontroller.h
+++ b/languages/ruby/debugger/rdbcontroller.h
@@ -117,7 +117,7 @@ public slots:
     void slotBPState( const Breakpoint& );
     void slotClearAllBreakpoints();
 
-    void slotExpandItem(VarItem *tqparent, const TQCString &userRequest);
+    void slotExpandItem(VarItem *parent, const TQCString &userRequest);
     void slotRubyInspect(const TQString &inspectText);
     void slotSelectFrame(int frameNo, int threadNo, const TQString& frameName);
     void slotFetchGlobals(bool fetch);
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index b1b9deda..7c489ed4 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -44,8 +44,8 @@ namespace RDBDebugger
 
 /***************************************************************************/
 
-RDBOutputWidget::RDBOutputWidget( TQWidget *tqparent, const char *name) :
-    TQWidget(tqparent, name),
+RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
+    TQWidget(parent, name),
     m_userRDBCmdEditor(0),
     m_Interrupt(0),
     m_rdbView(0)
diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h
index 32d53110..efb33536 100644
--- a/languages/ruby/debugger/rdboutputwidget.h
+++ b/languages/ruby/debugger/rdboutputwidget.h
@@ -40,7 +40,7 @@ class RDBOutputWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    RDBOutputWidget( TQWidget *tqparent=0, const char *name=0 );
+    RDBOutputWidget( TQWidget *parent=0, const char *name=0 );
     ~RDBOutputWidget();
 
     void clear();
diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp
index d0e8e31b..a517c301 100644
--- a/languages/ruby/debugger/rdbparser.cpp
+++ b/languages/ruby/debugger/rdbparser.cpp
@@ -34,7 +34,7 @@ namespace RDBDebugger
 
 // **************************************************************************
 
-void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf)
+void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
 {
     static const char *unknown = "?";
 	
@@ -42,7 +42,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf)
 	TQCString	value;
 	int			pos;
 
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
     if (buf == 0 || strlen(buf) == 0) {
         return;
 	}
@@ -84,7 +84,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf)
 				dataType = VALUE_TYPE;
 			}
 			
-			setItem(tqparent, varName, dataType, value);
+			setItem(parent, varName, dataType, value);
 			
 			pos  += var_re.matchedLength();
 			pos = var_re.search(buf, pos);
@@ -94,7 +94,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf)
 	}
 }
 
-void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
+void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 {
 	DataType	dataType;
 	int			pos;
@@ -102,7 +102,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 	TQCString	value;
 	TQRegExp 	ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)");
     
-	switch (tqparent->dataType()) {
+	switch (parent->dataType()) {
     case REFERENCE_TYPE:
 	{
 		// Look for a reference type which has been printed via a 'pp' command, to
@@ -139,7 +139,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 				}
 				
 				dataType = determineType((char *) ppvalue_re.cap(2).latin1());
-				setItem(tqparent, varName, dataType, value);
+				setItem(parent, varName, dataType, value);
 				
 				pos += ppvalue_re.matchedLength();
 				pos = ppvalue_re.search(buf, pos);
@@ -170,7 +170,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 			}
 				
 			DataType dataType = determineType((char *) pparray_re.cap(2).latin1());
-			setItem(tqparent, varName, dataType, value);
+			setItem(parent, varName, dataType, value);
 				
 			pos += pparray_re.matchedLength();
 			pos = pparray_re.search(buf, pos);
@@ -193,7 +193,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 			varName = pphash_re.cap(1);
 			value = pphash_re.cap(2).latin1();
 	        DataType dataType = determineType(value.data());
-			setItem(tqparent, varName, dataType, value);
+			setItem(parent, varName, dataType, value);
 			
 			pos += pphash_re.matchedLength();
 			pos = pphash_re.search(buf, pos);
@@ -235,7 +235,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 				varName = ppvalue_re.cap(1);
 				value = ppvalue_re.cap(2).latin1();
 				dataType = determineType(value.data());
-				setItem(tqparent, varName, dataType, value);
+				setItem(parent, varName, dataType, value);
 				
 				pos += ppvalue_re.matchedLength();
 				pos = ppvalue_re.search(buf, pos);
@@ -259,7 +259,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 			varName = ppstring_re.cap(1);
 			value = ppstring_re.cap(2).latin1();
 	        DataType dataType = determineType(value.data());
-			setItem(tqparent, varName, dataType, value);
+			setItem(parent, varName, dataType, value);
 			
 			pos += ppstring_re.matchedLength();
 			pos = ppstring_re.search(buf, pos);
@@ -278,12 +278,12 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 
 // **************************************************************************
 
-void RDBParser::setItem(LazyFetchItem *tqparent, const TQString &varName,
+void RDBParser::setItem(LazyFetchItem *parent, const TQString &varName,
                         DataType dataType, const TQCString &value)
 {
-	VarItem *item = tqparent->findItem(varName);
+	VarItem *item = parent->findItem(varName);
     if (item == 0) {
-        item = new VarItem(tqparent, varName, dataType);
+        item = new VarItem(parent, varName, dataType);
     } else {
 		// The dataType of an item can change, so update it
 		item->setDataType(dataType);
diff --git a/languages/ruby/debugger/rdbparser.h b/languages/ruby/debugger/rdbparser.h
index 2ee59b0a..d57e25d7 100644
--- a/languages/ruby/debugger/rdbparser.h
+++ b/languages/ruby/debugger/rdbparser.h
@@ -29,10 +29,10 @@ namespace RDBDebugger
 
 namespace RDBParser
 {
-    void parseVariables(LazyFetchItem *tqparent, char *buf);
-    void parseExpandedVariable(VarItem *tqparent, char *buf);
+    void parseVariables(LazyFetchItem *parent, char *buf);
+    void parseExpandedVariable(VarItem *parent, char *buf);
     DataType determineType(char *buf);
-    void setItem(	LazyFetchItem *tqparent, const TQString &varName, 
+    void setItem(	LazyFetchItem *parent, const TQString &varName, 
 					DataType dataType, const TQCString &value );
 }
 
diff --git a/languages/ruby/debugger/rdbtable.cpp b/languages/ruby/debugger/rdbtable.cpp
index 429654d5..31b7b6d2 100644
--- a/languages/ruby/debugger/rdbtable.cpp
+++ b/languages/ruby/debugger/rdbtable.cpp
@@ -18,13 +18,13 @@
 
 namespace RDBDebugger {
 
-RDBTable::RDBTable(TQWidget *tqparent, const char *name)
- : TQTable(tqparent, name)
+RDBTable::RDBTable(TQWidget *parent, const char *name)
+ : TQTable(parent, name)
 {
 }
 
-RDBTable::RDBTable(int nr, int nc, TQWidget * tqparent, const char * name)
- : TQTable(nr, nc, tqparent, name)
+RDBTable::RDBTable(int nr, int nc, TQWidget * parent, const char * name)
+ : TQTable(nr, nc, parent, name)
 {
 }
 
diff --git a/languages/ruby/debugger/rdbtable.h b/languages/ruby/debugger/rdbtable.h
index 5cb72e93..157a9e13 100644
--- a/languages/ruby/debugger/rdbtable.h
+++ b/languages/ruby/debugger/rdbtable.h
@@ -25,8 +25,8 @@ class RDBTable : public TQTable
 Q_OBJECT
   TQ_OBJECT
 public:
-    RDBTable(TQWidget *tqparent = 0, const char *name = 0);
-    RDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 );
+    RDBTable(TQWidget *parent = 0, const char *name = 0);
+    RDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 );
     ~RDBTable();
 
     virtual void keyPressEvent ( TQKeyEvent * e );
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index f28b32b9..0cdd0eea 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -330,11 +330,11 @@ bool STTY::findExternalTTY(const TQString &termApp)
         ::exit(1);
     }
 
-    // tqparent process
+    // parent process
     if (pid <= 0)
         ::exit(1);
 
-    // Open the communication between us (the tqparent) and the
+    // Open the communication between us (the parent) and the
     // child (the process running on a tty console)
     fifo_fd = ::open(fifo, O_RDONLY);
     if (fifo_fd < 0)
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 42a14322..0348e8f9 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -49,8 +49,8 @@
 namespace RDBDebugger
 {
 
-VariableWidget::VariableWidget(TQWidget *tqparent, const char *name)
-    : TQWidget(tqparent, name)
+VariableWidget::VariableWidget(TQWidget *parent, const char *name)
+    : TQWidget(parent, name)
 {
     varTree_ = new VariableTree(this);
     TQLabel *label = new TQLabel(i18n("E&xpression to watch:"), this);
@@ -127,8 +127,8 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el)
 // **************************************************************************
 // **************************************************************************
 
-VariableTree::VariableTree(VariableWidget *tqparent, const char *name)
-    : KListView(tqparent, name),
+VariableTree::VariableTree(VariableWidget *parent, const char *name)
+    : KListView(parent, name),
       TQToolTip( viewport() ),
       activationId_(0),
       currentThread_(-1),
@@ -187,7 +187,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 
     setSelected(item, true);    // Need to select this item.
 
-    if (item->tqparent() != 0) {
+    if (item->parent() != 0) {
         KPopupMenu popup(this);
         popup.insertTitle(item->text(VAR_NAME_COLUMN));
         int idRemoveWatch = -2;
@@ -233,7 +233,7 @@ void VariableTree::slotPressed(TQListViewItem * item)
 	}
 	
 	while (item->rtti() == RTTI_VAR_ITEM) {
-		item = item->tqparent();
+		item = item->parent();
 	}
 	
 	if (	item->rtti() == RTTI_GLOBAL_ROOT
@@ -440,8 +440,8 @@ void VariableTree::maybeTip(const TQPoint &p)
 // **************************************************************************
 // **************************************************************************
 
-LazyFetchItem::LazyFetchItem(VariableTree *tqparent)
-    : KListViewItem(tqparent),
+LazyFetchItem::LazyFetchItem(VariableTree *parent)
+    : KListViewItem(parent),
       activationId_(0),
 	  waitingForData_(false)
 {
@@ -450,8 +450,8 @@ LazyFetchItem::LazyFetchItem(VariableTree *tqparent)
 
 // **************************************************************************
 
-LazyFetchItem::LazyFetchItem(LazyFetchItem *tqparent)
-    : KListViewItem(tqparent),
+LazyFetchItem::LazyFetchItem(LazyFetchItem *parent)
+    : KListViewItem(parent),
       activationId_(0),
       waitingForData_(false)
 {
@@ -474,7 +474,7 @@ void LazyFetchItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 	}
 	
     // make toplevel item (watch and frame items) names bold
-    if (column == VAR_NAME_COLUMN && tqparent() == 0) {
+    if (column == VAR_NAME_COLUMN && parent() == 0) {
         TQFont f = p->font();
         f.setBold(true);
         p->setFont(f);
@@ -526,8 +526,8 @@ void LazyFetchItem::prune()
 // **************************************************************************
 // **************************************************************************
 
-VarItem::VarItem(LazyFetchItem *tqparent, const TQString &varName, DataType dataType)
-    : LazyFetchItem (tqparent),
+VarItem::VarItem(LazyFetchItem *parent, const TQString &varName, DataType dataType)
+    : LazyFetchItem (parent),
       cache_(TQCString()),
       dataType_(dataType),
       highlight_(false)
@@ -586,7 +586,7 @@ TQString VarItem::fullName() const
     TQString vPath("");
     const VarItem *item = this;
 
-	if (item->tqparent()->rtti() != RTTI_VAR_ITEM) {
+	if (item->parent()->rtti() != RTTI_VAR_ITEM) {
 		return itemName;
 	}
 
@@ -605,7 +605,7 @@ TQString VarItem::fullName() const
  				vPath.prepend(itemName + ".");
 			}
         }
-		item = (VarItem*) item->tqparent();
+		item = (VarItem*) item->parent();
     }
 
 	// Change 'self.@foobar' to '@foobar'
@@ -746,8 +746,8 @@ TQString VarItem::tipText() const
 // **************************************************************************
 // **************************************************************************
 
-VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo)
-    : LazyFetchItem(tqparent),
+VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo)
+    : LazyFetchItem(parent),
       needsVariables_(true),
       frameNo_(frameNo),
       threadNo_(threadNo),
@@ -828,8 +828,8 @@ bool VarFrameRoot::needsVariables() const
 // **************************************************************************
 
 
-GlobalRoot::GlobalRoot(VariableTree *tqparent)
-    : LazyFetchItem(tqparent)
+GlobalRoot::GlobalRoot(VariableTree *parent)
+    : LazyFetchItem(parent)
 {
     setText(0, i18n("Global"));
     setExpandable(true);
@@ -872,8 +872,8 @@ void GlobalRoot::setOpen(bool open)
 // **************************************************************************
 // **************************************************************************
 
-WatchVarItem::WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId )
-    : VarItem(tqparent, varName, dataType),
+WatchVarItem::WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId )
+    : VarItem(parent, varName, dataType),
 	displayId_(displayId)
 {
 }
@@ -903,8 +903,8 @@ int WatchVarItem::displayId()
 // **************************************************************************
 // **************************************************************************
 
-WatchRoot::WatchRoot(VariableTree *tqparent)
-    : LazyFetchItem(tqparent)
+WatchRoot::WatchRoot(VariableTree *parent)
+    : LazyFetchItem(parent)
 {
     setText(VAR_NAME_COLUMN, i18n("Watch"));
     setOpen(true);
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index 830acf64..a54fc42e 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -66,7 +66,7 @@ class VariableWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    VariableWidget( TQWidget *tqparent=0, const char *name=0 );
+    VariableWidget( TQWidget *parent=0, const char *name=0 );
 
     VariableTree *varTree() const
     { return varTree_; }
@@ -100,7 +100,7 @@ class VariableTree : public KListView, public TQToolTip
 friend class LazyFetchItem;
 
 public:
-	VariableTree( VariableWidget *tqparent, const char *name=0 );
+	VariableTree( VariableWidget *parent, const char *name=0 );
     virtual ~VariableTree();
 	
 	// Clear everything but the Watch frame
@@ -172,8 +172,8 @@ private:
 class LazyFetchItem : public KListViewItem
 {
 public:
-    LazyFetchItem(VariableTree *tqparent);
-    LazyFetchItem(LazyFetchItem *tqparent);
+    LazyFetchItem(VariableTree *parent);
+    LazyFetchItem(LazyFetchItem *parent);
 
     virtual ~LazyFetchItem();
 
@@ -206,7 +206,7 @@ private:
 class VarItem : public LazyFetchItem
 {
 public:
-    VarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType );
+    VarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType );
 
     virtual ~VarItem();
 	
@@ -249,7 +249,7 @@ private:
 class WatchVarItem : public VarItem
 {
 public:
-    WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId = -1);
+    WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId = -1);
 
     virtual ~WatchVarItem();
 	
@@ -270,7 +270,7 @@ private:
 class VarFrameRoot : public LazyFetchItem
 {
 public:
-    VarFrameRoot(VariableTree *tqparent, int frame, int thread);
+    VarFrameRoot(VariableTree *parent, int frame, int thread);
     virtual ~VarFrameRoot();
 	
 	virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; }
@@ -305,7 +305,7 @@ private:
 class WatchRoot : public LazyFetchItem
 {
 public:
-    WatchRoot(VariableTree * tqparent);
+    WatchRoot(VariableTree * parent);
     virtual ~WatchRoot();
 	
 	virtual int rtti() const { return RTTI_WATCH_ROOT; }
@@ -328,7 +328,7 @@ public:
 class GlobalRoot : public LazyFetchItem
 {
 public:
-    GlobalRoot(VariableTree * tqparent);
+    GlobalRoot(VariableTree * parent);
     virtual ~GlobalRoot();
 	
 	virtual int rtti() const { return RTTI_GLOBAL_ROOT; }