summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2/kompareprocess.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:49:56 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:49:56 -0600
commite6aaa3624cc6179b82a9bfff1760e742a669064c (patch)
tree3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kompare/libdiff2/kompareprocess.h
parent4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff)
downloadtdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz
tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdiff2/kompareprocess.h')
-rw-r--r--kompare/libdiff2/kompareprocess.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h
index 8f1fca8b..e7fc781c 100644
--- a/kompare/libdiff2/kompareprocess.h
+++ b/kompare/libdiff2/kompareprocess.h
@@ -28,7 +28,7 @@ class TQTextCodec;
class DiffSettings;
-class KompareProcess : public KProcess, public KompareFunctions
+class KompareProcess : public TDEProcess, public KompareFunctions
{
Q_OBJECT
@@ -53,9 +53,9 @@ protected:
void writeCommandLine();
protected slots:
- void slotReceivedStdout( KProcess*, char*, int );
- void slotReceivedStderr( KProcess*, char*, int );
- void slotProcessExited( KProcess* proc );
+ void slotReceivedStdout( TDEProcess*, char*, int );
+ void slotReceivedStderr( TDEProcess*, char*, int );
+ void slotProcessExited( TDEProcess* proc );
private:
DiffSettings* m_diffSettings;