summaryrefslogtreecommitdiffstats
path: root/parts/diff/diffpart.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /parts/diff/diffpart.h
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts/diff/diffpart.h')
-rw-r--r--parts/diff/diffpart.h12
1 files changed, 6 insertions, 6 deletions
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;