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

4 files changed, 12 insertions, 12 deletions

diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 0b64b8ba..d4151015 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
 
 static ParseNode f_i18n(Parser*, const ParameterList& params)
 {
-  return KGlobal::locale()->translate(params[0].toString()); 
+  return TDEGlobal::locale()->translate(params[0].toString()); 
 }
 
 static ParseNode f_env(Parser*, const ParameterList& params)
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 613eec68..9470108a 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
     case Kommander::env:
       return TQString(getenv(args[0].latin1())); 
     case Kommander::i18n:
-      return KGlobal::locale()->translate(args[0]);
+      return TDEGlobal::locale()->translate(args[0]);
     case Kommander::global:
       return global(args[0]);
     case Kommander::setGlobal:
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index ac4f348d..bc5fbdc8 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -82,14 +82,14 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
   }
   m_input = at.local8Bit();
 
-  mProcess = new KProcess;
+  mProcess = new TDEProcess;
   (*mProcess) << shellName.latin1();
 
-  connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-      TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-  connect(mProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+  connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+      TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+  connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
 
-  if(!mProcess->start(KProcess::NotifyOnExit, KProcess::All))
+  if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All))
   {
     m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").arg(shellName));
     return TQString();
@@ -115,13 +115,13 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
   }
 }
 
-void MyProcess::slotReceivedStdout(KProcess*, char* a_buffer, int a_len)
+void MyProcess::slotReceivedStdout(TDEProcess*, char* a_buffer, int a_len)
 {
   m_output += TQString::fromLocal8Bit(a_buffer, a_len);
   emit processReceivedStdout(this, a_buffer, a_len);
 }
 
-void MyProcess::slotProcessExited(KProcess* process)
+void MyProcess::slotProcessExited(TDEProcess* process)
 {
   if (m_loopStarted)
   {
diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h
index cb9c80b5..039db894 100644
--- a/kommander/widget/myprocess.h
+++ b/kommander/widget/myprocess.h
@@ -44,8 +44,8 @@ signals:
   void processExited(MyProcess*);
   void processReceivedStdout(MyProcess*, char*, int);
 private slots:
-  void slotReceivedStdout(KProcess*, char*, int);
-  void slotProcessExited(KProcess*);
+  void slotReceivedStdout(TDEProcess*, char*, int);
+  void slotProcessExited(TDEProcess*);
 protected:
   const KommanderWidget *m_atw;
   TQString m_output;
@@ -53,7 +53,7 @@ protected:
   bool m_loopStarted;
   bool m_blocking;
   bool m_handleOutput;
-  KProcess* mProcess;
+  TDEProcess* mProcess;
 };
 
 #endif