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

1 files changed, 19 insertions, 19 deletions

diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index b620cc98..7590b757 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -91,7 +91,7 @@ bool SshAgent::addSshIdentities()
         return false;
 
     // add identities to ssh-agent
-    KProcess proc;
+    TDEProcess proc;
 
     proc.setEnvironment("SSH_AGENT_PID", m_pid);
     proc.setEnvironment("SSH_AUTH_SOCK", m_authSock);
@@ -99,12 +99,12 @@ bool SshAgent::addSshIdentities()
 
     proc << "ssh-add";
 
-    connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
 
-    proc.start(KProcess::DontCare, KProcess::AllOutput);
+    proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
 
     // wait for process to finish
     // TODO CL use timeout?
@@ -123,17 +123,17 @@ void SshAgent::killSshAgent()
     if( !m_isRunning || !m_isOurAgent )
         return;
 
-    KProcess proc;
+    TDEProcess proc;
 
     proc << "kill" << m_pid;
 
-    proc.start(KProcess::DontCare, KProcess::NoCommunication);
+    proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
 
     kdDebug(8051) << "SshAgent::killSshAgent(): killed pid = " << m_pid << endl;
 }
 
 
-void SshAgent::slotProcessExited(KProcess*)
+void SshAgent::slotProcessExited(TDEProcess*)
 {
     kdDebug(8051) << "SshAgent::slotProcessExited(): ENTER" << endl;
 
@@ -187,7 +187,7 @@ void SshAgent::slotProcessExited(KProcess*)
 }
 
 
-void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
@@ -198,7 +198,7 @@ void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
 }
 
 
-void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
@@ -213,18 +213,18 @@ bool SshAgent::startSshAgent()
 {
     kdDebug(8051) << "SshAgent::startSshAgent(): ENTER" << endl;
 
-    KProcess proc;
+    TDEProcess proc;
 
     proc << "ssh-agent";
 
-    connect(&proc, TQT_SIGNAL(processExited(KProcess*)),
-            TQT_SLOT(slotProcessExited(KProcess*)));
-    connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+    connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)),
+            TQT_SLOT(slotProcessExited(TDEProcess*)));
+    connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
 
-    proc.start(KProcess::NotifyOnExit, KProcess::All);
+    proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);
 
     // wait for process to finish
     // TODO CL use timeout?