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, 12 insertions, 12 deletions

diff --git a/kppp/opener.cpp b/kppp/opener.cpp
index f700d0c8..7f61f775 100644
--- a/kppp/opener.cpp
+++ b/kppp/opener.cpp
@@ -28,9 +28,9 @@
  *
  * Apart from the first dozen lines in main() the following code represents
  * the setuid root part of kppp. So please be careful !
- * o restrain from using X, Qt or KDE library calls
+ * o restrain from using X, TQt or KDE library calls
  * o check for possible buffer overflows
- * o handle requests from the parent process with care. They might be forged.
+ * o handle requests from the tqparent process with care. They might be forged.
  * o be paranoid and think twice about everything you change.
  */
 
@@ -123,7 +123,7 @@ extern "C" {
 
 static void sighandler_child(int);
 static pid_t pppdPid = -1;
-static int pppdExitStatus = -1;
+static int pppdExittqStatus = -1;
 static int checkForInterface();
 
 // processing will stop at first file that could be opened successfully
@@ -311,10 +311,10 @@ void Opener::mainLoop() {
 	sendResponse(&response);
 	break;
 
-      case PPPDExitStatus:
-	Debug("Opener: received PPPDExitStatus");
+      case PPPDExittqStatus:
+	Debug("Opener: received PPPDExittqStatus");
 	MY_ASSERT(len == sizeof(struct PPPDExitStatusRequest));
-	response.status = pppdExitStatus;
+	response.status = pppdExittqStatus;
 	sendResponse(&response);
 	break;
 
@@ -514,12 +514,12 @@ bool Opener::execpppd(const char *arguments) {
   if(ttyfd<0)
     return false;
 
-  pppdExitStatus = -1;
+  pppdExittqStatus = -1;
 
   switch(pppdPid = fork())
     {
     case -1:
-      fprintf(stderr,"In parent: fork() failed\n");
+      fprintf(stderr,"In tqparent: fork() failed\n");
       return false;
       break;
 
@@ -561,7 +561,7 @@ bool Opener::execpppd(const char *arguments) {
       break;
 
     default:
-      Debug2("In parent: pppd pid %d\n",pppdPid);
+      Debug2("In tqparent: pppd pid %d\n",pppdPid);
       close(ttyfd);
       ttyfd = -1;
       return true;
@@ -706,10 +706,10 @@ void sighandler_child(int) {
       Debug("It was pppd that died");
       pppdPid = -1;
       if((WIFEXITED(status))) {
-	pppdExitStatus = (WEXITSTATUS(status));
-        Debug2("pppd exited with return value %d\n", pppdExitStatus);
+	pppdExittqStatus = (WEXITSTATUS(status));
+        Debug2("pppd exited with return value %d\n", pppdExittqStatus);
       } else {
-	pppdExitStatus = 99;
+	pppdExittqStatus = 99;
         Debug("pppd exited abnormally.");
       }
       Debug2("Sending %i a SIGUSR1\n", getppid());