Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

8 files changed, 44 insertions, 44 deletions

diff --git a/lskat/lskat.kdevprj b/lskat/lskat.kdevprj
index 58eb63d7..6a561dea 100644
--- a/lskat/lskat.kdevprj
+++ b/lskat/lskat.kdevprj
@@ -141,12 +141,12 @@ dist=true
 install=false
 install_location=
 type=HEADER
-[lskat/KProcessConnect.cpp]
+[lskat/TDEProcessConnect.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
-[lskat/KProcessConnect.h]
+[lskat/TDEProcessConnect.h]
 dist=true
 install=false
 install_location=
@@ -172,7 +172,7 @@ install=false
 install_location=
 type=HEADER
 [lskat/Makefile.am]
-files=lskat/main.cpp,lskat/lskat.cpp,lskat/lskat.h,lskat/lskatdoc.cpp,lskat/lskatdoc.h,lskat/lskatview.cpp,lskat/lskatview.h,lskat/resource.h,lskat/lskat.desktop,lskat/lskat.xpm,lskat/mini-lskat.xpm,lskat/KChildConnect.cpp,lskat/KChildConnect.h,lskat/KConnectEntry.cpp,lskat/KConnectEntry.h,lskat/KConnectTypes.h,lskat/KEInput.cpp,lskat/KEInput.h,lskat/KEMessage.cpp,lskat/KEMessage.h,lskat/KInputChildProcess.cpp,lskat/KInputChildProcess.h,lskat/KInteractiveConnect.cpp,lskat/KInteractiveConnect.h,lskat/KMessageEntry.cpp,lskat/KMessageEntry.h,lskat/KProcessConnect.cpp,lskat/KProcessConnect.h,lskat/KRSocket.cpp,lskat/KRSocket.h,lskat/KRemoteConnect.cpp,lskat/KRemoteConnect.h,lskat/namedlg.cpp,lskat/namedlg.h,lskat/networkdlg.cpp,lskat/networkdlg.h,lskat/aboutdlg.cpp,lskat/aboutdlg.h,lskat/aboutdlgdata.cpp,lskat/msgdlg.cpp,lskat/msgdlg.h
+files=lskat/main.cpp,lskat/lskat.cpp,lskat/lskat.h,lskat/lskatdoc.cpp,lskat/lskatdoc.h,lskat/lskatview.cpp,lskat/lskatview.h,lskat/resource.h,lskat/lskat.desktop,lskat/lskat.xpm,lskat/mini-lskat.xpm,lskat/KChildConnect.cpp,lskat/KChildConnect.h,lskat/KConnectEntry.cpp,lskat/KConnectEntry.h,lskat/KConnectTypes.h,lskat/KEInput.cpp,lskat/KEInput.h,lskat/KEMessage.cpp,lskat/KEMessage.h,lskat/KInputChildProcess.cpp,lskat/KInputChildProcess.h,lskat/KInteractiveConnect.cpp,lskat/KInteractiveConnect.h,lskat/KMessageEntry.cpp,lskat/KMessageEntry.h,lskat/TDEProcessConnect.cpp,lskat/TDEProcessConnect.h,lskat/KRSocket.cpp,lskat/KRSocket.h,lskat/KRemoteConnect.cpp,lskat/KRemoteConnect.h,lskat/namedlg.cpp,lskat/namedlg.h,lskat/networkdlg.cpp,lskat/networkdlg.h,lskat/aboutdlg.cpp,lskat/aboutdlg.h,lskat/aboutdlgdata.cpp,lskat/msgdlg.cpp,lskat/msgdlg.h
 sub_dirs=
 type=prog_main
 [lskat/aboutdlg.cpp]
diff --git a/lskat/lskat/KConnectEntry.cpp b/lskat/lskat/KConnectEntry.cpp
index 870b8cd2..ba714b58 100644
--- a/lskat/lskat/KConnectEntry.cpp
+++ b/lskat/lskat/KConnectEntry.cpp
@@ -45,7 +45,7 @@ KRemoteConnect *KConnectEntry::QueryRemoteConnect()
   return connect.r;
 }
 
-KProcessConnect *KConnectEntry::QueryProcessConnect()
+TDEProcessConnect *KConnectEntry::QueryProcessConnect()
 {
   return connect.p;
 }
@@ -132,7 +132,7 @@ bool KConnectEntry::Init(KG_INPUTTYPE stype,int id,KEMessage *msg)
         result=connect.r->Init(id,msg);
       break;
       case KG_INPUTTYPE_PROCESS:
-        connect.p=new KProcessConnect;
+        connect.p=new TDEProcessConnect;
         result=connect.p->Init(id,msg);
       break;
     default: result=FALSE;
