diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kitchensync/src/genericdiffalgo.cpp | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kitchensync/src/genericdiffalgo.cpp')
-rw-r--r-- | kitchensync/src/genericdiffalgo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 21b83f454..209382ed7 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -57,11 +57,11 @@ void GenericDiffAlgo::run() for ( uint i = 0; i < lines; ++i ) { if ( i < leftList.count() && i < rightList.count() ) { if ( !compareString( leftList[ i ], rightList[ i ] ) ) - conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] ); + conflictField( i18n( "Line %1" ).tqarg( i ), leftList[ i ], rightList[ i ] ); } else if ( i < leftList.count() && i >= rightList.count() ) { - additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] ); + additionalLeftField( i18n( "Line %1" ).tqarg( i ), leftList[ i ] ); } else if ( i >= leftList.count() && i < rightList.count() ) { - additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] ); + additionalRightField( i18n( "Line %1" ).tqarg( i ), rightList[ i ] ); } } |