diff options
Diffstat (limited to 'ktnef/lib')
| -rw-r--r-- | ktnef/lib/ktnefparser.cpp | 10 | ||||
| -rw-r--r-- | ktnef/lib/ktnefpropertyset.cpp | 10 | ||||
| -rw-r--r-- | ktnef/lib/ktnefwriter.cpp | 4 | ||||
| -rw-r--r-- | ktnef/lib/mapi.cpp | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index 41bb2b687..a81022046 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -465,7 +465,7 @@ void KTNEFParser::checkCurrent( int key ) d->current_ = new KTNEFAttach(); else { - if ( d->current_->attributes().tqcontains( key ) ) + if ( d->current_->attributes().contains( key ) ) { if (d->current_->offset() >= 0 ) { @@ -554,11 +554,11 @@ TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props ) { TQString s, dn, addr, t; TQMap<int,KTNEFProperty*>::ConstIterator it; - if ( ( it = props.tqfind( 0x3001 ) ) != props.end() ) + if ( ( it = props.find( 0x3001 ) ) != props.end() ) dn = ( *it )->valueString(); - if ( ( it = props.tqfind( 0x3003 ) ) != props.end() ) + if ( ( it = props.find( 0x3003 ) ) != props.end() ) addr = ( *it )->valueString(); - if ( ( it = props.tqfind( 0x0C15 ) ) != props.end() ) + if ( ( it = props.find( 0x0C15 ) ) != props.end() ) switch ( ( *it )->value().toInt() ) { case 0: t = "From:"; break; @@ -855,7 +855,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt break; } // do not remove potential existing similar entry - if ( ( it = props.tqfind( key ) ) == props.end() ) + if ( ( it = props.find( key ) ) == props.end() ) { p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value ); props[ p->key() ] = p; diff --git a/ktnef/lib/ktnefpropertyset.cpp b/ktnef/lib/ktnefpropertyset.cpp index b67c1ffba..ec3ee2b51 100644 --- a/ktnef/lib/ktnefpropertyset.cpp +++ b/ktnef/lib/ktnefpropertyset.cpp @@ -30,7 +30,7 @@ KTNEFPropertySet::~KTNEFPropertySet() void KTNEFPropertySet::addProperty( int key, int type, const TQVariant& value, const TQVariant& name, bool overwrite ) { - TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.tqfind( key ); + TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.find( key ); if ( it != properties_.end() ) { if ( overwrite ) @@ -45,7 +45,7 @@ void KTNEFPropertySet::addProperty( int key, int type, const TQVariant& value, c TQString KTNEFPropertySet::findProp(int key, const TQString& fallback, bool upper) { - TQMap<int,KTNEFProperty*>::Iterator it = properties_.tqfind( key ); + TQMap<int,KTNEFProperty*>::Iterator it = properties_.find( key ); if( properties_.end() != it ) return upper ? KTNEFProperty::formatValue( (*it)->value(), false ).upper() : KTNEFProperty::formatValue( (*it)->value(), false ); @@ -100,7 +100,7 @@ const TQMap<int,KTNEFProperty*>& KTNEFPropertySet::properties() const TQVariant KTNEFPropertySet::property( int key ) const { - TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.tqfind( key ); + TQMap<int,KTNEFProperty*>::ConstIterator it = properties_.find( key ); if ( it == properties_.end() ) return TQVariant(); else @@ -122,7 +122,7 @@ void KTNEFPropertySet::clear( bool deleteAll ) void KTNEFPropertySet::addAttribute( int key, int type, const TQVariant& value, bool overwrite ) { - TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.tqfind( key ); + TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.find( key ); if ( it != attributes_.end() ) { if ( overwrite ) @@ -146,7 +146,7 @@ const TQMap<int,KTNEFProperty*>& KTNEFPropertySet::attributes() const TQVariant KTNEFPropertySet::attribute( int key ) const { - TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.tqfind( key ); + TQMap<int,KTNEFProperty*>::ConstIterator it = attributes_.find( key ); if ( it == attributes_.end() ) return TQVariant(); else diff --git a/ktnef/lib/ktnefwriter.cpp b/ktnef/lib/ktnefwriter.cpp index 2264b15ec..dde202ec7 100644 --- a/ktnef/lib/ktnefwriter.cpp +++ b/ktnef/lib/ktnefwriter.cpp @@ -100,7 +100,7 @@ TQ_UINT32 mergeTagAndType( TQ_UINT32 tag, TQ_UINT32 type ) { */ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) { TQMap<int,KTNEFProperty*>& properties = mData->properties.properties(); - TQMap<int,KTNEFProperty*>::Iterator it = properties.tqfind( tag ); + TQMap<int,KTNEFProperty*>::Iterator it = properties.find( tag ); if ( it == properties.end() ) return false; @@ -417,7 +417,7 @@ void KTNEFWriter::addAttendee( const TQString& /*cn*/, Role /*r*/, PartStat /*p* // I assume this is the same as the sender? // U also assume that this is like "Name <address>" void KTNEFWriter::setOrganizer( const TQString& organizer ) { - int i = organizer.tqfind( '<' ); + int i = organizer.find( '<' ); if ( i == -1 ) return; diff --git a/ktnef/lib/mapi.cpp b/ktnef/lib/mapi.cpp index e4f6f85cf..f47c5065d 100644 --- a/ktnef/lib/mapi.cpp +++ b/ktnef/lib/mapi.cpp @@ -197,7 +197,7 @@ TQString mapiTagString( int key ) for ( int i=0; MAPI_TagStrings[ i ].str; i++ ) MAPI_TagMap[ MAPI_TagStrings[ i ].tag ] = i18n(MAPI_TagStrings[ i ].str); } - TQMap<int,TQString>::ConstIterator it = MAPI_TagMap.tqfind( key ); + TQMap<int,TQString>::ConstIterator it = MAPI_TagMap.find( key ); if ( it == MAPI_TagMap.end() ) return TQString().sprintf( "0x%04X", key ); else @@ -211,7 +211,7 @@ TQString mapiNamedTagString( int key, int tag ) for ( int i=0; MAPI_NamedTagStrings[ i ].str; i++ ) MAPI_NamedTagMap[ MAPI_NamedTagStrings[ i ].tag ] = i18n(MAPI_NamedTagStrings[ i ].str); } - TQMap<int,TQString>::ConstIterator it = MAPI_NamedTagMap.tqfind( key ); + TQMap<int,TQString>::ConstIterator it = MAPI_NamedTagMap.find( key ); if ( it == MAPI_NamedTagMap.end() ) if ( tag >= 0 ) return TQString().sprintf( "0x%04X [0x%04X]: ", tag, key ) + *it; |