diff --git a/lskat/lskat/KConnectEntry.h b/lskat/lskat/KConnectEntry.h
index 73619eac..f62c6e2d 100644
--- a/lskat/lskat/KConnectEntry.h
+++ b/lskat/lskat/KConnectEntry.h
@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include "KRemoteConnect.h"
-#include "KProcessConnect.h"
+#include "TDEProcessConnect.h"
 #include "KInteractiveConnect.h"
 #include "KConnectTypes.h"
 #include "KEMessage.h"
@@ -27,7 +27,7 @@
 union UConnect
 {
   KRemoteConnect *r;
-  KProcessConnect *p;
+  TDEProcessConnect *p;
   KInteractiveConnect *i;
 };
 
@@ -42,7 +42,7 @@ class KConnectEntry
   public:
   KG_INPUTTYPE QueryType();
   KRemoteConnect *QueryRemoteConnect();
-  KProcessConnect *QueryProcessConnect();
+  TDEProcessConnect *QueryProcessConnect();
   KInteractiveConnect *QueryInteractiveConnect();
   KConnectEntry();
   ~KConnectEntry();
diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h
index c5629c8b..a2b391c8 100644
--- a/lskat/lskat/KEInput.h
+++ b/lskat/lskat/KEInput.h
@@ -23,7 +23,7 @@
 #include <tqmemarray.h>
 #include "KConnectEntry.h"
 #include "KRemoteConnect.h"
-#include "KProcessConnect.h"
+#include "TDEProcessConnect.h"
 #include "KInteractiveConnect.h"
 #include "KEMessage.h"
 #include "KConnectTypes.h"
@@ -42,7 +42,7 @@ class KEInput : public TQObject
    TQTimer *cTimer;
 
    TQPtrList<KRemoteConnect> remoteList;
-   TQPtrList<KProcessConnect> computerList;
+   TQPtrList<TDEProcessConnect> computerList;
    TQPtrList<KInteractiveConnect> interactiveList;
    TQMemArray<KConnectEntry> playerArray;
 
diff --git a/lskat/lskat/KProcessConnect.cpp b/lskat/lskat/KProcessConnect.cpp
index 97cd9221..b2038b4f 100644
--- a/lskat/lskat/KProcessConnect.cpp
+++ b/lskat/lskat/KProcessConnect.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          KProcessConnect.cpp  -  description
+                          TDEProcessConnect.cpp  -  description
                              -------------------
     begin                : Tue May 2 2000
     copyright            : (C) 2000 by Martin Heni
@@ -31,25 +31,25 @@
  *                                                                         *
  ***************************************************************************/
 #include <stdio.h>
-#include "KProcessConnect.h"
+#include "TDEProcessConnect.h"
 
-#include "KProcessConnect.moc"
+#include "TDEProcessConnect.moc"
 
-KProcessConnect::KProcessConnect()
+TDEProcessConnect::TDEProcessConnect()
   : KChildConnect()
 {
   running=false;
   process=0;
 }
 
-KProcessConnect::~KProcessConnect()
+TDEProcessConnect::~TDEProcessConnect()
 {
   Exit();
   delete process;
 //  printf("DESTRUCTRING KPROCESSCONNECT\n");
 }
 
-bool KProcessConnect::Init(int id,KEMessage *msg)
+bool TDEProcessConnect::Init(int id,KEMessage *msg)
 {
   int size;
   char *p;
@@ -73,19 +73,19 @@ bool KProcessConnect::Init(int id,KEMessage *msg)
   if (running) Exit();
 
   // create process
-  process=new KProcess;
+  process=new TDEProcess;
   *process << processname;
-  connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
-                        this, TQT_SLOT(slotReceivedStdout(KProcess *, char * , int )));
-  connect(process, TQT_SIGNAL(processExited(KProcess *)),
-                        this, TQT_SLOT(slotProcessExited(KProcess *)));
+  connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+                        this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int )));
+  connect(process, TQT_SIGNAL(processExited(TDEProcess *)),
+                        this, TQT_SLOT(slotProcessExited(TDEProcess *)));
   /*
-  connect(process, TQT_SIGNAL(wroteStdin(KProcess *)),
-                        this, TQT_SLOT(slotWroteStdin(KProcess *)));
+  connect(process, TQT_SIGNAL(wroteStdin(TDEProcess *)),
+                        this, TQT_SLOT(slotWroteStdin(TDEProcess *)));
   */
 
   // TRUE if ok
-  running=process->start(KProcess::NotifyOnExit,KProcess::All);
+  running=process->start(TDEProcess::NotifyOnExit,TDEProcess::All);
 
   if (running && msg && msg->QueryNumberOfKeys()>0)
   {
@@ -95,7 +95,7 @@ bool KProcessConnect::Init(int id,KEMessage *msg)
   return running;
 }
 
-void KProcessConnect::slotReceivedStdout(KProcess *, char *buffer, int buflen)
+void TDEProcessConnect::slotReceivedStdout(TDEProcess *, char *buffer, int buflen)
 {
   TQString s;
   char c;
@@ -134,19 +134,19 @@ void KProcessConnect::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     Receive(s);
   }
 }
