TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

48 files changed, 256 insertions, 238 deletions

diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index cf44e77e..9a09acd4 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -11,7 +11,7 @@ under Linux.
 Puke's a generic protocol allowing dsirc to communicate with ksirc.
 Communications works over a unix domain socket between multiple
 client dsirc process's to a single ksirc process.  All communications
-is done via a variable length message with the following layout:
+is done via a variable length message with the following tqlayout:
 
 =begin text
 
@@ -67,18 +67,18 @@ 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 parent and so forth
-allowing for a nice oop layout.  The widget structure the author is
+for the widget.  Each new widget iherites it's tqparent 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?
 
 =item 2.1.1 General Layout, etc
 
 Figure where your new widget goes in the heirachy.  If it's a simple
-Qt widget, I recommend using their existing layout.  Man pages list
+Qt widget, I recommend using their existing tqlayout.  Man pages list
 what widgets inherit what.
 
-The general idea behind the widget layout should be to be to provide
+The general idea behind the widget tqlayout should be to be to provide
 all the functionality of the widget to dsirc perl script.  Incoming
 messages are handled via the messageHandler and ALL messages should
 return an ACK with current state info.
@@ -106,7 +106,7 @@ These set and return your widget.
 
 If you care about inheritance, which you should, all these functions
 should be virtual.  (Since we are using pointers to PWidget's
-everywhere, it's a good bet you want your children's overriden
+everywhere, it's a good bet you want your tqchildren's overriden
 functions called, not yours)
 
 The structure internally will have to hold a local copy of the widget,
@@ -117,27 +117,27 @@ destroyed.
 
 createWidget is defined as:
 
-PWidget *createWidget(widgetId *pwi, PWidget *parent);
+PWidget *createWidget(widgetId *pwi, PWidget *tqparent);
 
 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 *parent is the parent of the current widget.
+set the widget id.  The *tqparent is the tqparent of the current widget.
 Generally PWidget->widget() is passed to the contructor of your
-widget.  If it's 0, there is no parent. Simeplfied code for a the
+widget.  If it's 0, there is no tqparent. Simeplfied code for a the
 PFrame is:
 
 =begin text
 
 extern "C" {
-PWidget *createWidget(widgetId *pwi, PWIdget *parent);
+PWidget *createWidget(widgetId *pwi, PWIdget *tqparent);
 }
 
