From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 22 Jun 2011 00:30:31 +0000
Subject: 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
---
 lanbrowsing/lisa/client.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lanbrowsing/lisa/client.cpp')

diff --git a/lanbrowsing/lisa/client.cpp b/lanbrowsing/lisa/client.cpp
index 21069a17..e26b2674 100644
--- a/lanbrowsing/lisa/client.cpp
+++ b/lanbrowsing/lisa/client.cpp
@@ -34,8 +34,8 @@
 #define dcerr if (LISA_DEBUG==1) std::cerr<<"Client::"
 
 
-Client::Client(NetManager* parent, int socketFD, int closeOnDelete)
-:parentServer(parent)
+Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete)
+:tqparentServer(tqparent)
 ,m_fd(socketFD)
 ,m_done(0)
 ,m_closeOnDelete(closeOnDelete)
@@ -46,7 +46,7 @@ Client::Client(NetManager* parent, int socketFD, int closeOnDelete)
 }
 
 Client::Client()
-:parentServer(0)
+:tqparentServer(0)
 ,m_fd(-1)
 ,m_done(1)
 ,m_closeOnDelete(1)
@@ -55,7 +55,7 @@ Client::Client()
 }
 
 Client::Client(const Client& c)
-:parentServer(c.parentServer)
+:tqparentServer(c.tqparentServer)
 ,m_fd(c.m_fd)
 ,m_creationTime(c.m_creationTime)
 ,m_done(c.m_done)
@@ -74,24 +74,24 @@ int Client::tryToGetInfo()
       return 1;
    }
    dcerr<<"tryToGetInfo: calling data.getFile()"<<std::endl;
-   if (!parentServer->isInformed()) return 0;
+   if (!tqparentServer->isInformed()) return 0;
    //we fork now, so that writing to the client can't block the server process
    /*      int pid=fork();
     if (pid==-1)
     {
-    //parent
+    //tqparent
     dcerr<<"NetScanner::scan: error occurred"<<std::endl;
     return 1;
     }
     else if (pid!=0)
     {
-    //parent
+    //tqparent
     return 1;
     };*/
    //child
    //this one does it all :-)
    dcerr<<"tryToGetInfo: sending data to client"<<std::endl;
-   parentServer->writeDataToFD(fd(),0);
+   tqparentServer->writeDataToFD(fd(),0);
    close();
    //exit(0);
    return 1;
-- 
cgit v1.2.1