summaryrefslogtreecommitdiffstats
path: root/src/helpers/sshagent.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:27:08 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:27:08 -0600
commit773793eead2fea173ec9202ee938020592e86a02 (patch)
tree2df8f77f488c1e7de1c16eb6d50d33337bc6bea5 /src/helpers/sshagent.cpp
parentf4899658cbe0d29487071c8340b66c80cc2a3010 (diff)
downloadtdesvn-773793eead2fea173ec9202ee938020592e86a02.tar.gz
tdesvn-773793eead2fea173ec9202ee938020592e86a02.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/helpers/sshagent.cpp')
-rw-r--r--src/helpers/sshagent.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp
index a83024f..4d36214 100644
--- a/src/helpers/sshagent.cpp
+++ b/src/helpers/sshagent.cpp
@@ -112,7 +112,7 @@ bool SshAgent::addSshIdentities(bool force)
}
// add identities to ssh-agent
- KProcess proc;
+ TDEProcess proc;
proc.setEnvironment("SSH_AGENT_PID", m_pid);
proc.setEnvironment("SSH_AUTH_SOCK", m_authSock);
@@ -134,12 +134,12 @@ bool SshAgent::addSshIdentities(bool force)
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?
@@ -155,15 +155,15 @@ 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);
}
-void SshAgent::slotProcessExited(KProcess*)
+void SshAgent::slotProcessExited(TDEProcess*)
{
TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
TQRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
@@ -214,7 +214,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);
@@ -223,7 +223,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);
@@ -234,18 +234,18 @@ void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
bool SshAgent::startSshAgent()
{
- 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?