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

1 files changed, 14 insertions, 14 deletions

diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index dca25e69..c5f8c24a 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -213,10 +213,10 @@ void SVNDialog::slotExecuteCommand( )
   // Nothing to do here.
   if ( _commandLine.isEmpty( ) ) return;
 
-  kdDebug() << "Preparing KProcess" << endl;
+  kdDebug() << "Preparing TDEProcess" << endl;
 
   // Create a new shell process
-  p = new KProcess;
+  p = new TDEProcess;
   p->setUseShell( true, "/bin/sh" );
 
   if ( _cmd == SVN::Commit ) {
@@ -261,7 +261,7 @@ void SVNDialog::slotExecuteCommand( )
     }
     
     // Change the command line to have the real name of the temporary file
-    _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
+    _commandLine.replace( "@LOG@FILE@", TDEProcess::quote( m_tempFile->name() ) );
 
     // Update the list of log messages
     if ( !msg.isEmpty() ) {
@@ -277,19 +277,19 @@ void SVNDialog::slotExecuteCommand( )
     }
   }
 
-  // Set the KProcess' command line.
+  // Set the TDEProcess' command line.
   *p << _commandLine;
 
-  connect( p, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStdout( KProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
-    this, TQT_SLOT ( slotProcessStderr( KProcess*, char*, int ) ) );
-  connect( p, TQT_SIGNAL( processExited( KProcess* ) ),
-    this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
+  connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+    this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
+  connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+    this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
+  connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ),
+    this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
 
   output->append( i18n( "[ Starting command ]" ) );
 
-  if ( p->start( KProcess::NotifyOnExit, KProcess::Communication( KProcess::AllOutput ) ) ) {
+  if ( p->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::AllOutput ) ) ) {
     // Disable the main button (and the log edit if in commit mode) to
     // indicate activity.
     mainBtn->setEnabled( false );
@@ -302,7 +302,7 @@ void SVNDialog::slotExecuteCommand( )
   }
 }
 
-void SVNDialog::slotProcessStdout( KProcess*, char * buffer, int len )
+void SVNDialog::slotProcessStdout( TDEProcess*, char * buffer, int len )
 {
   output->append( TQString::fromLocal8Bit( buffer, len ) );
   // Set the cursor's position at the end of the output.
@@ -313,7 +313,7 @@ void SVNDialog::slotProcessStdout( KProcess*, char * buffer, int len )
     _statusOutput += TQString::fromLocal8Bit( buffer, len );
 }
 
-void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
+void SVNDialog::slotProcessStderr( TDEProcess*, char * buffer, int len )
 {
   // If an error occurs while executing the command display stderr in
   // another color.
@@ -324,7 +324,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
   output->setCursorPosition( output->lines( ), 0 );
 }
 
-void SVNDialog::slotProcessExited( KProcess * p )
+void SVNDialog::slotProcessExited( TDEProcess * p )
 {
   if ( p->exitStatus( ) )
     output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );