rename the following methods:

tqparent parent
tqmask mask


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

39 files changed, 132 insertions, 132 deletions

diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 2a6bc799..600f2111 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -67,7 +67,7 @@ supporting perl5-oop object.
 =head2 2.1 C++ Widget code
 
 The C++ code must be able to hand all required settings and messages
-for the widget.  Each new widget iherites it's tqparent and so forth
+for the widget.  Each new widget iherites it's parent and so forth
 allowing for a nice oop tqlayout.  The widget structure the author is
 following is the same as Qt's.  Their seems to work well, why
 re-invent the wheel?
@@ -117,27 +117,27 @@ destroyed.
 
 createWidget is defined as:
 
-PWidget *createWidget(widgetId *pwi, PWidget *tqparent);
+PWidget *createWidget(widgetId *pwi, PWidget *parent);
 
 It is called everytime a new widget of yours is required.  The
 widgetId will be the identifier for your widget and must be kept for
 all future commands.  PWidget::setWidgetId(pwi) should be called to
-set the widget id.  The *tqparent is the tqparent of the current widget.
+set the widget id.  The *parent is the parent of the current widget.
 Generally PWidget->widget() is passed to the contructor of your
-widget.  If it's 0, there is no tqparent. Simeplfied code for a the
+widget.  If it's 0, there is no parent. Simeplfied code for a the
 PFrame is:
 
 =begin text
 
 extern "C" {
-PWidget *createWidget(widgetId *pwi, PWIdget *tqparent);
+PWidget *createWidget(widgetId *pwi, PWIdget *parent);
 }
 
-PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){
+PWidget *createWidget(widgetId *pwi, PWIdget *parent){
 	QFrame *f;
-	PFrame *pf = new PFrame(tqparent);
-	if(tqparent != 0){
-		f = new QFrame(tqparent->widget());
+	PFrame *pf = new PFrame(parent);
+	if(parent != 0){
+		f = new QFrame(parent->widget());
 	}
 	else{
 		f = new QPFrame();
@@ -149,13 +149,13 @@ PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){
 
 =end text
 
-Note: you have to check tqparent for null since calling NULL->widget()
+Note: you have to check parent for null since calling NULL->widget()
 results in Bad Things (tm).
 
 =item 2.1.3 messageHandler
 
 This receives all commands, etc.  It should process required commands,
-if a command is unkown pass it to the tqparent.  PFrame example:
+if a command is unkown pass it to the parent.  PFrame example:
 
 =begin text
 
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index 8a8158e0..2baa316e 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -66,7 +66,7 @@
 
 
 // Fetch widgets
-// Desc: get widget from tqparent
+// Desc: get widget from parent
 // iWinId: not defined
 // iArg: not defined
 // cArg: 2 feilds, tab sperated, must be returned unchanged. 1. random string.  3. Object Name.
@@ -82,7 +82,7 @@
 // Widget commands starts at 1000 and end at 10000
 
 // Desc: create new widget
-// iWinId: tqparent widget id
+// iWinId: parent widget id
 // iArg: widget type as defined by PWIDGET_*
 // cArg: Must be return unchanged
 #define PUKE_WIDGET_CREATE 1000
@@ -335,13 +335,13 @@
 // cArg: not defined
 #define PUKE_WIDGET_SET_ENABLED_ACK -1090
 
-// Desc: recreate widget with new tqparent, etc
+// Desc: recreate widget with new parent, etc
 // IwinId: window id
-// iArg: window ID for new tqparent, 0x0 for no tqparent, toplevel
+// iArg: window ID for new parent, 0x0 for no parent, toplevel
 // cArg: 3 packed ints, 0 = x, 1 = y, 2 = showit
 #define PUKE_WIDGET_RECREATE 1091
 
-// Desc: ACK recreate widget with new tqparent, etc
+// Desc: ACK recreate widget with new parent, etc
 // IwinId: window id
 // iArg: 0 (for all ok, other for error)
 // cArg: 0
@@ -996,7 +996,7 @@
 // Group tqlayout commands exist between 10000 and 11000
 
 // Desc: create new box tqlayout
-// iWinId: PWidget tqparent
+// iWinId: PWidget parent
 // iArg: 2 shorts, short[0] direction, short[1] border
 // cArg: random character string
 #define PUKE_LAYOUT_NEW 11000
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 771a5676..20c020c7 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -50,7 +50,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 
 uint PukeController::uiBaseWinId = 10; // Gives a little seperation from the controller id
 
-PukeController::PukeController(TQString sock, TQObject *tqparent, const char *name) : PObject( tqparent, name )
+PukeController::PukeController(TQString sock, TQObject *parent, const char *name) : PObject( parent, name )
 {
   int len, prev_umask;
   struct sockaddr_un unix_addr;
@@ -562,7 +562,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   widgetId wIret;
 
   /*
-   * The tqparent widget ID and type are packed into the iArg
+   * The parent widget ID and type are packed into the iArg
    * the pattern is 2 shorts.
    */
 
@@ -580,14 +580,14 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   wIret.iWinId = uiBaseWinId;
   wIret.fd = fd;
 
-  //  CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
+  //  CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
   CreateArgs arg(this, pm, &wIret, 0);
 
   // Let's go looking for the widget
   // Match any class with the right name
   TQObject *obj = 0x0;
-  if(tqparent() && (strcmp(name, tqparent()->name()) == 0)){
-    obj = tqparent();
+  if(parent() && (strcmp(name, parent()->name()) == 0)){
+    obj = parent();
   }
   else {
     obj = objFinder::find(name, 0x0);
@@ -915,11 +915,11 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
 widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) 
 {
   widgetId wIret;
-  PWidget *tqparent = 0; // Defaults to no tqparent
+  PWidget *parent = 0; // Defaults to no parent
   WidgetS *ws = new WidgetS;
 
   /*
-   * The tqparent widget ID and type are packed into the iArg
+   * The parent widget ID and type are packed into the iArg
    * the pattern is 2 shorts.
    */
 
@@ -928,7 +928,7 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
   if(found != 2)
       throw(errorCommandFailed(PUKE_INVALID,7));
 
-  wI.iWinId = iParent; // wI is the identifier for the tqparent widget
+  wI.iWinId = iParent; // wI is the identifier for the parent widget
 
   if(widgetCF[iType] == NULL){ // No such widget, bail out.
     wIret.fd = 0;
@@ -947,11 +947,11 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
     if(obj->widget()->isWidgetType() == FALSE){
       throw(errorCommandFailed(PUKE_INVALID, 0));
     }
-    tqparent = (PWidget *) obj;
+    parent = (PWidget *) obj;
   }
 
-  //  CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
-  CreateArgs arg(this, pm, &wIret, tqparent);
+  //  CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
+  CreateArgs arg(this, pm, &wIret, parent);
   ws->pwidget = (widgetCF[iType]->wc)(arg);
   if (ws->pwidget->hasError())
   {
diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h
index 5d22cef3..92c8be98 100644
--- a/ksirc/puke/controller.h
+++ b/ksirc/puke/controller.h
@@ -82,7 +82,7 @@ class PukeController : public PObject
   Q_OBJECT
   TQ_OBJECT
 public:
-  PukeController(TQString socket = "", TQObject *tqparent=0, const char *name=0);
+  PukeController(TQString socket = "", TQObject *parent=0, const char *name=0);
   virtual ~PukeController();
   bool running;
 
@@ -169,7 +169,7 @@ private:
   
   /**
    * Create new Widget, returns new iWinId for it.
-   * Takes server fd and tqparent winid, and type as arguments
+   * Takes server fd and parent winid, and type as arguments
    */
   widgetId createWidget(widgetId wI, PukeMessage *pm);
 
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 211cbf91..05124441 100644
--- a/ksirc/puke/palistbox.cpp
+++ b/ksirc/puke/palistbox.cpp
@@ -6,14 +6,14 @@
 PObject *
 PAListBox::createWidget(CreateArgs &ca) 
 {
-  PAListBox *plb = new PAListBox(ca.tqparent);
+  PAListBox *plb = new PAListBox(ca.parent);
   aListBox *lb;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox") == TRUE){
     lb = (aListBox *) ca.fetchedObj;
     plb->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    lb = new aListBox((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    lb = new aListBox((TQWidget *) ca.parent->widget());
   else
     lb = new aListBox();
   plb->setWidget(lb);
@@ -22,8 +22,8 @@ PAListBox::createWidget(CreateArgs &ca)
 }
 
 
-PAListBox::PAListBox(PObject *tqparent) 
-  : PListBox(tqparent)
+PAListBox::PAListBox(PObject *parent) 
+  : PListBox(parent)
 {
   //  kdDebug(5008) << "PListBox PListBox called" << endl;
   lb = 0;
diff --git a/ksirc/puke/palistbox.h b/ksirc/puke/palistbox.h
index 5c50023e..d7731685 100644
--- a/ksirc/puke/palistbox.h
+++ b/ksirc/puke/palistbox.h
@@ -15,7 +15,7 @@ class PAListBox : public PListBox
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PAListBox ( PObject * tqparent );
+  PAListBox ( PObject * parent );
   virtual ~PAListBox ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pbase.pm b/ksirc/puke/pbase.pm
index b5b13be7..b8345cdb 100644
--- a/ksirc/puke/pbase.pm
+++ b/ksirc/puke/pbase.pm
@@ -40,19 +40,19 @@ sub rndchr {
 
 sub new {
   my $class = shift;
-  my $tqparent = $_[$#_];
+  my $parent = $_[$#_];
 
   my $self  = {};
 
 
-#  print "Parent: $tqparent\n";
+#  print "Parent: $parent\n";
 
   bless($self, $class);
 
-  $tqparent = 0 if($tqparent == undef);
+  $parent = 0 if($parent == undef);
 
   $self->{iWinId} = -1;
-  $self->{Parent} = $tqparent if $tqparent != 0;
+  $self->{Parent} = $parent if $parent != 0;
   $self->{initId} = $self->rndchr();
   $self->{widgetType} = $PBase::NO_WIDGET;
   $self->{cmdQueue} = ();
@@ -77,13 +77,13 @@ sub create {
     return;
   }
 
-  my $tqparent = $self->{Parent} ?  $self->{Parent}->{iWinId} : 0;
+  my $parent = $self->{Parent} ?  $self->{Parent}->{iWinId} : 0;
   
-  #  print "*I* Createing widget of type: " . $self->{widgetType} . " with tqparent " . $tqparent . "\n";
+  #  print "*I* Createing widget of type: " . $self->{widgetType} . " with parent " . $parent . "\n";
 
   $self->{runable} = 1;
 
-  my $carg = $tqparent . "\t" . $self->{widgetType} . "\t" .  $self->{initId};
+  my $carg = $parent . "\t" . $self->{widgetType} . "\t" .  $self->{initId};
   
   my %REPLY = $self->sendMessage('iCommand' => $::PUKE_WIDGET_CREATE,
                                  'iWinId' => $::PUKE_CONTROLLER,
diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm
index 22087b5f..9896fd1c 100644
--- a/ksirc/puke/pboxlayout.pm
+++ b/ksirc/puke/pboxlayout.pm
@@ -28,7 +28,7 @@ sub new {
   #  print "Widget: " . ref($widget) . "\n";
 
   #  if(ref($widget) eq ''){
-  #  print "*E* Error Creating PBoxLayout, did not give valid tqparent\n";
+  #  print "*E* Error Creating PBoxLayout, did not give valid parent\n";
   #  return;
   #}
   #  elsif(ref($widget) eq 'PBoxLayout'){
@@ -99,7 +99,7 @@ sub addWidget {
   my $align = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add widget without first being added to tqparent tqlayout\n";
+    print "*E* Burp: Can't add widget without first being added to parent tqlayout\n";
     return;
   }
 
@@ -128,7 +128,7 @@ sub addLayout {
   my $self = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add tqlayout without first being added to tqparent tqlayout\n";
+    print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n";
   }
 
   
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index 828b7f2f..f21cdf03 100644
--- a/ksirc/puke/pbutton.cpp
+++ b/ksirc/puke/pbutton.cpp
@@ -10,10 +10,10 @@
 PObject *
 PButton::createWidget(CreateArgs &ca)
 {
-  PButton *pb = new PButton(ca.tqparent);
+  PButton *pb = new PButton(ca.parent);
   TQButton *qb;
-  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    qb = new TQButton((TQWidget *) ca.tqparent->widget());
+  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    qb = new TQButton((TQWidget *) ca.parent->widget());
   else
     qb = new TQButton();
   pb->setWidget(qb);
@@ -22,8 +22,8 @@ PButton::createWidget(CreateArgs &ca)
 }
 
 
-PButton::PButton(PObject *tqparent)
-  : PWidget(tqparent)
+PButton::PButton(PObject *parent)
+  : PWidget(parent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   button = 0;
diff --git a/ksirc/puke/pbutton.h b/ksirc/puke/pbutton.h
index 2ee1fb1f..20546c8b 100644
--- a/ksirc/puke/pbutton.h
+++ b/ksirc/puke/pbutton.h
@@ -17,7 +17,7 @@ class PButton : public PWidget
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PButton ( PObject * tqparent );
+  PButton ( PObject * parent );
   virtual ~PButton ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index 6acad37e..11d504c5 100644
--- a/ksirc/puke/pframe.cpp
+++ b/ksirc/puke/pframe.cpp
@@ -4,11 +4,11 @@
 PObject *
 PFrame::createWidget(CreateArgs &ca)
 {
-  PFrame *pw = new PFrame(ca.tqparent);
+  PFrame *pw = new PFrame(ca.parent);
   TQFrame *tf;
-  if(ca.tqparent != 0 &&
-     ca.tqparent->widget()->isWidgetType() == TRUE)
-    tf = new TQFrame((TQWidget *) ca.tqparent->widget());
+  if(ca.parent != 0 &&
+     ca.parent->widget()->isWidgetType() == TRUE)
+    tf = new TQFrame((TQWidget *) ca.parent->widget());
   else
     tf = new TQFrame();
   pw->setWidget(tf);
@@ -18,8 +18,8 @@ PFrame::createWidget(CreateArgs &ca)
 }
 
 
-PFrame::PFrame( PObject *tqparent)
-  : PWidget(tqparent)
+PFrame::PFrame( PObject *parent)
+  : PWidget(parent)
 {
   //  kdDebug(5008) << "PFrame PFrame called" << endl;
   frame = 0;
diff --git a/ksirc/puke/pframe.h b/ksirc/puke/pframe.h
index 0405f99b..65a2ec29 100644
--- a/ksirc/puke/pframe.h
+++ b/ksirc/puke/pframe.h
@@ -14,7 +14,7 @@ class PFrame : public PWidget
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PFrame ( PObject * tqparent );
+  PFrame ( PObject * parent );
   virtual ~PFrame ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pkfiledialog.cpp b/ksirc/puke/pkfiledialog.cpp
index 255ed2b8..53d37aa7 100644
--- a/ksirc/puke/pkfiledialog.cpp
+++ b/ksirc/puke/pkfiledialog.cpp
@@ -9,13 +9,13 @@
 PObject *
 PKFileDialog::createWidget(CreateArgs &ca)
 {
-  PKFileDialog *pw = new PKFileDialog(ca.tqparent);
+  PKFileDialog *pw = new PKFileDialog(ca.parent);
   KFileDialog *kfbd;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog") == TRUE){
     kfbd = (KFileDialog *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
-  else // Never takes a tqparent in Puke
+  else // Never takes a parent in Puke
     kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", TRUE);
   pw->setWidget(kfbd);
   pw->setWidgetId(ca.pwI);
@@ -23,8 +23,8 @@ PKFileDialog::createWidget(CreateArgs &ca)
 }
 
 
-PKFileDialog::PKFileDialog(PObject *tqparent)
-  : PWidget(tqparent)
+PKFileDialog::PKFileDialog(PObject *parent)
+  : PWidget(parent)
 {
   kfbd = 0;
   setWidget(kfbd);
diff --git a/ksirc/puke/pkfiledialog.h b/ksirc/puke/pkfiledialog.h
index 5b5802bb..274f1997 100644
--- a/ksirc/puke/pkfiledialog.h
+++ b/ksirc/puke/pkfiledialog.h
@@ -15,7 +15,7 @@ class PKFileDialog : public PWidget
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PKFileDialog ( PObject * tqparent );
+  PKFileDialog ( PObject * parent );
   virtual ~PKFileDialog ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 2c313e3a..41a68636 100644
--- a/ksirc/puke/plabel.cpp
+++ b/ksirc/puke/plabel.cpp
@@ -8,14 +8,14 @@
 PObject *
 PLabel::createWidget(CreateArgs &ca)
 {
-  PLabel *pw = new PLabel(ca.tqparent);
+  PLabel *pw = new PLabel(ca.parent);
   TQLabel *le;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){
     le = (TQLabel *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    le = new TQLabel((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    le = new TQLabel((TQWidget *) ca.parent->widget());
   else
     le = new TQLabel((TQWidget *)0L);
   pw->setWidget(le);
@@ -24,8 +24,8 @@ PLabel::createWidget(CreateArgs &ca)
 }
 
 
-PLabel::PLabel(PObject *tqparent)
-  : PFrame(tqparent)
+PLabel::PLabel(PObject *parent)
+  : PFrame(parent)
 {
   //  kdDebug(5008) << "PLabel PLabel called" << endl;
   label = 0;
diff --git a/ksirc/puke/plabel.h b/ksirc/puke/plabel.h
index 8fd0bceb..57a50b68 100644
--- a/ksirc/puke/plabel.h
+++ b/ksirc/puke/plabel.h
@@ -15,7 +15,7 @@ class PLabel : public PFrame
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLabel ( PObject * tqparent );
+  PLabel ( PObject * parent );
   virtual ~PLabel ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index e3242a81..3dbe5c87 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -23,7 +23,7 @@ PLayout::~PLayout()
 
 PObject *PLayout::createWidget(CreateArgs &ca)
 {
-  PLayout *pw = new PLayout(ca.tqparent);
+  PLayout *pw = new PLayout(ca.parent);
   TQBoxLayout *qbl;
   int direction, border, iType, iParent;
   // Retreive the border and direction information out of the
@@ -31,10 +31,10 @@ PObject *PLayout::createWidget(CreateArgs &ca)
   if(sscanf(ca.pm->cArg, "%d\t%d\t%d\t%d", &iParent, &iType, &direction, &border) < 4)
     throw(errorCommandFailed(-ca.pm->iCommand, -1));
   
-  if((ca.tqparent != 0) &&
-     (ca.tqparent->widget()->isWidgetType() == TRUE)){
-    qbl = new TQBoxLayout((TQWidget *) ca.tqparent->widget(), (TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating tqlayout with tqparent: " << tqparent.iWinId << endl;
+  if((ca.parent != 0) &&
+     (ca.parent->widget()->isWidgetType() == TRUE)){
+    qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
+    //      kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl;
 
   }
   else{
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 45f1975c..4124cb14 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -15,7 +15,7 @@ class PLayout : public PObject
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLayout(TQObject *tqparent = 0);
+  PLayout(TQObject *parent = 0);
   virtual ~PLayout();
 
   /**
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 0b50ee5f..250edc13 100644
--- a/ksirc/puke/plined.cpp
+++ b/ksirc/puke/plined.cpp
@@ -8,10 +8,10 @@
 PObject *
 PLineEdit::createWidget(CreateArgs &ca)
 {
-  PLineEdit *pw = new PLineEdit(ca.tqparent);
+  PLineEdit *pw = new PLineEdit(ca.parent);
   TQLineEdit *le;
-  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    le = new TQLineEdit((TQWidget *) ca.tqparent->widget());
+  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    le = new TQLineEdit((TQWidget *) ca.parent->widget());
   else
     le = new TQLineEdit(0L);
   pw->setWidget(le);
@@ -20,8 +20,8 @@ PLineEdit::createWidget(CreateArgs &ca)
 }
 
 
-PLineEdit::PLineEdit(PObject *tqparent)
-  : PWidget(tqparent)
+PLineEdit::PLineEdit(PObject *parent)
+  : PWidget(parent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   lineedit = 0;
diff --git a/ksirc/puke/plined.h b/ksirc/puke/plined.h
index 6bcd3bb3..ed86640d 100644
--- a/ksirc/puke/plined.h
+++ b/ksirc/puke/plined.h
@@ -15,7 +15,7 @@ class PLineEdit : public PWidget
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLineEdit ( PObject * tqparent );
+  PLineEdit ( PObject * parent );
   virtual ~PLineEdit ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index 6766d58a..c244f81b 100644
--- a/ksirc/puke/plistbox.cpp
+++ b/ksirc/puke/plistbox.cpp
@@ -6,14 +6,14 @@
 PObject *
 PListBox::createWidget(CreateArgs &ca) 
 {
-  PListBox *plb = new PListBox(ca.tqparent);
+  PListBox *plb = new PListBox(ca.parent);
   TQListBox *lb;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){
     lb = (TQListBox *) ca.fetchedObj;
     plb->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    lb = new TQListBox((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    lb = new TQListBox((TQWidget *) ca.parent->widget());
   else
     lb = new TQListBox();
   plb->setWidget(lb);
@@ -22,8 +22,8 @@ PListBox::createWidget(CreateArgs &ca)
 }
 
 
-PListBox::PListBox(PObject *tqparent) 
-  : PFrame(tqparent)
+PListBox::PListBox(PObject *parent) 
+  : PFrame(parent)
 {
   //  kdDebug(5008) << "PListBox PListBox called" << endl;
   lb = 0;
diff --git a/ksirc/puke/plistbox.h b/ksirc/puke/plistbox.h
index f2e1c191..e130fdd3 100644
--- a/ksirc/puke/plistbox.h
+++ b/ksirc/puke/plistbox.h
@@ -15,7 +15,7 @@ class PListBox : public PFrame
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PListBox ( PObject * tqparent );
+  PListBox ( PObject * parent );
   virtual ~PListBox ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp
index 7ca4ddee..576ebc39 100644
--- a/ksirc/puke/pmenudta.cpp
+++ b/ksirc/puke/pmenudta.cpp
@@ -13,7 +13,7 @@ PMenuData::PMenuData(PObject *_child)
 
 PMenuData::~PMenuData()
 {
-  // We don't nuke anything since we're kind of abstract and we let the tqparent take care of it
+  // We don't nuke anything since we're kind of abstract and we let the parent take care of it
 }
 
 void PMenuData::messageHandler(int , PukeMessage *)
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index f1457302..ab729315 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -23,10 +23,10 @@ PObject::~PObject()
 
 PObject *PObject::createWidget(CreateArgs &ca) 
 {
-  PObject *pw = new PObject(ca.tqparent);
+  PObject *pw = new PObject(ca.parent);
   TQObject *o;
-  if(ca.tqparent != 0)
-    o = new TQObject(ca.tqparent->widget());
+  if(ca.parent != 0)
+    o = new TQObject(ca.parent->widget());
   else
     o = new TQObject();
   pw->setWidget(o);
diff --git a/ksirc/puke/pobject.h b/ksirc/puke/pobject.h
index ef1589b3..757a33d4 100644
--- a/ksirc/puke/pobject.h
+++ b/ksirc/puke/pobject.h
@@ -14,13 +14,13 @@ public:
   CreateArgs(PukeController *_pc, PukeMessage *_pm, widgetId *_pwI, PObject *_parent){
     pc = _pc;
     pwI = _pwI;
-    tqparent = _parent;
+    parent = _parent;
     pm = _pm;
     fetchedObj = 0;
   }
   PukeController *pc;
   widgetId *pwI;
-  PObject *tqparent;
+  PObject *parent;
   PukeMessage *pm;
 
   /**
@@ -34,7 +34,7 @@ class PObject : public TQObject
   Q_OBJECT
   TQ_OBJECT
  public:
-  PObject(TQObject *tqparent = 0, const char *name = 0);
+  PObject(TQObject *parent = 0, const char *name = 0);
   virtual ~PObject();
 
   /**
diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp
index c8ca6557..6870e142 100644
--- a/ksirc/puke/pobjfinder.cpp
+++ b/ksirc/puke/pobjfinder.cpp
@@ -5,7 +5,7 @@
 PObject *
 PObjFinder::createWidget(CreateArgs &ca)
 {
-  PObjFinder *pw = new PObjFinder(ca.tqparent);
+  PObjFinder *pw = new PObjFinder(ca.parent);
   pw->setWidget(0x0);
   pw->setWidgetId(ca.pwI);
   pw->setPukeController(ca.pc);
@@ -13,8 +13,8 @@ PObjFinder::createWidget(CreateArgs &ca)
 }
 
 
-PObjFinder::PObjFinder(PObject *tqparent)
-  : PObject(tqparent)
+PObjFinder::PObjFinder(PObject *parent)
+  : PObject(parent)
 {
   // We don't actually encase a widget since all the ObjFinder interface
   // is static
diff --git a/ksirc/puke/pobjfinder.h b/ksirc/puke/pobjfinder.h
index 8eac2424..e2bfd76e 100644
--- a/ksirc/puke/pobjfinder.h
+++ b/ksirc/puke/pobjfinder.h
@@ -14,7 +14,7 @@ class PObjFinder : public PObject
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PObjFinder ( PObject * tqparent );
+  PObjFinder ( PObject * parent );
   virtual ~PObjFinder ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index 225aa203..3ed66aa3 100644
--- a/ksirc/puke/ppopmenu.cpp
+++ b/ksirc/puke/ppopmenu.cpp
@@ -6,14 +6,14 @@
 PObject *
 PPopupMenu::createWidget(CreateArgs &ca)
 {
-  PPopupMenu *pm = new PPopupMenu(ca.tqparent);
+  PPopupMenu *pm = new PPopupMenu(ca.parent);
   TQPopupMenu *qpm;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){
     qpm= (TQPopupMenu *) ca.fetchedObj;
     pm->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    qpm = new TQPopupMenu((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    qpm = new TQPopupMenu((TQWidget *) ca.parent->widget());
   else
     qpm = new TQPopupMenu();
   pm->setWidget(qpm);
@@ -22,8 +22,8 @@ PPopupMenu::createWidget(CreateArgs &ca)
 }
 
 
-PPopupMenu::PPopupMenu(PObject *tqparent)
-  : PFrame(tqparent)
+PPopupMenu::PPopupMenu(PObject *parent)
+  : PFrame(parent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   menu = 0;
diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp
index 41838bca..09ed39d2 100644
--- a/ksirc/puke/pprogress.cpp
+++ b/ksirc/puke/pprogress.cpp
@@ -8,10 +8,10 @@
 PObject *
 PProgress::createWidget(CreateArgs &ca) 
 {
-  PProgress *pw = new PProgress(ca.tqparent);
+  PProgress *pw = new PProgress(ca.parent);
   KSProgress *ksp;
-  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    ksp = new KSProgress((TQWidget *) ca.tqparent->widget());
+  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    ksp = new KSProgress((TQWidget *) ca.parent->widget());
   else
     ksp = new KSProgress();
   pw->setWidget(ksp);
@@ -20,8 +20,8 @@ PProgress::createWidget(CreateArgs &ca)
 }
 
 
-PProgress::PProgress( PObject *tqparent) 
-  : PWidget(tqparent)
+PProgress::PProgress( PObject *parent) 
+  : PWidget(parent)
 {
   //  kdDebug(5008) << "PProgress PProgress called" << endl;
   ksp = 0;
diff --git a/ksirc/puke/pprogress.h b/ksirc/puke/pprogress.h
index f88023c2..509c184d 100644
--- a/ksirc/puke/pprogress.h
+++ b/ksirc/puke/pprogress.h
@@ -15,7 +15,7 @@ class PProgress : public PWidget {
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PProgress ( PObject * tqparent = 0);
+  PProgress ( PObject * parent = 0);
   virtual ~PProgress ();
 
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index cf61d642..f006fbd2 100644
--- a/ksirc/puke/ppushbt.cpp
+++ b/ksirc/puke/ppushbt.cpp
@@ -5,10 +5,10 @@
 PObject *
 PPushButton::createWidget(CreateArgs &ca)
 {
-  PPushButton *pb = new PPushButton(ca.tqparent);
+  PPushButton *pb = new PPushButton(ca.parent);
   TQPushButton *qb;
-  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    qb = new TQPushButton((TQWidget *) ca.tqparent->widget());
+  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    qb = new TQPushButton((TQWidget *) ca.parent->widget());
   else
     qb = new TQPushButton(0L);
   pb->setWidget(qb);
@@ -17,8 +17,8 @@ PPushButton::createWidget(CreateArgs &ca)
 }
 
 
-PPushButton::PPushButton(PObject *tqparent)
-  : PButton(tqparent)
+PPushButton::PPushButton(PObject *parent)
+  : PButton(parent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   button = 0;
diff --git a/ksirc/puke/ppushbt.h b/ksirc/puke/ppushbt.h
index e887afb8..dc9e0a40 100644
--- a/ksirc/puke/ppushbt.h
+++ b/ksirc/puke/ppushbt.h
@@ -16,7 +16,7 @@ class PPushButton : public PButton
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PPushButton ( PObject * tqparent );
+  PPushButton ( PObject * parent );
   virtual ~PPushButton ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index cd25f64a..30bc3e0a 100644
--- a/ksirc/puke/ptabdialog.cpp
+++ b/ksirc/puke/ptabdialog.cpp
@@ -8,7 +8,7 @@
 PObject *
 PTabDialog::createWidget(CreateArgs &ca)
 {
-  PTabDialog *ptd = new PTabDialog(ca.tqparent);
+  PTabDialog *ptd = new PTabDialog(ca.parent);
   TQTabDialog *qtd;
   // Retreive the border and direction information out of the
   // carg string
@@ -16,8 +16,8 @@ PTabDialog::createWidget(CreateArgs &ca)
     qtd = (TQTabDialog *) ca.fetchedObj;
     ptd->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-    qtd = new TQTabDialog((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+    qtd = new TQTabDialog((TQWidget *) ca.parent->widget());
   else
     qtd = new TQTabDialog();
   ptd->setWidget(qtd);
diff --git a/ksirc/puke/ptabdialog.h b/ksirc/puke/ptabdialog.h
index 0e4c9b94..a603d684 100644
--- a/ksirc/puke/ptabdialog.h
+++ b/ksirc/puke/ptabdialog.h
@@ -14,7 +14,7 @@ class PTabDialog : public PWidget
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PTabDialog(TQObject *tqparent = 0);
+  PTabDialog(TQObject *parent = 0);
   virtual ~PTabDialog();
 
   /**
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index 3c77eeab..64c8fa2e 100644
--- a/ksirc/puke/ptablevw.cpp
+++ b/ksirc/puke/ptablevw.cpp
@@ -5,15 +5,15 @@ PObject *
 PTableView::createWidget(CreateArgs &ca)
 {
   qWarning("Table View is abstract class, cannot create an object from it!!!");
-  PTableView *pt = new PTableView(ca.tqparent);
+  PTableView *pt = new PTableView(ca.parent);
   pt->setWidget(0);
   pt->setWidgetId(ca.pwI);
   return pt;
 }
 
 
-PTableView::PTableView(PObject *tqparent)
-  : PFrame(tqparent)
+PTableView::PTableView(PObject *parent)
+  : PFrame(parent)
 {
   //  kdDebug(5008) << "PTableView PTableView called" << endl;
   tbl = 0;
diff --git a/ksirc/puke/ptablevw.h b/ksirc/puke/ptablevw.h
index 1974aec4..89469407 100644
--- a/ksirc/puke/ptablevw.h
+++ b/ksirc/puke/ptablevw.h
@@ -17,7 +17,7 @@ class PTableView : public PFrame
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PTableView ( PObject * tqparent );
+  PTableView ( PObject * parent );
   virtual ~PTableView ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index 20507b55..cf3ac667 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -59,8 +59,8 @@ PObject *PWidget::createWidget(CreateArgs &ca)
     tw = (TQWidget *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
-  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
-      tw = new TQWidget((TQWidget *) ca.tqparent->widget());
+  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+      tw = new TQWidget((TQWidget *) ca.parent->widget());
   else
     tw = new TQWidget();
   pw->setWidget(tw);
@@ -236,12 +236,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
     break;
   case PUKE_WIDGET_RECREATE:
   {
-    TQWidget *ntqparent = 0x0;
+    TQWidget *nparent = 0x0;
     if(pm->iArg != 0x0){
       widgetId wiWidget;
       wiWidget.fd = fd;
       wiWidget.iWinId = pm->iArg;
-      ntqparent = controller()->id2pwidget(&wiWidget)->widget();
+      nparent = controller()->id2pwidget(&wiWidget)->widget();
     }
     if(pm->iTextSize != 3*sizeof(int)){
        throw(errorCommandFailed(pm->iCommand, pm->iArg));
@@ -250,7 +250,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
 
     qWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]);
     
-    widget()->reparent(ntqparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]);
+    widget()->reparent(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]);
 
    pmRet.iCommand = PUKE_WIDGET_RECREATE_ACK;
    pmRet.iWinId = pm->iWinId;
diff --git a/ksirc/puke/pwidget.h b/ksirc/puke/pwidget.h
index 294203b2..bc8fb4e9 100644
--- a/ksirc/puke/pwidget.h
+++ b/ksirc/puke/pwidget.h
@@ -13,7 +13,7 @@ class PWidget : public PObject
   Q_OBJECT
   TQ_OBJECT
  public:
-  PWidget(PObject *tqparent = 0);
+  PWidget(PObject *parent = 0);
   virtual ~PWidget();
 
   // Init and setup code
diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm
index b0f1c014..56381db6 100644
--- a/ksirc/puke/pwidget.pm
+++ b/ksirc/puke/pwidget.pm
@@ -216,11 +216,11 @@ sub setEnabled {
 sub recreate {
   my $self = shift;
 
-  my $ntqparent = shift;
+  my $nparent = shift;
   my $wflags = shift; # Not used!
   
   $self->sendMessage('iCommand' => $::PUKE_WIDGET_RECREATE,
-                     'iArg' => $ntqparent ? $ntqparent->{'iWinId'} : 0,
+                     'iArg' => $nparent ? $nparent->{'iWinId'} : 0,
 		     'cArg' => pack("iii", shift(), shift(), shift()),
 		     'CallBack' => sub {});