diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 | 
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 | 
| commit | 4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch) | |
| tree | b0a7cd1c184f0003c0292eb416ed27f674f9cc43 /kompare/libdiff2/diffhunk.h | |
| parent | 1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff) | |
| download | tdesdk-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/diffhunk.h')
| -rw-r--r-- | kompare/libdiff2/diffhunk.h | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/kompare/libdiff2/diffhunk.h b/kompare/libdiff2/diffhunk.h index 8a76babb..a4194a3a 100644 --- a/kompare/libdiff2/diffhunk.h +++ b/kompare/libdiff2/diffhunk.h @@ -33,11 +33,11 @@ public:  	enum Type { Normal, AddedByBlend };  public: -	DiffHunk( int sourceLine, int destinationLine, QString function = QString::null, Type type = Normal ); +	DiffHunk( int sourceLine, int destinationLine, TQString function = TQString::null, Type type = Normal );  	~DiffHunk();  	const DifferenceList& differences() const { return m_differences; }; -	const QString& function() const           { return m_function; }; +	const TQString& function() const           { return m_function; };  	int sourceLineNumber() const      { return m_sourceLine; };  	int destinationLineNumber() const { return m_destinationLine; }; @@ -50,19 +50,19 @@ public:  	void add( Difference* diff ); -	QString recreateHunk() const; +	TQString recreateHunk() const;  private:  	int            m_sourceLine;  	int            m_destinationLine;  	DifferenceList m_differences; -	QString        m_function; +	TQString        m_function;  	Type           m_type;  }; -typedef QValueList<DiffHunk*> DiffHunkList; -typedef QValueList<DiffHunk*>::iterator DiffHunkListIterator; -typedef QValueList<DiffHunk*>::const_iterator DiffHunkListConstIterator; +typedef TQValueList<DiffHunk*> DiffHunkList; +typedef TQValueList<DiffHunk*>::iterator DiffHunkListIterator; +typedef TQValueList<DiffHunk*>::const_iterator DiffHunkListConstIterator;  } // End of namespace Diff2 | 
