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

4 files changed, 27 insertions, 27 deletions

diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp
index 004eeb2..b4d776f 100644
--- a/src/helpers/ktranslateurl.cpp
+++ b/src/helpers/ktranslateurl.cpp
@@ -48,9 +48,9 @@ KURL KTranslateUrl::translateSystemUrl(const KURL&_url)
     if (proto!="system") {
         return _url;
     }
-    KGlobal::dirs()->addResourceType("system_entries",
+    TDEGlobal::dirs()->addResourceType("system_entries",
     KStandardDirs::kde_default("data") + "systemview");
-    TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+    TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
     if (!parseURL(_url,name,path)) {
         return _url;
     }
@@ -83,7 +83,7 @@ bool KTranslateUrl::parseURL(const KURL&url,TQString&name,TQString&path)
 
 KURL KTranslateUrl::findSystemBase(const TQString&filename)
 {
-    TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
+    TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
 
     TQStringList::ConstIterator dirpath = dirList.begin();
     TQStringList::ConstIterator end = dirList.end();
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?
diff --git a/src/helpers/sshagent.h b/src/helpers/sshagent.h
index ad6a5d9..cc78cae 100644
--- a/src/helpers/sshagent.h
+++ b/src/helpers/sshagent.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-class KProcess;
+class TDEProcess;
 
 
 class SshAgent : public TQObject
@@ -46,9 +46,9 @@ public:
     TQString authSock() const { return m_authSock; }
 
 private slots:
-    void slotProcessExited(KProcess*);
-    void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
-    void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+    void slotProcessExited(TDEProcess*);
+    void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+    void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
 
 private:
     bool startSshAgent();
diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp
index abe699c..cc18b4e 100644
--- a/src/helpers/sub2qt.cpp
+++ b/src/helpers/sub2qt.cpp
@@ -42,7 +42,7 @@ TQString sub2qt::apr_time2qtString(apr_time_t _time)
 
 TQString sub2qt::DateTime2qtString(const svn::DateTime&_time)
 {
-    return KGlobal::locale()->formatDateTime(_time);
+    return TDEGlobal::locale()->formatDateTime(_time);
 }
 
 };