From 4ae0c208b66e0f7954e194384464fe2d0a2c56dd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:51:49 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kompare/libdiff2/diffmodel.h | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'kompare/libdiff2/diffmodel.h') diff --git a/kompare/libdiff2/diffmodel.h b/kompare/libdiff2/diffmodel.h index 11c424b5..3b957b89 100644 --- a/kompare/libdiff2/diffmodel.h +++ b/kompare/libdiff2/diffmodel.h @@ -20,8 +20,8 @@ #ifndef DIFFMODEL_H #define DIFFMODEL_H -#include -#include +#include +#include #include "diffhunk.h" #include "kompare.h" @@ -37,14 +37,14 @@ class DiffModel : public QObject Q_OBJECT public: - DiffModel( const QString& srcBaseURL, const QString& destBaseURL ); + DiffModel( const TQString& srcBaseURL, const TQString& destBaseURL ); DiffModel(); - DiffModel( const DiffModel& ) : QObject() {}; + DiffModel( const DiffModel& ) : TQObject() {}; ~DiffModel(); - int parseDiff( enum Kompare::Format format, const QStringList& list ); + int parseDiff( enum Kompare::Format format, const TQStringList& list ); - QString recreateDiff() const; + TQString recreateDiff() const; int hunkCount() const { return m_hunks.count(); } int differenceCount() const { return m_differences.count(); } @@ -67,23 +67,23 @@ public: Difference* prevDifference(); Difference* nextDifference(); - const QString source() const { return m_source; } - const QString destination() const { return m_destination; } - const QString sourceFile() const; - const QString destinationFile() const; - const QString sourcePath() const; - const QString destinationPath() const; - const QString sourceTimestamp() const { return m_sourceTimestamp; } - const QString destinationTimestamp() const { return m_destinationTimestamp; } - const QString sourceRevision() const { return m_sourceRevision; } - const QString destinationRevision() const { return m_destinationRevision; } - - void setSourceFile( QString path ); - void setDestinationFile( QString path ); - void setSourceTimestamp( QString timestamp ); - void setDestinationTimestamp( QString timestamp ); - void setSourceRevision( QString revision ); - void setDestinationRevision( QString revision ); + const TQString source() const { return m_source; } + const TQString destination() const { return m_destination; } + const TQString sourceFile() const; + const TQString destinationFile() const; + const TQString sourcePath() const; + const TQString destinationPath() const; + const TQString sourceTimestamp() const { return m_sourceTimestamp; } + const TQString destinationTimestamp() const { return m_destinationTimestamp; } + const TQString sourceRevision() const { return m_sourceRevision; } + const TQString destinationRevision() const { return m_destinationRevision; } + + void setSourceFile( TQString path ); + void setDestinationFile( TQString path ); + void setSourceTimestamp( TQString timestamp ); + void setDestinationTimestamp( TQString timestamp ); + void setSourceRevision( TQString revision ); + void setDestinationRevision( TQString revision ); void addHunk( DiffHunk* hunk ); void addDiff( Difference* diff ); @@ -116,20 +116,20 @@ private: void splitDestinationInPathAndFileName(); private: - QString m_source; - QString m_destination; + TQString m_source; + TQString m_destination; - QString m_sourcePath; - QString m_destinationPath; + TQString m_sourcePath; + TQString m_destinationPath; - QString m_sourceFile; - QString m_destinationFile; + TQString m_sourceFile; + TQString m_destinationFile; - QString m_sourceTimestamp; - QString m_destinationTimestamp; + TQString m_sourceTimestamp; + TQString m_destinationTimestamp; - QString m_sourceRevision; - QString m_destinationRevision; + TQString m_sourceRevision; + TQString m_destinationRevision; DiffHunkList m_hunks; DifferenceList m_differences; -- cgit v1.2.1