Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 67 insertions, 0 deletions

diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h
new file mode 100644
index 00000000..06a4a5ce
--- /dev/null
+++ b/kompare/libdiff2/kompareprocess.h
@@ -0,0 +1,67 @@
+/***************************************************************************
+                                kompareprocess.h  -  description
+                                -------------------
+        begin                   : Sun Mar 4 2001
+        copyright               : (C) 2001-2003 by Otto Bruggeman
+                                  and John Firebaugh
+        email                   : otto.bruggeman@home.nl
+                                  jfirebaugh@kde.org
+****************************************************************************/
+
+/***************************************************************************
+**
+**   This program is free software; you can redistribute it and/or modify
+**   it under the terms of the GNU General Public License as published by
+**   the Free Software Foundation; either version 2 of the License, or
+**   (at your option) any later version.
+**
+***************************************************************************/
+
+#ifndef KOMPAREPROCESS_H
+#define KOMPAREPROCESS_H
+
+#include <kprocess.h>
+
+#include "kompare.h"
+
+class QTextCodec;
+
+class DiffSettings;
+
+class KompareProcess : public KProcess, public KompareFunctions
+{
+	Q_OBJECT
+
+public:
+	KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, QString source, QString destination, QString directory = QString::null );
+	~KompareProcess();
+
+	bool start();
+
+	QString diffOutput() { return m_stdout; }
+	QString stdOut()     { return m_stdout; }
+	QString stdErr()     { return m_stderr; }
+
+	void setEncoding( const QString& encoding );
+
+signals:
+	void diffHasFinished( bool finishedNormally );
+
+protected:
+	void writeDefaultCommandLine();
+	void writeCommandLine();
+
+protected slots:
+	void slotReceivedStdout( KProcess*, char*, int );
+	void slotReceivedStderr( KProcess*, char*, int );
+	void slotProcessExited( KProcess* proc );
+
+private:
+	DiffSettings*          m_diffSettings;
+	enum Kompare::DiffMode m_mode;
+	QString                m_stdout;
+	QString                m_stderr;
+	QTextDecoder*          m_textDecoder;
+};
+
+#endif