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/diffhunk.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kompare/libdiff2/diffhunk.cpp') diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index f980dd93..3b48d796 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -23,7 +23,7 @@ using namespace Diff2; -DiffHunk::DiffHunk( int sourceLine, int destinationLine, QString function, Type type ) : +DiffHunk::DiffHunk( int sourceLine, int destinationLine, TQString function, Type type ) : m_sourceLine( sourceLine ), m_destinationLine( destinationLine ), m_function( function ), @@ -66,10 +66,10 @@ int DiffHunk::destinationLineCount() const return lineCount; } -QString DiffHunk::recreateHunk() const +TQString DiffHunk::recreateHunk() const { - QString hunk; - QString differences; + TQString hunk; + TQString differences; // recreate body DifferenceListConstIterator diffIt = m_differences.begin(); @@ -97,7 +97,7 @@ QString DiffHunk::recreateHunk() const } // recreate header - hunk += QString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) + hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) .arg( m_sourceLine ) .arg( m_destinationLine ) .arg( slc ) @@ -106,7 +106,7 @@ QString DiffHunk::recreateHunk() const if ( !m_function.isEmpty() ) hunk += " " + m_function; - hunk += QString::fromLatin1( "\n" ); + hunk += TQString::fromLatin1( "\n" ); hunk += differences; -- cgit v1.2.1