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

1 files changed, 11 insertions, 11 deletions

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"