summaryrefslogtreecommitdiffstats
path: root/src/helpers/sshagent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/helpers/sshagent.cpp')
-rw-r--r--src/helpers/sshagent.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp
index ccde212..c4fee85 100644
--- a/src/helpers/sshagent.cpp
+++ b/src/helpers/sshagent.cpp
@@ -21,7 +21,7 @@
#include "sshagent.h"
#include "kdesvn-config.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kapplication.h>
#include <kdeversion.h>
#include <kprocess.h>
@@ -34,12 +34,12 @@
bool SshAgent::m_isRunning = false;
bool SshAgent::m_isOurAgent = false;
bool SshAgent::m_addIdentitiesDone = false;
-QString SshAgent::m_authSock = QString::null;
-QString SshAgent::m_pid = QString::null;
+TQString SshAgent::m_authSock = TQString();
+TQString SshAgent::m_pid = TQString();
-SshAgent::SshAgent(QObject* parent, const char* name)
- : QObject(parent, name)
+SshAgent::SshAgent(TQObject* tqparent, const char* name)
+ : TQObject(tqparent, name)
{
}
@@ -58,11 +58,11 @@ bool SshAgent::querySshAgent()
char* pid;
if( (pid = ::getenv("SSH_AGENT_PID")) != 0 )
{
- m_pid = QString::fromLocal8Bit(pid);
+ m_pid = TQString::fromLocal8Bit(pid);
char* sock = ::getenv("SSH_AUTH_SOCK");
if( sock )
- m_authSock = QString::fromLocal8Bit(sock);
+ m_authSock = TQString::fromLocal8Bit(sock);
/* make sure that we have a askpass program.
* on some systems something like that isn't installed.*/
#ifdef FORCE_ASKPASS
@@ -134,10 +134,10 @@ bool SshAgent::addSshIdentities(bool force)
proc << "ssh-add";
- connect(&proc, SIGNAL(receivedStdout(KProcess*, char*, int)),
- SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(&proc, SIGNAL(receivedStderr(KProcess*, char*, int)),
- SLOT(slotReceivedStderr(KProcess*, char*, int)));
+ 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)));
proc.start(KProcess::DontCare, KProcess::AllOutput);
@@ -165,15 +165,15 @@ void SshAgent::killSshAgent()
void SshAgent::slotProcessExited(KProcess*)
{
- QRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
- QRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
+ TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
+ TQRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
- QRegExp bashPidRx("SSH_AGENT_PID=(\\d*).*");
- QRegExp bashSockRx("SSH_AUTH_SOCK=(.*\\.\\d*);.*");
- QStringList m_outputLines = QStringList::split("\n",m_Output);
+ TQRegExp bashPidRx("SSH_AGENT_PID=(\\d*).*");
+ TQRegExp bashSockRx("SSH_AUTH_SOCK=(.*\\.\\d*);.*");
+ TQStringList m_outputLines = TQStringList::split("\n",m_Output);
- QStringList::Iterator it = m_outputLines.begin();
- QStringList::Iterator end = m_outputLines.end();
+ TQStringList::Iterator it = m_outputLines.begin();
+ TQStringList::Iterator end = m_outputLines.end();
for( ; it != end; ++it )
{
if( m_pid.isEmpty() )
@@ -218,7 +218,7 @@ void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
- QString output = QString::fromLocal8Bit(buffer, buflen);
+ TQString output = TQString::fromLocal8Bit(buffer, buflen);
m_Output+=output;
}
@@ -227,7 +227,7 @@ void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
- QString output = QString::fromLocal8Bit(buffer, buflen);
+ TQString output = TQString::fromLocal8Bit(buffer, buflen);
m_Output+=output;
}
@@ -238,12 +238,12 @@ bool SshAgent::startSshAgent()
proc << "ssh-agent";
- connect(&proc, SIGNAL(processExited(KProcess*)),
- SLOT(slotProcessExited(KProcess*)));
- connect(&proc, SIGNAL(receivedStdout(KProcess*, char*, int)),
- SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(&proc, SIGNAL(receivedStderr(KProcess*, char*, int)),
- SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+ 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)) );
proc.start(KProcess::NotifyOnExit, KProcess::All);