diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /kompare/libdiff2/diffmodel.cpp | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdiff2/diffmodel.cpp')
| -rw-r--r-- | kompare/libdiff2/diffmodel.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 1b3822b0..438055c6 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -79,10 +79,10 @@ void DiffModel::splitSourceInPathAndFileName() { int pos; - if( ( pos = m_source.findRev( "/" ) ) >= 0 ) + if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) m_sourcePath = m_source.mid( 0, pos+1 ); - if( ( pos = m_source.findRev( "/" ) ) >= 0 ) + if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) m_sourceFile = m_source.mid( pos+1, m_source.length() - pos ); else m_sourceFile = m_source; @@ -94,10 +94,10 @@ void DiffModel::splitDestinationInPathAndFileName() { int pos; - if( ( pos = m_destination.findRev( "/" ) )>= 0 ) + if( ( pos = m_destination.tqfindRev( "/" ) )>= 0 ) m_destinationPath = m_destination.mid( 0, pos+1 ); - if( ( pos = m_destination.findRev( "/" ) ) >= 0 ) + if( ( pos = m_destination.tqfindRev( "/" ) ) >= 0 ) m_destinationFile = m_destination.mid( pos+1, m_destination.length() - pos ); else m_destinationFile = m_source; @@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const TQString diff; // recreate header - TQString tab = TQString::fromLatin1( "\t" ); - TQString nl = TQString::fromLatin1( "\n" ); - diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); + TQString tab = TQString::tqfromLatin1( "\t" ); + TQString nl = TQString::tqfromLatin1( "\n" ); + diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); + diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; @@ -393,10 +393,10 @@ bool DiffModel::setSelectedDifference( Difference* diff ) if ( diff != m_selectedDifference ) { - if ( ( m_differences.findIndex( diff ) ) == -1 ) + if ( ( m_differences.tqfindIndex( diff ) ) == -1 ) return false; // Dont set m_diffIndex if it cant be found - m_diffIndex = m_differences.findIndex( diff ); + m_diffIndex = m_differences.tqfindIndex( diff ); kdDebug( 8101 ) << "m_diffIndex = " << m_diffIndex << endl; m_selectedDifference = diff; } |