summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2/kompareprocess.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
commit4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch)
treeb0a7cd1c184f0003c0292eb416ed27f674f9cc43 /kompare/libdiff2/kompareprocess.h
parent1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff)
downloadtdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.tar.gz
tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdiff2/kompareprocess.h')
-rw-r--r--kompare/libdiff2/kompareprocess.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h
index 06a4a5ce..a2d2e92b 100644
--- a/kompare/libdiff2/kompareprocess.h
+++ b/kompare/libdiff2/kompareprocess.h
@@ -33,16 +33,16 @@ 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( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString directory = TQString::null );
~KompareProcess();
bool start();
- QString diffOutput() { return m_stdout; }
- QString stdOut() { return m_stdout; }
- QString stdErr() { return m_stderr; }
+ TQString diffOutput() { return m_stdout; }
+ TQString stdOut() { return m_stdout; }
+ TQString stdErr() { return m_stderr; }
- void setEncoding( const QString& encoding );
+ void setEncoding( const TQString& encoding );
signals:
void diffHasFinished( bool finishedNormally );
@@ -59,9 +59,9 @@ protected slots:
private:
DiffSettings* m_diffSettings;
enum Kompare::DiffMode m_mode;
- QString m_stdout;
- QString m_stderr;
- QTextDecoder* m_textDecoder;
+ TQString m_stdout;
+ TQString m_stderr;
+ TQTextDecoder* m_textDecoder;
};
#endif