summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2/difference.cpp
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/difference.cpp
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/difference.cpp')
-rw-r--r--kompare/libdiff2/difference.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kompare/libdiff2/difference.cpp b/kompare/libdiff2/difference.cpp
index 8cbb4093..c23dd1e9 100644
--- a/kompare/libdiff2/difference.cpp
+++ b/kompare/libdiff2/difference.cpp
@@ -34,12 +34,12 @@ Difference::~Difference()
{
}
-void Difference::addSourceLine( QString line )
+void Difference::addSourceLine( TQString line )
{
m_sourceLines.append( new DifferenceString( line ) );
}
-void Difference::addDestinationLine( QString line )
+void Difference::addDestinationLine( TQString line )
{
m_destinationLines.append( new DifferenceString( line ) );
}
@@ -85,9 +85,9 @@ void Difference::determineInlineDifferences()
}
}
-QString Difference::recreateDifference() const
+TQString Difference::recreateDifference() const
{
- QString difference;
+ TQString difference;
// source
DifferenceStringListConstIterator stringIt = m_sourceLines.begin();