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.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index d5e2cc92..5cf4b478 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -20,7 +20,7 @@
 
 class TQPopupMenu;
 class Context;
-class KProcess;
+class TDEProcess;
 class DiffWidget;
 class TQCString;
 
@@ -43,15 +43,15 @@ public slots:
 private slots:
     void contextMenu( TQPopupMenu* popup, const Context* context );
     void localDiff();
-    void processExited( KProcess* p );
-    void receivedStdout( KProcess* p, char* buf, int buflen );
-    void receivedStderr( KProcess* p, char* buf, int buflen );
-    void wroteStdin( KProcess* p );
+    void processExited( TDEProcess* p );
+    void receivedStdout( TDEProcess* p, char* buf, int buflen );
+    void receivedStderr( TDEProcess* p, char* buf, int buflen );
+    void wroteStdin( TDEProcess* p );
 
 private:
     TQGuardedPtr<DiffWidget> diffWidget;
     KURL popupFile;
-    KProcess* proc;
+    TDEProcess* proc;
     TQCString buffer;
     TQString resultBuffer;
     TQString resultErr;
-- 
cgit v1.2.3