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

2 files changed, 17 insertions, 17 deletions

diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index 238d336..9dc4761 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -34,10 +34,10 @@ Process::State Process::runSynchronously(Base &process, RunActions actions, uint
 Process::Base::Base(TQObject *parent, const char *name)
   : TQObject(parent, name), _state(Stopped)
 {
-  _process = new KProcess(this);
-  connect(_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(exited()));
-  connect(_process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(receivedStdout(KProcess*, char *, int)));
-  connect(_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(receivedStderr(KProcess*, char *, int)));
+  _process = new TDEProcess(this);
+  connect(_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(exited()));
+  connect(_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(receivedStdout(TDEProcess*, char *, int)));
+  connect(_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess*, char *, int)));
   _timer = new TQTimer(this);
   connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot()));
 }
@@ -82,7 +82,7 @@ bool Process::Base::start(uint timeout)
 #if defined(NO_KDE)
   if ( !_process->start() ) {
 #else
-  if ( !_process->start(KProcess::NotifyOnExit, KProcess::All) ) {
+  if ( !_process->start(TDEProcess::NotifyOnExit, TDEProcess::All) ) {
 #endif
     _state = StartFailed;
     return false;
@@ -144,20 +144,20 @@ bool Process::Base::isFilteredLine(const TQString &line)
 }
 
 //----------------------------------------------------------------------------
-void Process::StringOutput::receivedStdout(KProcess*, char *data, int len)
+void Process::StringOutput::receivedStdout(TDEProcess*, char *data, int len)
 {
   _stdout += TQString::fromLatin1(data, len);
   emit stdoutDataReceived();
 }
 
-void Process::StringOutput::receivedStderr(KProcess*, char *data, int len)
+void Process::StringOutput::receivedStderr(TDEProcess*, char *data, int len)
 {
   _stderr += TQString::fromLatin1(data, len);
   emit stderrDataReceived();
 }
 
 //----------------------------------------------------------------------------
-void Process::LineBase::receivedStdout(KProcess*, char *data, int len)
+void Process::LineBase::receivedStdout(TDEProcess*, char *data, int len)
 {
   for (uint i=0; i<uint(len); i++) {
     if ( data[i]=='\r' ) continue;
@@ -170,7 +170,7 @@ void Process::LineBase::receivedStdout(KProcess*, char *data, int len)
   emit stdoutDataReceived();
 }
 
-void Process::LineBase::receivedStderr(KProcess*, char *data, int len)
+void Process::LineBase::receivedStderr(TDEProcess*, char *data, int len)
 {
   for (uint i=0; i<uint(len); i++) {
     if ( data[i]=='\r' ) continue;
diff --git a/src/common/global/process.h b/src/common/global/process.h
index 083fb0a..ad0143d 100644
--- a/src/common/global/process.h
+++ b/src/common/global/process.h
@@ -13,7 +13,7 @@
 #include <tqstringlist.h>
 #include <tqobject.h>
 #include <tqtimer.h>
-class KProcess;
+class TDEProcess;
 
 #include "global.h"
 namespace PURL { class Directory; }
@@ -57,14 +57,14 @@ signals:
 protected slots:
   void exited();
   void timeoutSlot();
-  virtual void receivedStdout(KProcess*, char *buffer, int len) = 0;
-  virtual void receivedStderr(KProcess*, char *buffer, int len) = 0;
+  virtual void receivedStdout(TDEProcess*, char *buffer, int len) = 0;
+  virtual void receivedStderr(TDEProcess*, char *buffer, int len) = 0;
 
   friend State runSynchronously(Base &, RunActions, uint);
 
 protected:
   State     _state;
-  KProcess *_process;
+  TDEProcess *_process;
   TQTimer   *_timer;
   TQString   _stdout, _stderr;
 
@@ -82,8 +82,8 @@ public:
   TQString serr() const { return _stderr; }
 
 private slots:
-  virtual void receivedStdout(KProcess *, char *buffer, int len);
-  virtual void receivedStderr(KProcess *, char *buffer, int len);
+  virtual void receivedStdout(TDEProcess *, char *buffer, int len);
+  virtual void receivedStderr(TDEProcess *, char *buffer, int len);
 };
 
 //----------------------------------------------------------------------------
@@ -95,8 +95,8 @@ public:
   LineBase(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {}
 
 private slots:
-  virtual void receivedStdout(KProcess *, char *buffer, int len);
-  virtual void receivedStderr(KProcess *, char *buffer, int len);
+  virtual void receivedStdout(TDEProcess *, char *buffer, int len);
+  virtual void receivedStderr(TDEProcess *, char *buffer, int len);
 
 private:
   virtual void addStdoutLine(const TQString &line) = 0;