-void KProcessConnect::slotProcessExited(KProcess *)
+void TDEProcessConnect::slotProcessExited(TDEProcess *)
 {
   running=false;
   delete process;
   process=0;
   Init(QueryID());
 }
-void KProcessConnect::slotWroteStdin(KProcess *)
+void TDEProcessConnect::slotWroteStdin(TDEProcess *)
 {
   printf("slotWroteStdin:: IS NEVER CALLED\n");
 }
 
-bool KProcessConnect::Exit()
+bool TDEProcessConnect::Exit()
 {
   // kill process if running
   if (running)
@@ -159,12 +159,12 @@ bool KProcessConnect::Exit()
   return true;
 }
 
-bool KProcessConnect::Next()
+bool TDEProcessConnect::Next()
 {
   bool result;
   if (!running) return false;
   // create and send message
-  // printf("+- KProcessConnect::ProcessNext\n");
+  // printf("+- TDEProcessConnect::ProcessNext\n");
   KEMessage *msg=new KEMessage;
   // User fills message
   emit signalPrepareMove(msg,KG_INPUTTYPE_PROCESS);
@@ -174,7 +174,7 @@ bool KProcessConnect::Next()
 }
 
 // Send string to child
-bool KProcessConnect::Send(TQString str)
+bool TDEProcessConnect::Send(TQString str)
 {
   bool result;
   // printf("****** PROCESS:SEND\n");
diff --git a/lskat/lskat/KProcessConnect.h b/lskat/lskat/KProcessConnect.h
index 13659500..3a38e23b 100644
--- a/lskat/lskat/KProcessConnect.h
+++ b/lskat/lskat/KProcessConnect.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          KProcessConnect.h  -  description
+                          TDEProcessConnect.h  -  description
                              -------------------
     begin                : Tue May 2 2000
     copyright            : (C) 2000 by Martin Heni
@@ -24,19 +24,19 @@
 #include "KChildConnect.h"
 
 
-class KProcessConnect: public KChildConnect
+class TDEProcessConnect: public KChildConnect
 {
   Q_OBJECT
   
 
   private:
-  KProcess *process;
+  TDEProcess *process;
   TQString processname;
   bool running;
 
   public:
-  KProcessConnect();
-  ~KProcessConnect();
+  TDEProcessConnect();
+  ~TDEProcessConnect();
   bool Init(int id=0,KEMessage *msg=0);
   bool Exit();
   bool Next();
@@ -45,9 +45,9 @@ class KProcessConnect: public KChildConnect
   // void Receive(TQString input);
 
   public slots:
-  void  slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
-  void  slotProcessExited(KProcess *p);
-  void  slotWroteStdin(KProcess *p);
+  void  slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
+  void  slotProcessExited(TDEProcess *p);
+  void  slotWroteStdin(TDEProcess *p);
 
 
   signals:
diff --git a/lskat/lskat/Makefile.am b/lskat/lskat/Makefile.am
index 55815d90..c5116694 100644
--- a/lskat/lskat/Makefile.am
+++ b/lskat/lskat/Makefile.am
@@ -1,7 +1,7 @@
 
 ####### tdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = lskat
-lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp KProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui
+lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp TDEProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui
 
 lskat_LDADD   = $(LIB_KFILE) $(LIB_TDEGAMES) $(LIB_KDNSSD)
 lskat_DEPENDENCIES = $(LIB_TDEGAMES_DEP)
diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp
index 9ba0dd94..8a948b2a 100644
--- a/lskat/lskat/lskatview.cpp
+++ b/lskat/lskat/lskatview.cpp
@@ -252,7 +252,7 @@ void LSkatView::drawIntro(TQPainter *p)
     TQPoint point,point1,p2;
     TQString s;
     // Get a nice font
-    TQFont font = KGlobalSettings::generalFont();
+    TQFont font = TDEGlobalSettings::generalFont();
     font.setPointSize(48);
     // Get the font info to determine text sizes
     TQFontMetrics fontMetrics(font);
@@ -367,9 +367,9 @@ void LSkatView::drawFinal(TQPainter *p)
   TQString ld;
   int ts[10];
 
-  TQFont font24 = KGlobalSettings::generalFont();
+  TQFont font24 = TDEGlobalSettings::generalFont();
   font24.setPointSize(24);
-  TQFont font14 = KGlobalSettings::generalFont();
+  TQFont font14 = TDEGlobalSettings::generalFont();
   font14.setPointSize(13);
 
 	//p1=status_rect3.topLeft();
@@ -621,7 +621,7 @@ void LSkatView::drawStatus(TQPainter *p)
   srect[0]=status_rect1;
   srect[1]=status_rect2;
 
-  TQFont font10 = KGlobalSettings::generalFont();
+  TQFont font10 = TDEGlobalSettings::generalFont();
   font10.setPointSize(13);
   p->setFont(font10);