From e6aaa3624cc6179b82a9bfff1760e742a669064c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:56 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kompare/libdiff2/kompareprocess.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kompare/libdiff2/kompareprocess.h') 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; -- cgit v1.2.3