From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:51:01 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 parts/diff/diffpart.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'parts/diff/diffpart.cpp')

diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 647a5cc5..97adaf4f 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -149,22 +149,22 @@ void DiffPart::localDiff()
   resultBuffer = resultErr = TQString();
 
   delete proc;
-  proc = new KProcess();
+  proc = new TDEProcess();
 
   *proc << "diff";
   *proc << "-u" << popupFile.path() << "-";
   proc->setWorkingDirectory( popupFile.directory() );
 
-  connect( proc, TQT_SIGNAL(processExited( KProcess* )),
-           this, TQT_SLOT(processExited( KProcess* )) );
-  connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
-           this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
-  connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
-           this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
-  connect( proc, TQT_SIGNAL(wroteStdin( KProcess* )),
-           this, TQT_SLOT(wroteStdin( KProcess* )) );
+  connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
+           this, TQT_SLOT(processExited( TDEProcess* )) );
+  connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+           this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+           this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+  connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )),
+           this, TQT_SLOT(wroteStdin( TDEProcess* )) );
 
-  if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+  if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
     KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) );
     delete proc;
     proc = 0;
@@ -173,7 +173,7 @@ void DiffPart::localDiff()
   proc->writeStdin( buffer.data(), buffer.length() );
 }
 
-void DiffPart::processExited( KProcess* p )
+void DiffPart::processExited( TDEProcess* p )
 {
   // diff has exit status 0 and 1 for success
   if ( p->normalExit() && ( p->exitStatus() == 0 || p->exitStatus() == 1 ) ) {
@@ -189,18 +189,18 @@ void DiffPart::processExited( KProcess* p )
   proc = 0;
 }
 
-void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStdout( TDEProcess* /* p */, char* buf, int buflen )
 {
   resultBuffer += TQString::fromLocal8Bit( buf, buflen );
 }
 
-void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStderr( TDEProcess* /* p */, char* buf, int buflen )
 {
   kdDebug(9033) << "received Stderr: " << TQString(TQString::fromLocal8Bit( buf, buflen )).ascii() << endl;
   resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
-void DiffPart::wroteStdin( KProcess* p )
+void DiffPart::wroteStdin( TDEProcess* p )
 {
   buffer = 0L;
   p->closeStdin();
-- 
cgit v1.2.1