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

2 files changed, 23 insertions, 23 deletions

diff --git a/kioslave/smb/kio_smb.h b/kioslave/smb/kio_smb.h
index da40bda13..c7c316478 100644
--- a/kioslave/smb/kio_smb.h
+++ b/kioslave/smb/kio_smb.h
@@ -87,7 +87,7 @@ extern "C"
 #define KIO_SMB                     7106
 
 using namespace KIO;
-class KProcess;
+class TDEProcess;
 
 //===========================================================================
 
@@ -262,8 +262,8 @@ public:
     virtual void special( const TQByteArray & );
 
 private slots:
-    void readOutput(KProcess *proc, char *buffer, int buflen);
-    void readStdErr(KProcess *proc, char *buffer, int buflen);
+    void readOutput(TDEProcess *proc, char *buffer, int buflen);
+    void readStdErr(TDEProcess *proc, char *buffer, int buflen);
 
 private:
     TQString mybuf, mystderr;
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index f9c366235..5466ee06a 100644
--- a/kioslave/smb/kio_smb_mount.cpp
+++ b/kioslave/smb/kio_smb_mount.cpp
@@ -25,12 +25,12 @@
 #include <tqdir.h>
 #include <kprocess.h>
 
-void SMBSlave::readOutput(KProcess *, char *buffer, int buflen)
+void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen)
 {
     mybuf += TQString::fromLocal8Bit(buffer, buflen);
 }
 
-void SMBSlave::readStdErr(KProcess *, char *buffer, int buflen)
+void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen)
 {
     mystderr += TQString::fromLocal8Bit(buffer, buflen);
 }
@@ -85,7 +85,7 @@ void SMBSlave::special( const TQByteArray & data)
          // using smbmount instead of "mount -t smbfs", because mount does not allow a non-root
          // user to do a mount, but a suid smbmnt does allow this
 
-         KProcess proc;
+         TDEProcess proc;
          proc.setUseShell(true);  // to have the path to smbmnt (which is used by smbmount); see man smbmount
          proc << "smbmount";
 
@@ -98,28 +98,28 @@ void SMBSlave::special( const TQByteArray & data)
          }
          else
          {
-           options = "-o username=" + KProcess::quote(smburl.user());
+           options = "-o username=" + TDEProcess::quote(smburl.user());
            user = smburl.user();
 
            if ( ! smburl.pass().isEmpty() )
-             options += ",password=" + KProcess::quote(smburl.pass());
+             options += ",password=" + TDEProcess::quote(smburl.pass());
          }
 
          // TODO: check why the control center uses encodings with a blank char, e.g. "cp 1250"
          //if ( ! m_default_encoding.isEmpty() )
-           //options += ",codepage=" + KProcess::quote(m_default_encoding);
+           //options += ",codepage=" + TDEProcess::quote(m_default_encoding);
 
-         proc << KProcess::quote(remotePath.local8Bit());
-         proc << KProcess::quote(mountPoint.local8Bit());
+         proc << TDEProcess::quote(remotePath.local8Bit());
+         proc << TDEProcess::quote(mountPoint.local8Bit());
          proc << options;
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
-                 TQT_SLOT(readOutput(KProcess *, char *, int)));
+         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(KProcess *, char *, int)));
+         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
 
-         if (!proc.start( KProcess::Block, KProcess::AllOutput ))
+         if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput ))
          {
             error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
                   "smbmount"+i18n("\nMake sure that the samba package is installed properly on your system."));
@@ -146,21 +146,21 @@ void SMBSlave::special( const TQByteArray & data)
          TQString mountPoint;
          stream >> mountPoint;
 
-         KProcess proc;
+         TDEProcess proc;
          proc.setUseShell(true);
          proc << "smbumount";
-         proc << KProcess::quote(mountPoint);
+         proc << TDEProcess::quote(mountPoint);
 
          mybuf.truncate(0);
          mystderr.truncate(0);
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
-                 TQT_SLOT(readOutput(KProcess *, char *, int)));
+         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(KProcess *, char *, int)));
+         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
 
-         if ( !proc.start( KProcess::Block, KProcess::AllOutput ) )
+         if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) )
          {
            error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
                  "smbumount"+i18n("\nMake sure that the samba package is installed properly on your system."));