diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /libkonq/konq_undo.cc | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkonq/konq_undo.cc')
| -rw-r--r-- | libkonq/konq_undo.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index 91eece83b..962c26741 100644 --- a/libkonq/konq_undo.cc +++ b/libkonq/konq_undo.cc @@ -135,7 +135,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons Q_ASSERT( from.isLocalFile() ); Q_ASSERT( to.protocol() == "trash" ); TQMap<TQString, TQString> metaData = job->metaData(); - TQMap<TQString, TQString>::ConstIterator it = metaData.find( "trashURL-" + from.path() ); + TQMap<TQString, TQString>::ConstIterator it = metaData.tqfind( "trashURL-" + from.path() ); if ( it != metaData.end() ) { // Update URL op.m_dst = it.data(); @@ -317,7 +317,7 @@ void KonqUndoManager::undo() } else if ( (*it).m_link ) { - if ( !d->m_fileCleanupStack.contains( (*it).m_dst ) ) + if ( !d->m_fileCleanupStack.tqcontains( (*it).m_dst ) ) d->m_fileCleanupStack.prepend( (*it).m_dst ); if ( d->m_current.m_type != KonqCommand::MOVE ) @@ -339,7 +339,7 @@ void KonqUndoManager::undo() KURL::List::ConstIterator it = d->m_current.m_src.begin(); KURL::List::ConstIterator end = d->m_current.m_src.end(); for (; it != end; ++it ) - if ( !d->m_dirStack.contains( *it) ) + if ( !d->m_dirStack.tqcontains( *it) ) d->m_dirStack.push( *it ); } */ @@ -390,7 +390,7 @@ void KonqUndoManager::slotResult( KIO::Job *job ) void KonqUndoManager::addDirToUpdate( const KURL& url ) { - if ( d->m_dirsToUpdate.find( url ) == d->m_dirsToUpdate.end() ) + if ( d->m_dirsToUpdate.tqfind( url ) == d->m_dirsToUpdate.end() ) d->m_dirsToUpdate.prepend( url ); } @@ -652,13 +652,13 @@ TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op ) TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd ) { - stream << cmd.m_valid << (Q_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; + stream << cmd.m_valid << (TQ_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; return stream; } TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd ) { - Q_INT8 type; + TQ_INT8 type; stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst; cmd.m_type = static_cast<KonqCommand::Type>( type ); return stream; |