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/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;