-PWidget *createWidget(widgetId *pwi, PWIdget *parent){
+PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){
 	QFrame *f;
-	PFrame *pf = new PFrame(parent);
-	if(parent != 0){
-		f = new QFrame(parent->widget());
+	PFrame *pf = new PFrame(tqparent);
+	if(tqparent != 0){
+		f = new QFrame(tqparent->widget());
 	}
 	else{
 		f = new QPFrame();
@@ -149,13 +149,13 @@ PWidget *createWidget(widgetId *pwi, PWIdget *parent){
 
 =end text
 
-Note: you have to check parent for null since calling NULL->widget()
+Note: you have to check tqparent 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 parent.  PFrame example:
+if a command is unkown pass it to the tqparent.  PFrame example:
 
 =begin text
 
@@ -186,9 +186,9 @@ void PFrame::messageHandler(int fd, PukeMessage *pm) {
 
 Both these functions should be overriden and return your widget type,
 and set your widget.  For setWidget you should connect required
-signals and eventFilters you are using.
+Q_SIGNALS and eventFilters you are using.
 
-Make sure to call the parents setWidget in setWidget so it can connect 
+Make sure to call the tqparents setWidget in setWidget so it can connect 
 filters etc.  
 
 BEWARE: You might get the widget into setWidget being null (from the
@@ -222,7 +222,7 @@ Call the destructor as such:
 delete widget();
 setWidget(0);
 
-This will clear the widget from now and all parents and delete it.
+This will clear the widget from now and all tqparents and delete it.
 you never want it deleted twice. (deleting 0 won't hurt)
 
 =head2 2.2 The Perl code
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index 50ff88b2..8a8158e0 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -66,7 +66,7 @@
 
 
 // Fetch widgets
-// Desc: get widget from parent
+// Desc: get widget from tqparent
 // 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: parent widget id
+// iWinId: tqparent widget id
 // iArg: widget type as defined by PWIDGET_*
 // cArg: Must be return unchanged
 #define PUKE_WIDGET_CREATE 1000
@@ -130,38 +130,38 @@
 // cArg: not define
 #define PUKE_WIDGET_HIDE_ACK -1003
 
-// Desc: repaint widget
-// iWinId: widget to repaint
+// Desc: tqrepaint widget
+// iWinId: widget to tqrepaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_REPAINT 1005
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_REPAINT_ACK -1005
 
 // Desc: update widget on next event loop
-// iWinId: widget to repaint
+// iWinId: widget to tqrepaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_UPDATE 1010
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_UPDATE_ACK -1010
 
 // Desc: resize the widget
-// iWinId: widget to repaint
+// iWinId: widget to tqrepaint
 // iArg: width in the low 16 bit, height in next 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE 1015
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: new widget in lower 16 bit, new height in lower 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE_ACK -1015
@@ -335,13 +335,13 @@
 // cArg: not defined
 #define PUKE_WIDGET_SET_ENABLED_ACK -1090
 
-// Desc: recreate widget with new parent, etc
+// Desc: recreate widget with new tqparent, etc
 // IwinId: window id
-// iArg: window ID for new parent, 0x0 for no parent, toplevel
+// iArg: window ID for new tqparent, 0x0 for no tqparent, toplevel
 // cArg: 3 packed ints, 0 = x, 1 = y, 2 = showit
 #define PUKE_WIDGET_RECREATE 1091
 
-// Desc: ACK recreate widget with new parent, etc
+// Desc: ACK recreate widget with new tqparent, etc
 // IwinId: window id
 // iArg: 0 (for all ok, other for error)
 // cArg: 0
@@ -349,33 +349,33 @@
 
 // TQFrame gets 1100
 
-// 1100 defines QFrame
+// 1100 defines TQFrame
 // Desc: set Frame style
 // iWinId: widget to chanse
 // iArg: frame style to set.
 // cArg: no define
-#define PUKE_QFRAME_SET_FRAME 1100
+#define PUKE_TQFRAME_SET_FRAME 1100
 
 // Desc: get/ack Frame style
 // iWinId: widget to changed
 // iArg: frame style.
 // cArg: no define
-#define PUKE_QFRAME_SET_FRAME_ACK -1100
+#define PUKE_TQFRAME_SET_FRAME_ACK -1100
 
 // Desc: set Frame line width
 // iWinId: widget to chanse
 // iArg: newline width.
 // cArg: no define
-#define PUKE_QFRAME_SET_LINEWIDTH 1105
+#define PUKE_TQFRAME_SET_LINEWIDTH 1105
 
 // Desc: get/ack Frame line width
 // iWinId: widget to changed
 // iArg: line width.
 // cArg: no define
-#define PUKE_QFRAME_SET_LINEWIDTH_ACK -1105
+#define PUKE_TQFRAME_SET_LINEWIDTH_ACK -1105
 
 //----------------------------------------------------
-// 1200 is a QLineEdit
+// 1200 is a TQLineEdit
 
 // Desc: set max line length
 // iWinId: widget to change
@@ -766,13 +766,13 @@
 
 // Desc: Set label's allignment
 // iWinId: window id
-// iArg: alignment
+// iArg: tqalignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT 1715
 
 // Desc: Set label's allignment, ACK
 // iWinId: window id
-// iArg: alignment
+// iArg: tqalignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT_ACK -1715
 
@@ -944,7 +944,7 @@
 // LINED defines the simple SLE
 #define PWIDGET_LINED 4
 
-// BUTTON defines the abstract class QButton
+// BUTTON defines the abstract class TQButton
 #define PWIDGET_BUTTON 5
 
 // PUSH defined the push button
@@ -993,14 +993,14 @@
 #define PWIDGET_OBJFINDER 18
 
 
-// Group layout commands exist between 10000 and 11000
+// Group tqlayout commands exist between 10000 and 11000
 
-// Desc: create new box layout
-// iWinId: PWidget parent
+// Desc: create new box tqlayout
+// iWinId: PWidget tqparent
 // iArg: 2 shorts, short[0] direction, short[1] border
 // cArg: random character string
 #define PUKE_LAYOUT_NEW 11000
-// Desc: ack for box layout
+// Desc: ack for box tqlayout
 // iWinId: Layout ID.
 // iArg: not define
 // cArg: same random m character string as PUKE_LAYOUT_NEW
@@ -1009,10 +1009,10 @@
 #define PUKE_LAYOUT_ADDLAYOUT 11005
 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005
 
-// Desc: add widget into layout manager
+// Desc: add widget into tqlayout manager
 // iWinId: Layout Manager to add widget too
 // iArg: Widget Id to be added
-// cArg: 2 characters, char[0] strech, char[1] alignment
+// cArg: 2 characters, char[0] strech, char[1] tqalignment
 #define PUKE_LAYOUT_ADDWIDGET 11010
 // Desc: ack for add widget
 // iWinId: Layout manager 
@@ -1032,7 +1032,7 @@
 // cArg: not define
 #define PUKE_LAYOUT_ADDSTRUT_ACK -11015
 
-// Desc: activates layout management, like show() for widget
+// Desc: activates tqlayout management, like show() for widget
 // iWinId: Layout Manager to activate
 // iArg: undef
 // cArg: undef
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 04017529..faa5cf23 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 
 using namespace std; // iostream.h include cstring which puts strlen into 
-                     // std:: namespace, which breaks Qt's strlen() call 
+                     // std:: namespace, which breaks TQt's strlen() call 
                      // in tqcstring.h (in gcc3's libstdc++)
 
 #include <klibloader.h>
@@ -32,7 +32,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 #include "pframe.h"
 #include "pkfiledialog.h"
 #include "plabel.h"
-#include "playout.h"
+#include "ptqlayout.h"
 #include "plined.h"
 #include "plistbox.h"
 #include "pmenudta.h"
@@ -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 *parent, const char *name) : PObject( parent, name )
+PukeController::PukeController(TQString sock, TQObject *tqparent, const char *name) : PObject( tqparent, name )
 {
   int len, prev_umask;
   struct sockaddr_un unix_addr;
@@ -173,7 +173,7 @@ void PukeController::NewConnect(int)
   fcntl(cfd, F_SETFL, O_NONBLOCK);  // Set it non-block so that
                                     // cfd() never blocks.
 
-  fdStatus *fds = new fdStatus();
+  fdtqStatus *fds = new fdtqStatus();
   fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this);
   fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this);
   connect(fds->sr, TQT_SIGNAL(activated(int)),
@@ -562,7 +562,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   widgetId wIret;
 
   /*
-   * The parent widget ID and type are packed into the iArg
+   * The tqparent widget ID and type are packed into the iArg
    * the pattern is 2 shorts.
    */
 
@@ -580,17 +580,17 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   wIret.iWinId = uiBaseWinId;
   wIret.fd = fd;
 
-  //  CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
+  //  CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
   CreateArgs arg(this, pm, &wIret, 0);
 
   // Let's go looking for the widget
   // Match any class with the right name
   TQObject *obj = 0x0;
-  if(parent() && (strcmp(name, parent()->name()) == 0)){
-    obj = parent();
+  if(tqparent() && (strcmp(name, tqparent()->name()) == 0)){
+    obj = tqparent();
   }
   else {
-    obj = objFinder::find(name, 0x0);
+    obj = objFinder::tqfind(name, 0x0);
     if(obj == 0){
       wIret.fd = 0;
       wIret.iWinId = 0;
@@ -642,10 +642,10 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm)
     kdDebug(5008) << "WidgetRunner:: no such set of widget descriptors?" << endl;
     throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_CONNECTION));
   }
-  if(qidWS->find(wI.iWinId)){
+  if(qidWS->tqfind(wI.iWinId)){
     // Remove the list item then delete the widget.  This will stop
     // the destroyed signal from trying to remove it again.
-    PObject *pw = qidWS->find(wI.iWinId)->pwidget;
+    PObject *pw = qidWS->tqfind(wI.iWinId)->pwidget;
     qidWS->remove(wI.iWinId);
     delete pw; pw = 0;
     pmRet.iCommand = PUKE_WIDGET_DELETE_ACK;
@@ -661,8 +661,8 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm)
     throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET));
   }
 
-  WidgetList[fd]->find(wI.iWinId)->pwidget->manTerm();
-  delete WidgetList[fd]->find(wI.iWinId)->pwidget;
+  WidgetList[fd]->tqfind(wI.iWinId)->pwidget->manTerm();
+  delete WidgetList[fd]->tqfind(wI.iWinId)->pwidget;
 
   PukeMessage pmRet = *pm;
   pmRet.iCommand = PUKE_WIDGET_DELETE_ACK;
@@ -711,7 +711,7 @@ void PukeController::closefd(int fd)
     PObject *po = 0x0;
     while(it.current()){
       /*
-       * Delete all the layouts first
+       * Delete all the tqlayouts first
        *
        */
       if(it.current()->type == POBJECT_LAYOUT){
@@ -745,7 +745,7 @@ void PukeController::closefd(int fd)
 bool PukeController::checkWidgetId(widgetId *pwi) 
 {
   if(WidgetList[pwi->fd] != NULL)
-    if(WidgetList[pwi->fd]->find(pwi->iWinId) != NULL)
+    if(WidgetList[pwi->fd]->tqfind(pwi->iWinId) != NULL)
       return TRUE;
 
   return FALSE;
@@ -753,7 +753,7 @@ bool PukeController::checkWidgetId(widgetId *pwi)
 
 PObject *PukeController::id2pobject(widgetId *pwi){ 
   if(checkWidgetId(pwi) == TRUE){
-    return WidgetList[pwi->fd]->find(pwi->iWinId)->pwidget;
+    return WidgetList[pwi->fd]->tqfind(pwi->iWinId)->pwidget;
   }
   throw(errorNoSuchWidget(*pwi));
   return 0; // never reached
@@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
       return;
     }
 
-    TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg);
+    TQString libName = "ksirc/lib"+TQString::tqfromLatin1(pm->cArg);
     if (libName.right(3) == ".so")
        libName = libName.left(libName.length()-2)+"la";
 
@@ -899,7 +899,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
   }
   else{
     if(checkWidgetId(&wI) == TRUE){
-      WidgetList[wI.fd]->find(wI.iWinId)->pwidget->messageHandler(fd, pm);
+      WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget->messageHandler(fd, pm);
     }
     else{
       PukeMessage pmRet;
@@ -915,11 +915,11 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
 widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) 
 {
   widgetId wIret;
-  PWidget *parent = 0; // Defaults to no parent
+  PWidget *tqparent = 0; // Defaults to no tqparent
   WidgetS *ws = new WidgetS;
 
   /*
-   * The parent widget ID and type are packed into the iArg
+   * The tqparent 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 parent widget
+  wI.iWinId = iParent; // wI is the identifier for the tqparent widget
 
   if(widgetCF[iType] == NULL){ // No such widget, bail out.
     wIret.fd = 0;
@@ -943,15 +943,15 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
   wIret.fd = wI.fd;
 
   if(checkWidgetId(&wI) == TRUE){
-    PObject *obj = WidgetList[wI.fd]->find(wI.iWinId)->pwidget;
+    PObject *obj = WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget;
     if(obj->widget()->isWidgetType() == FALSE){
       throw(errorCommandFailed(PUKE_INVALID, 0));
     }
-    parent = (PWidget *) obj;
+    tqparent = (PWidget *) obj;
   }
 
-  //  CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
-  CreateArgs arg(this, pm, &wIret, parent);
+  //  CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
+  CreateArgs arg(this, pm, &wIret, tqparent);
   ws->pwidget = (widgetCF[iType]->wc)(arg);
   if (ws->pwidget->hasError())
   {
diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h
index 5daa1629..5d22cef3 100644
--- a/ksirc/puke/controller.h
+++ b/ksirc/puke/controller.h
@@ -27,7 +27,7 @@ typedef struct {
   TQString server;
   bool writeable;
   TQSocketNotifier *sr,*sw;
-} fdStatus;
+} fdtqStatus;
 
 
 struct commandStruct {
@@ -80,8 +80,9 @@ private:
 class PukeController : public PObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  PukeController(TQString socket = "", TQObject *parent=0, const char *name=0);
+  PukeController(TQString socket = "", TQObject *tqparent=0, const char *name=0);
   virtual ~PukeController();
   bool running;
 
@@ -136,7 +137,7 @@ private:
   int iListenFd;
   bool bClosing; // Set true if we are closing, we don't try and close twice at the same time.
   TQSocketNotifier *qsnListen;
-  TQIntDict<fdStatus> qidConnectFd;
+  TQIntDict<fdtqStatus> qidConnectFd;
 
   /**
    * Controller ID is defined as 1
@@ -168,7 +169,7 @@ private:
   
   /**
    * Create new Widget, returns new iWinId for it.
-   * Takes server fd and parent winid, and type as arguments
+   * Takes server fd and tqparent winid, and type as arguments
    */
   widgetId createWidget(widgetId wI, PukeMessage *pm);
 
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 65bc1b07..5101cc58 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -6,7 +6,7 @@
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
 &docommand("/load pbutton.pm");;
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
@@ -123,7 +123,7 @@ sub sendClicked {
 
 use vars qw(@ISA $KSIRC_DCC %KSIRC_DCC);
 
-package DCCStatus;
+package DCCtqStatus;
 use vars qw(@ISA);
 @ISA = qw(PFrame);
 
@@ -178,7 +178,7 @@ sub new {
       = ( $gm_main, $label,   $lb,  $button_get,  $button_send,  $button_forget,  $gm_but1,  $gm_but2,  $button_send );
 
 
-  print "*I* Finished creating DCCStatus\n";
+  print "*I* Finished creating DCCtqStatus\n";
 
   return $self;
 }
@@ -330,7 +330,7 @@ sub hook_ksirc_dcc_request {
   my($size) = shift;
   my($mwho) = $who;
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
 
@@ -371,7 +371,7 @@ sub hook_ksirc_dcc_send {
   $window->setRange(0, $size);
   $window->setCaption("$file=>$nick");
   $window->setTopText("Sending: $file Size: $size");
-  $window->setBotText("Status: pending");
+  $window->setBotText("tqStatus: pending");
   $window->setCancel("dcc close send $nick $file");
   $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
   $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;
@@ -417,7 +417,7 @@ sub hook_ksirc_dcc_get {
     $window->setRange(0, $size);
     $window->setCaption("$file<=$nick");
     $window->setTopText("Receiver: $file Size: $size");
-    $window->setBotText("Status: pending");
+    $window->setBotText("tqStatus: pending");
     $window->setCancel("dcc close get $nick $file");
     $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
     $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;
@@ -438,7 +438,7 @@ sub hook_ksirc_dcc_get_status {
     $window->setRange(0, 1);
     $window->setCaption("$file<=$nick");
     $window->setTopText("Receiver: $file Size: Unkown");
-    $window->setBotText("Status: pending");
+    $window->setBotText("tqStatus: pending");
     $window->setCancel("dcc close get $nick $file");
     $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
     $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;
@@ -472,14 +472,14 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect");
 
 
 
-&print("*I* Done DCC Status");
-#$::test = new DCCStatus;
+&print("*I* Done DCC tqStatus");
+#$::test = new DCCtqStatus;
 #$::test->resize(400, 275);
 #$::test->show();
 
 sub popup_dccstatus{
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
   $KSIRC_DCCSTATUS->show();
@@ -487,7 +487,7 @@ sub popup_dccstatus{
 
 sub popup_dccsend{
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
   $KSIRC_DCCSTATUS->sendClicked();
diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm
index 26594c0f..048eb9eb 100644
--- a/ksirc/puke/load_all.pm
+++ b/ksirc/puke/load_all.pm
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm"); 
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 9f43b124..211cbf91 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.parent);
+  PAListBox *plb = new PAListBox(ca.tqparent);
   aListBox *lb;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox") == TRUE){
     lb = (aListBox *) ca.fetchedObj;
     plb->setDeleteAble(FALSE);
   }
-  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    lb = new aListBox((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    lb = new aListBox((TQWidget *) ca.tqparent->widget());
   else
     lb = new aListBox();
   plb->setWidget(lb);
@@ -22,8 +22,8 @@ PAListBox::createWidget(CreateArgs &ca)
 }
 
 
-PAListBox::PAListBox(PObject *parent) 
-  : PListBox(parent)
+PAListBox::PAListBox(PObject *tqparent) 
+  : PListBox(tqparent)
 {
   //  kdDebug(5008) << "PListBox PListBox called" << endl;
   lb = 0;
@@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setVoice(pm->iArg);
       widget()->inSort(item);
-      widget()->repaint(TRUE);
+      widget()->tqrepaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
@@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setOp(pm->iArg);
       widget()->inSort(item);
-      widget()->repaint(TRUE);
+      widget()->tqrepaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
diff --git a/ksirc/puke/palistbox.h b/ksirc/puke/palistbox.h
index a902b018..5c50023e 100644
--- a/ksirc/puke/palistbox.h
+++ b/ksirc/puke/palistbox.h
@@ -11,10 +11,11 @@ class PAListBox;
 class PAListBox : public PListBox
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PAListBox ( PObject * parent );
+  PAListBox ( PObject * tqparent );
   virtual ~PAListBox ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pbase.pm b/ksirc/puke/pbase.pm
index b8345cdb..b5b13be7 100644
--- a/ksirc/puke/pbase.pm
+++ b/ksirc/puke/pbase.pm
@@ -40,19 +40,19 @@ sub rndchr {
 
 sub new {
   my $class = shift;
-  my $parent = $_[$#_];
+  my $tqparent = $_[$#_];
 
   my $self  = {};
 
 
-#  print "Parent: $parent\n";
+#  print "Parent: $tqparent\n";
 
   bless($self, $class);
 
-  $parent = 0 if($parent == undef);
+  $tqparent = 0 if($tqparent == undef);
 
   $self->{iWinId} = -1;
-  $self->{Parent} = $parent if $parent != 0;
+  $self->{Parent} = $tqparent if $tqparent != 0;
   $self->{initId} = $self->rndchr();
   $self->{widgetType} = $PBase::NO_WIDGET;
   $self->{cmdQueue} = ();
@@ -77,13 +77,13 @@ sub create {
     return;
   }
 
-  my $parent = $self->{Parent} ?  $self->{Parent}->{iWinId} : 0;
+  my $tqparent = $self->{Parent} ?  $self->{Parent}->{iWinId} : 0;
   
-  #  print "*I* Createing widget of type: " . $self->{widgetType} . " with parent " . $parent . "\n";
+  #  print "*I* Createing widget of type: " . $self->{widgetType} . " with tqparent " . $tqparent . "\n";
 
   $self->{runable} = 1;
 
-  my $carg = $parent . "\t" . $self->{widgetType} . "\t" .  $self->{initId};
+  my $carg = $tqparent . "\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 505ddc0d..22087b5f 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 parent\n";
+  #  print "*E* Error Creating PBoxLayout, did not give valid tqparent\n";
   #  return;
   #}
   #  elsif(ref($widget) eq 'PBoxLayout'){
@@ -40,7 +40,7 @@ sub new {
   #}
   #  else{
   if(ref($widget) ne ''){
-      #    print "*\cbI\cb* Generic Non-topleve layout type\n";
+      #    print "*\cbI\cb* Generic Non-topleve tqlayout type\n";
     $self->{Parent} = $widget;
     $self->{ParentType} = 'Widget';
     $self->{Direction} = shift;
@@ -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 parent layout\n";
+    print "*E* Burp: Can't add widget without first being added to tqparent tqlayout\n";
     return;
   }
 
@@ -128,41 +128,41 @@ sub addLayout {
   my $self = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add layout without first being added to parent layout\n";
+    print "*E* Burp: Can't add tqlayout without first being added to tqparent tqlayout\n";
   }
 
   
-  my $layout = shift;
-  if(ref($layout) ne 'PBoxLayout'){
-    print "*E* Passed non layout type to addLayout\n";
+  my $tqlayout = shift;
+  if(ref($tqlayout) ne 'PBoxLayout'){
+    print "*E* Passed non tqlayout type to addLayout\n";
     return 1;
   }
 
-  if($layout->{iWinId} <= 0){
-    print "*E* Trying to add invalid layout " . ref($layout) . "\n";
+  if($tqlayout->{iWinId} <= 0){
+    print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n";
     return;
   }
 
 
   # make sure we can run, and the widget we want to add can run.
-  #  my @ARG = ($layout);
+  #  my @ARG = ($tqlayout);
   #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
-  #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
+  #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
 
   my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT,
                                  'iWinId' => $self->{iWinId},
-                                 'iArg' => $layout->{iWinId},
+                                 'iArg' => $tqlayout->{iWinId},
                                  'cArg' => pack("C", 0),
                                  'CallBack' => sub { },
                                  'WaitFor' => 1);
 
-  #  print "*I* Adding layout\n";
+  #  print "*I* Adding tqlayout\n";
   if($REPLY{'iArg'} != 0){
     print "*E* AddLayout call failed\n";
   }
   else{
-    #    print "*I* Added new Layout for " . $layout->{iWinId} . "\n";
-    $layout->{Added} = 1;
+    #    print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n";
+    $tqlayout->{Added} = 1;
   }
 
 }
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index f21cdf03..828b7f2f 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.parent);
+  PButton *pb = new PButton(ca.tqparent);
   TQButton *qb;
-  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    qb = new TQButton((TQWidget *) ca.parent->widget());
+  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    qb = new TQButton((TQWidget *) ca.tqparent->widget());
   else
     qb = new TQButton();
   pb->setWidget(qb);
@@ -22,8 +22,8 @@ PButton::createWidget(CreateArgs &ca)
 }
 
 
-PButton::PButton(PObject *parent)
-  : PWidget(parent)
+PButton::PButton(PObject *tqparent)
+  : PWidget(tqparent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   button = 0;
diff --git a/ksirc/puke/pbutton.h b/ksirc/puke/pbutton.h
index addc7713..2ee1fb1f 100644
--- a/ksirc/puke/pbutton.h
+++ b/ksirc/puke/pbutton.h
@@ -13,10 +13,11 @@ class PButton;
 class PButton : public PWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PButton ( PObject * parent );
+  PButton ( PObject * tqparent );
   virtual ~PButton ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index ed58d5a7..6acad37e 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.parent);
+  PFrame *pw = new PFrame(ca.tqparent);
   TQFrame *tf;
-  if(ca.parent != 0 &&
-     ca.parent->widget()->isWidgetType() == TRUE)
-    tf = new TQFrame((TQWidget *) ca.parent->widget());
+  if(ca.tqparent != 0 &&
+     ca.tqparent->widget()->isWidgetType() == TRUE)
+    tf = new TQFrame((TQWidget *) ca.tqparent->widget());
   else
     tf = new TQFrame();
   pw->setWidget(tf);
@@ -18,8 +18,8 @@ PFrame::createWidget(CreateArgs &ca)
 }
 
 
-PFrame::PFrame( PObject *parent)
-  : PWidget(parent)
+PFrame::PFrame( PObject *tqparent)
+  : PWidget(tqparent)
 {
   //  kdDebug(5008) << "PFrame PFrame called" << endl;
   frame = 0;
@@ -40,17 +40,17 @@ void PFrame::messageHandler(int fd, PukeMessage *pm)
   //  kdDebug(5008) << "PFrame handler called" << endl;
   PukeMessage pmRet;
   switch(pm->iCommand){
-  case PUKE_QFRAME_SET_FRAME:
+  case PUKE_TQFRAME_SET_FRAME:
     widget()->setFrameStyle(pm->iArg);
-    pmRet.iCommand = PUKE_QFRAME_SET_FRAME_ACK;
+    pmRet.iCommand = PUKE_TQFRAME_SET_FRAME_ACK;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = widget()->frameStyle();
     pmRet.cArg = 0;
     emit outputMessage(fd, &pmRet);
     break;
-  case PUKE_QFRAME_SET_LINEWIDTH:
+  case PUKE_TQFRAME_SET_LINEWIDTH:
     widget()->setLineWidth(pm->iArg);
-    pmRet.iCommand = PUKE_QFRAME_SET_LINEWIDTH_ACK;
+    pmRet.iCommand = PUKE_TQFRAME_SET_LINEWIDTH_ACK;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = widget()->lineWidth();
     pmRet.cArg = 0;
diff --git a/ksirc/puke/pframe.h b/ksirc/puke/pframe.h
index 8d7fbc82..0405f99b 100644
--- a/ksirc/puke/pframe.h
+++ b/ksirc/puke/pframe.h
@@ -10,10 +10,11 @@ class PFrame;
 class PFrame : public PWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PFrame ( PObject * parent );
+  PFrame ( PObject * tqparent );
   virtual ~PFrame ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm
index f851cdb8..2ef36ebc 100644
--- a/ksirc/puke/pframe.pm
+++ b/ksirc/puke/pframe.pm
@@ -44,13 +44,13 @@ sub setFrameStyle {
   my $self = shift;
 
   my $frame = shift;
-  my $repaint = shift;
+  my $tqrepaint = shift;
 
   $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME,
 		     'iArg' => $frame,
 		    'CallBack' => sub {});
 
-  $self->repaint(1) if($repaint == 1);
+  $self->tqrepaint(1) if($tqrepaint == 1);
 
 }
 
diff --git a/ksirc/puke/pkfiledialog.cpp b/ksirc/puke/pkfiledialog.cpp
index f78ae895..255ed2b8 100644
--- a/ksirc/puke/pkfiledialog.cpp
+++ b/ksirc/puke/pkfiledialog.cpp
@@ -9,22 +9,22 @@
 PObject *
 PKFileDialog::createWidget(CreateArgs &ca)
 {
-  PKFileDialog *pw = new PKFileDialog(ca.parent);
+  PKFileDialog *pw = new PKFileDialog(ca.tqparent);
   KFileDialog *kfbd;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog") == TRUE){
     kfbd = (KFileDialog *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
-  else // Never takes a parent in Puke
-    kfbd = new KFileDialog("/", TQString::null, 0L, "PukeKFileDialog", TRUE);
+  else // Never takes a tqparent in Puke
+    kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", TRUE);
   pw->setWidget(kfbd);
   pw->setWidgetId(ca.pwI);
   return pw;
 }
 
 
-PKFileDialog::PKFileDialog(PObject *parent)
-  : PWidget(parent)
+PKFileDialog::PKFileDialog(PObject *tqparent)
+  : PWidget(tqparent)
 {
   kfbd = 0;
   setWidget(kfbd);
diff --git a/ksirc/puke/pkfiledialog.h b/ksirc/puke/pkfiledialog.h
index dbfd7dd5..5b5802bb 100644
--- a/ksirc/puke/pkfiledialog.h
+++ b/ksirc/puke/pkfiledialog.h
@@ -11,10 +11,11 @@ class PKFileDialog;
 class PKFileDialog : public PWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PKFileDialog ( PObject * parent );
+  PKFileDialog ( PObject * tqparent );
   virtual ~PKFileDialog ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 7567ac08..2c313e3a 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.parent);
+  PLabel *pw = new PLabel(ca.tqparent);
   TQLabel *le;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){
     le = (TQLabel *) ca.fetchedObj;
     pw->setDeleteAble(FALSE);
   }
-  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    le = new TQLabel((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    le = new TQLabel((TQWidget *) ca.tqparent->widget());
   else
     le = new TQLabel((TQWidget *)0L);
   pw->setWidget(le);
@@ -24,8 +24,8 @@ PLabel::createWidget(CreateArgs &ca)
 }
 
 
-PLabel::PLabel(PObject *parent)
-  : PFrame(parent)
+PLabel::PLabel(PObject *tqparent)
+  : PFrame(tqparent)
 {
   //  kdDebug(5008) << "PLabel PLabel called" << endl;
   label = 0;
@@ -83,7 +83,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm)
     if(!checkWidget())
       return;
 
-    widget()->setAlignment(pm->iArg);
+    widget()->tqsetAlignment(pm->iArg);
     pmRet.iCommand = - pm->iCommand;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
diff --git a/ksirc/puke/plabel.h b/ksirc/puke/plabel.h
index f68ffd28..8fd0bceb 100644
--- a/ksirc/puke/plabel.h
+++ b/ksirc/puke/plabel.h
@@ -11,10 +11,11 @@ class PLabel;
 class PLabel : public PFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLabel ( PObject * parent );
+  PLabel ( PObject * tqparent );
   virtual ~PLabel ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plabel.pm b/ksirc/puke/plabel.pm
index bc557b5e..efdcf490 100644
--- a/ksirc/puke/plabel.pm
+++ b/ksirc/puke/plabel.pm
@@ -83,7 +83,7 @@ sub text {
 
 
 
-sub setAlignment {
+sub tqsetAlignment {
   my $self = shift;
   
   my $align = shift;
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index 9bcdfa2a..e3242a81 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 
-#include "playout.h"
+#include "ptqlayout.h"
 #include "commands.h"
 
 PLayout::PLayout(TQObject *pobject)
@@ -16,14 +16,14 @@ PLayout::~PLayout()
   //  kdDebug(5008) << "PObject: in destructor" << endl;
   /*
   delete widget();
-  layout = 0;
+  tqlayout = 0;
   setWidget();
   */
 }
 
 PObject *PLayout::createWidget(CreateArgs &ca)
 {
-  PLayout *pw = new PLayout(ca.parent);
+  PLayout *pw = new PLayout(ca.tqparent);
   TQBoxLayout *qbl;
   int direction, border, iType, iParent;
   // Retreive the border and direction information out of the
@@ -31,15 +31,15 @@ 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.parent != 0) &&
-     (ca.parent->widget()->isWidgetType() == TRUE)){
-    qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl;
+  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;
 
   }
   else{
     qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating layout NO PARENT" << endl;
+    //      kdDebug(5008) << "Creating tqlayout NO PARENT" << endl;
   }
   pw->setWidget(qbl);
   pw->setWidgetId(ca.pwI);
@@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout)
      return;
   }
 
-  layout = (TQBoxLayout *) _layout;
+  tqlayout = (TQBoxLayout *) _layout;
   PObject::setWidget(_layout);
   
 }
 
 TQBoxLayout *PLayout::widget()
 {
-  return layout;
+  return tqlayout;
 }
 
 
-#include "playout.moc"
+#include "ptqlayout.moc"
 
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 90a606b8..45f1975c 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -11,10 +11,11 @@ class PLayout;
 class PLayout : public PObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLayout(TQObject *parent = 0);
+  PLayout(TQObject *tqparent = 0);
   virtual ~PLayout();
 
   /**
@@ -35,7 +36,7 @@ public:
 
 private:
 
-  TQBoxLayout *layout;
+  TQBoxLayout *tqlayout;
 
 };
 
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 250edc13..0b50ee5f 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.parent);
+  PLineEdit *pw = new PLineEdit(ca.tqparent);
   TQLineEdit *le;
-  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    le = new TQLineEdit((TQWidget *) ca.parent->widget());
+  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    le = new TQLineEdit((TQWidget *) ca.tqparent->widget());
   else
     le = new TQLineEdit(0L);
   pw->setWidget(le);
@@ -20,8 +20,8 @@ PLineEdit::createWidget(CreateArgs &ca)
 }
 
 
-PLineEdit::PLineEdit(PObject *parent)
-  : PWidget(parent)
+PLineEdit::PLineEdit(PObject *tqparent)
+  : PWidget(tqparent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   lineedit = 0;
diff --git a/ksirc/puke/plined.h b/ksirc/puke/plined.h
index 91ca7413..6bcd3bb3 100644
--- a/ksirc/puke/plined.h
+++ b/ksirc/puke/plined.h
@@ -11,10 +11,11 @@ class PLineEdit;
 class PLineEdit : public PWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PLineEdit ( PObject * parent );
+  PLineEdit ( PObject * tqparent );
   virtual ~PLineEdit ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index c244f81b..6766d58a 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.parent);
+  PListBox *plb = new PListBox(ca.tqparent);
   TQListBox *lb;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){
     lb = (TQListBox *) ca.fetchedObj;
     plb->setDeleteAble(FALSE);
   }
-  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    lb = new TQListBox((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    lb = new TQListBox((TQWidget *) ca.tqparent->widget());
   else
     lb = new TQListBox();
   plb->setWidget(lb);
@@ -22,8 +22,8 @@ PListBox::createWidget(CreateArgs &ca)
 }
 
 
-PListBox::PListBox(PObject *parent) 
-  : PFrame(parent)
+PListBox::PListBox(PObject *tqparent) 
+  : PFrame(tqparent)
 {
   //  kdDebug(5008) << "PListBox PListBox called" << endl;
   lb = 0;
diff --git a/ksirc/puke/plistbox.h b/ksirc/puke/plistbox.h
index c7683b22..f2e1c191 100644
--- a/ksirc/puke/plistbox.h
+++ b/ksirc/puke/plistbox.h
@@ -11,10 +11,11 @@ class PListBox;
 class PListBox : public PFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PListBox ( PObject * parent );
+  PListBox ( PObject * tqparent );
   virtual ~PListBox ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp
index 576ebc39..7ca4ddee 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 parent take care of it
+  // We don't nuke anything since we're kind of abstract and we let the tqparent take care of it
 }
 
 void PMenuData::messageHandler(int , PukeMessage *)
diff --git a/ksirc/puke/pmenudta.h b/ksirc/puke/pmenudta.h
index 03227134..3e2a4b52 100644
--- a/ksirc/puke/pmenudta.h
+++ b/ksirc/puke/pmenudta.h
@@ -12,10 +12,10 @@ class PMenuData;
 
 /**
  * Little helper class here gives us access to needed info inside
- * QMenuData
+ * TQMenuData
  */
 
-class PMenuDataHelper : public QMenuData
+class PMenuDataHelper : public TQMenuData
 {
 public:
   PMenuDataHelper(TQMenuData &qmd) {
@@ -35,6 +35,7 @@ public:
 class PMenuData :  public PObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   PMenuData (PObject *_child);
   virtual ~PMenuData ();
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index 9e46e042..f1457302 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.parent);
+  PObject *pw = new PObject(ca.tqparent);
   TQObject *o;
-  if(ca.parent != 0)
-    o = new TQObject(ca.parent->widget());
+  if(ca.tqparent != 0)
+    o = new TQObject(ca.tqparent->widget());
   else
     o = new TQObject();
   pw->setWidget(o);
@@ -131,7 +131,7 @@ void PObject::manTerm() {
 
 void PObject::errorInvalidSet(TQObject *_w)
 { 
-  m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className());
+  m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className());
   m_hasError = true;
 }
 #include "pobject.moc"
diff --git a/ksirc/puke/pobject.h b/ksirc/puke/pobject.h
index d27fab58..ef1589b3 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;
-    parent = _parent;
+    tqparent = _parent;
     pm = _pm;
     fetchedObj = 0;
   }
   PukeController *pc;
   widgetId *pwI;
-  PObject *parent;
+  PObject *tqparent;
   PukeMessage *pm;
 
   /**
@@ -29,11 +29,12 @@ public:
   TQObject *fetchedObj;
 };
 
-class PObject : public QObject
+class PObject : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
  public:
-  PObject(TQObject *parent = 0, const char *name = 0);
+  PObject(TQObject *tqparent = 0, const char *name = 0);
   virtual ~PObject();
 
   /**
diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp
index 6870e142..c8ca6557 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.parent);
+  PObjFinder *pw = new PObjFinder(ca.tqparent);
   pw->setWidget(0x0);
   pw->setWidgetId(ca.pwI);
   pw->setPukeController(ca.pc);
@@ -13,8 +13,8 @@ PObjFinder::createWidget(CreateArgs &ca)
 }
 
 
-PObjFinder::PObjFinder(PObject *parent)
-  : PObject(parent)
+PObjFinder::PObjFinder(PObject *tqparent)
+  : PObject(tqparent)
 {
   // 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 32b4ff86..8eac2424 100644
--- a/ksirc/puke/pobjfinder.h
+++ b/ksirc/puke/pobjfinder.h
@@ -10,10 +10,11 @@
 class PObjFinder : public PObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PObjFinder ( PObject * parent );
+  PObjFinder ( PObject * tqparent );
   virtual ~PObjFinder ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index 3ed66aa3..225aa203 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.parent);
+  PPopupMenu *pm = new PPopupMenu(ca.tqparent);
   TQPopupMenu *qpm;
   if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){
     qpm= (TQPopupMenu *) ca.fetchedObj;
     pm->setDeleteAble(FALSE);
   }
-  else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    qpm = new TQPopupMenu((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    qpm = new TQPopupMenu((TQWidget *) ca.tqparent->widget());
   else
     qpm = new TQPopupMenu();
   pm->setWidget(qpm);
@@ -22,8 +22,8 @@ PPopupMenu::createWidget(CreateArgs &ca)
 }
 
 
-PPopupMenu::PPopupMenu(PObject *parent)
-  : PFrame(parent)
+PPopupMenu::PPopupMenu(PObject *tqparent)
+  : PFrame(tqparent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   menu = 0;
diff --git a/ksirc/puke/ppopmenu.h b/ksirc/puke/ppopmenu.h
index 4f5af16e..7f3e420c 100644
--- a/ksirc/puke/ppopmenu.h
+++ b/ksirc/puke/ppopmenu.h
@@ -13,6 +13,7 @@ class PPopupMenu;
 class PPopupMenu : public PFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp
index 09ed39d2..41838bca 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.parent);
+  PProgress *pw = new PProgress(ca.tqparent);
   KSProgress *ksp;
-  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    ksp = new KSProgress((TQWidget *) ca.parent->widget());
+  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    ksp = new KSProgress((TQWidget *) ca.tqparent->widget());
   else
     ksp = new KSProgress();
   pw->setWidget(ksp);
@@ -20,8 +20,8 @@ PProgress::createWidget(CreateArgs &ca)
 }
 
 
-PProgress::PProgress( PObject *parent) 
-  : PWidget(parent)
+PProgress::PProgress( PObject *tqparent) 
+  : PWidget(tqparent)
 {
   //  kdDebug(5008) << "PProgress PProgress called" << endl;
   ksp = 0;
diff --git a/ksirc/puke/pprogress.h b/ksirc/puke/pprogress.h
index 8542abab..f88023c2 100644
--- a/ksirc/puke/pprogress.h
+++ b/ksirc/puke/pprogress.h
@@ -11,10 +11,11 @@ class PProgress;
 
 class PProgress : public PWidget {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PProgress ( PObject * parent = 0);
+  PProgress ( PObject * tqparent = 0);
   virtual ~PProgress ();
 
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index f006fbd2..cf61d642 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.parent);
+  PPushButton *pb = new PPushButton(ca.tqparent);
   TQPushButton *qb;
-  if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    qb = new TQPushButton((TQWidget *) ca.parent->widget());
+  if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    qb = new TQPushButton((TQWidget *) ca.tqparent->widget());
   else
     qb = new TQPushButton(0L);
   pb->setWidget(qb);
@@ -17,8 +17,8 @@ PPushButton::createWidget(CreateArgs &ca)
 }
 
 
-PPushButton::PPushButton(PObject *parent)
-  : PButton(parent)
+PPushButton::PPushButton(PObject *tqparent)
+  : PButton(tqparent)
 {
   //  kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
   button = 0;
diff --git a/ksirc/puke/ppushbt.h b/ksirc/puke/ppushbt.h
index fd624a24..e887afb8 100644
--- a/ksirc/puke/ppushbt.h
+++ b/ksirc/puke/ppushbt.h
@@ -12,10 +12,11 @@ class PPushButton;
 class PPushButton : public PButton
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PPushButton ( PObject * parent );
+  PPushButton ( PObject * tqparent );
   virtual ~PPushButton ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index ee3054ff..cd25f64a 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.parent);
+  PTabDialog *ptd = new PTabDialog(ca.tqparent);
   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.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-    qtd = new TQTabDialog((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+    qtd = new TQTabDialog((TQWidget *) ca.tqparent->widget());
   else
     qtd = new TQTabDialog();
   ptd->setWidget(qtd);
@@ -49,7 +49,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm)
 
   if(pm->iCommand == PUKE_TABDIALOG_ADDTAB){
     if(!(pm->iTextSize > 0)){
-      qWarning("QTabDialog/addtab: incorrent cArg size, bailing out.  Needed: >0 got: %d\n", pm->iTextSize);
+      qWarning("TQTabDialog/addtab: incorrent cArg size, bailing out.  Needed: >0 got: %d\n", pm->iTextSize);
       pmRet.iCommand = PUKE_TABDIALOG_ADDTAB_ACK; // ack the add widget
       pmRet.iWinId = pm->iWinId;
       pmRet.iArg = 1;
diff --git a/ksirc/puke/ptabdialog.h b/ksirc/puke/ptabdialog.h
index 17132301..0e4c9b94 100644
--- a/ksirc/puke/ptabdialog.h
+++ b/ksirc/puke/ptabdialog.h
@@ -10,10 +10,11 @@ class PTabDialog;
 class PTabDialog : public PWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PTabDialog(TQObject *parent = 0);
+  PTabDialog(TQObject *tqparent = 0);
   virtual ~PTabDialog();
 
   /**
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index 64c8fa2e..3c77eeab 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.parent);
+  PTableView *pt = new PTableView(ca.tqparent);
   pt->setWidget(0);
   pt->setWidgetId(ca.pwI);
   return pt;
 }
 
 
-PTableView::PTableView(PObject *parent)
-  : PFrame(parent)
+PTableView::PTableView(PObject *tqparent)
+  : PFrame(tqparent)
 {
   //  kdDebug(5008) << "PTableView PTableView called" << endl;
   tbl = 0;
diff --git a/ksirc/puke/ptablevw.h b/ksirc/puke/ptablevw.h
index c1043a4b..1974aec4 100644
--- a/ksirc/puke/ptablevw.h
+++ b/ksirc/puke/ptablevw.h
@@ -13,10 +13,11 @@ class PTableView;
 class PTableView : public PFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   static PObject *createWidget(CreateArgs &ca);
 
-  PTableView ( PObject * parent );
+  PTableView ( PObject * tqparent );
   virtual ~PTableView ();
   
   virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index b62f64c1..20507b55 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.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
-      tw = new TQWidget((TQWidget *) ca.parent->widget());
+  else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
+      tw = new TQWidget((TQWidget *) ca.tqparent->widget());
   else
     tw = new TQWidget();
   pw->setWidget(tw);
@@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
     emit outputMessage(fd, &pmRet);
     break;    
   case PUKE_WIDGET_REPAINT:
-    widget()->repaint(pm->iArg);
+    widget()->tqrepaint(pm->iArg);
     pmRet.iCommand = PUKE_WIDGET_REPAINT_ACK;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
@@ -209,12 +209,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
       int *pos;
       pos = (int *) pm->cArg;
       TQColor bg(pos[0], pos[1], pos[2]);
-      TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(),
+      TQColorGroup cg = TQColorGroup(widget()->tqcolorGroup().foreground(),
                                    bg,
-                                   widget()->colorGroup().light(),
-                                   widget()->colorGroup().dark(),
-                                   widget()->colorGroup().mid(),
-                                   widget()->colorGroup().text(),
+                                   widget()->tqcolorGroup().light(),
+                                   widget()->tqcolorGroup().dark(),
+                                   widget()->tqcolorGroup().mid(),
+                                   widget()->tqcolorGroup().text(),
                                    bg);
       widget()->setPalette(TQPalette(cg,cg,cg));
 
@@ -236,12 +236,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
     break;
   case PUKE_WIDGET_RECREATE:
   {
-    TQWidget *nparent = 0x0;
+    TQWidget *ntqparent = 0x0;
     if(pm->iArg != 0x0){
       widgetId wiWidget;
       wiWidget.fd = fd;
       wiWidget.iWinId = pm->iArg;
-      nparent = controller()->id2pwidget(&wiWidget)->widget();
+      ntqparent = 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(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]);
+    widget()->reparent(ntqparent, (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 68853e63..294203b2 100644
--- a/ksirc/puke/pwidget.h
+++ b/ksirc/puke/pwidget.h
@@ -11,8 +11,9 @@ class PWidget;
 class PWidget : public PObject
 {
   Q_OBJECT
+  TQ_OBJECT
  public:
-  PWidget(PObject *parent = 0);
+  PWidget(PObject *tqparent = 0);
   virtual ~PWidget();
 
   // Init and setup code
diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm
index 5a73d393..b0f1c014 100644
--- a/ksirc/puke/pwidget.pm
+++ b/ksirc/puke/pwidget.pm
@@ -61,7 +61,7 @@ sub hide {
   $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE);
 }
 
-sub repaint {
+sub tqrepaint {
   my $self = shift;
   
   my $erase = shift; # 1 for erase and reapint
@@ -216,11 +216,11 @@ sub setEnabled {
 sub recreate {
   my $self = shift;
 
-  my $nparent = shift;
+  my $ntqparent = shift;
   my $wflags = shift; # Not used!
   
   $self->sendMessage('iCommand' => $::PUKE_WIDGET_RECREATE,
-                     'iArg' => $nparent ? $nparent->{'iWinId'} : 0,
+                     'iArg' => $ntqparent ? $ntqparent->{'iWinId'} : 0,
 		     'cArg' => pack("iii", shift(), shift(), shift()),
 		     'CallBack' => sub {});
 
diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl
index 7e7b251d..fdeae902 100644
--- a/ksirc/puke/small.pl
+++ b/ksirc/puke/small.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl
index 4b4c3169..369a2dc9 100644
--- a/ksirc/puke/test.pl
+++ b/ksirc/puke/test.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks
index a0b2a56a..d73fa513 100644
--- a/ksirc/puke/user_monitor.ks
+++ b/ksirc/puke/user_monitor.ks
@@ -3,7 +3,7 @@
 &docommand("/load pframe.pm");
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pmenudta.pm");
 &docommand("/load ppopmenu.pm");