rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 56 insertions, 56 deletions

diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index e3cb48f91..c7b35228e 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -136,8 +136,8 @@ TQString ComboInput::value() const
 
 void ComboInput::setValue( const TQString& value )
 {
-	if( _list->tqcontains( value ) )
-		_right->setCurrentItem( _list->keys().tqfindIndex( value ) );
+	if( _list->contains( value ) )
+		_right->setCurrentItem( _list->keys().findIndex( value ) );
 	else
 		_right->setCurrentItem( -1 );
 }
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index 5a93ec679..fec63a2b2 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -241,7 +241,7 @@ void AccountManager::playSound( const TQString& file )
 
 void AccountManager::slotChanged( int count, KMailDrop* mailDrop )
 {
-	Dropinfo *info = _dropInfo->tqfind( mailDrop ).data();
+	Dropinfo *info = _dropInfo->find( mailDrop ).data();
 	info->newMessages = count > info->msgnr || ( count == info->msgnr && info->newMessages );
 	
 	if( count > info->msgnr )
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 9cc4a9f05..aea90103e 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -74,11 +74,11 @@ bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg )
 
 bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol * )
 {
-	if( !map.tqcontains( "dcopname" ) )
+	if( !map.contains( "dcopname" ) )
 		//The mapping MUST contain dcopname.
 		kdDebug() << "mapping is niet compleet" << endl;
 
-	this->setDCOPName( *map.tqfind( "dcopname" ) );
+	this->setDCOPName( *map.find( "dcopname" ) );
 	
 	return true;
 }
@@ -125,7 +125,7 @@ bool DCOPDrop::deleteMails( TQPtrList<const KornMailId> * ids, bool * )
 	for( const KornMailId *it = ids->first(); it; it = ids->next() )
 	{
 		const KornIntId* id = dynamic_cast< const KornIntId* >( it );
-		if( _msgList->tqcontains( id->getId() ) )
+		if( _msgList->contains( id->getId() ) )
 			_msgList->erase( id->getId() );
 	}
 	
@@ -173,7 +173,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 
 bool DCOPDrop::removeMessage( int id )
 {
-	if( ! _msgList->tqcontains( id ) )
+	if( ! _msgList->contains( id ) )
 		return false;
 	
 	delete (*_msgList)[ id ];
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index 7d0f9873a..304fed5ed 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -65,34 +65,34 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
+	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->tqfind( "tls" ) ) );
-	if( metadata->tqcontains( "auth" ) )
-		map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->tqfind( "auth" ) ) );
+	if( metadata->contains( "tls" ) )
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
+	if( metadata->contains( "auth" ) )
+		map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->find( "auth" ) ) );
 }
 
 void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->tqcontains( "encryption" ) )
+	if( map->contains( "encryption" ) )
 	{
-		if( *map->tqfind( "encryption" ) == "ssl" )
+		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
 		else
 		{
 			map->insert( "ssl", "false" );
-			metadata += *map->tqfind( "encryption" );
+			metadata += *map->find( "encryption" );
 		}
 		map->erase( "encryption" );
 	}
 
-	if( map->tqcontains( "auth" ) )
+	if( map->contains( "auth" ) )
 	{
 		if( !metadata.isEmpty() )
 			metadata += ",";
-		metadata += *map->tqfind( "auth" );
+		metadata += *map->find( "auth" );
 		map->erase( "auth" );
 	}
 
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp
index 4d0c46679..7ff7a922c 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -188,7 +188,7 @@ int main( int, char**  )
 		}
 		else if( currentGroup1.isNull() || !isKey )
 			continue;
-		if( mapping1.tqcontains( key_value.cap( 1 ) ) )
+		if( mapping1.contains( key_value.cap( 1 ) ) )
 		{
 			out << currentGroup1 << endl;
 			out << mapping1[ key_value.cap( 1 ) ] << "=" << key_value.cap( 2 ) << endl;
@@ -198,7 +198,7 @@ int main( int, char**  )
 				out << "name=" << key_value.cap( 2 ) << endl;
 			}
 		}
-		else if( mapping2.tqcontains( key_value.cap( 1 ) ) )
+		else if( mapping2.contains( key_value.cap( 1 ) ) )
 		{
 			to_printed.insert( key_value.cap( 1 ), key_value.cap( 2 ) );
 		}
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 54d0e773d..0977eb603 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -180,11 +180,11 @@ void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int
 	_ssl = ssl;
 	
 	//Checking for authentication-settings.
-	//if( _metadata->tqcontains("auth") )
+	//if( _metadata->contains("auth") )
 	//{
 	//	auth = (*_metadata)["auth"];
 	//	*_metadata = metadata;
-	//	if( ! _metadata->tqcontains("auth") )
+	//	if( ! _metadata->contains("auth") )
 	//		(*_metadata)["auth"] = auth;
 	//} else
 	*_metadata = metadata;
@@ -201,7 +201,7 @@ void KKioDrop::setUser(const TQString & user, const TQString & password,
 	_kurl->setPath( mailbox );
 	if( ! auth.isEmpty() && auth != "Plain" )
 		(*_metadata)["auth"] = auth;
-	else if( _metadata->tqcontains( "auth" ) )
+	else if( _metadata->contains( "auth" ) )
 		_metadata->erase( "auth" );
 
 	_valid = _kurl->isValid();
@@ -241,7 +241,7 @@ TQString KKioDrop::mailbox() const
 }
 TQString KKioDrop::auth() const
 {
-	return ( _metadata->tqcontains("auth")?(*_metadata)["auth"]:"" );
+	return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" );
 }
 
 void KKioDrop::recheck()
@@ -337,32 +337,32 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 {
 	TQString val, val2;
 
-	if( !map.tqcontains( "server" ) || !map.tqcontains( "port" ) || !map.tqcontains( "ssl" ) || !map.tqcontains( "username" ) ||
-	    !map.tqcontains( "mailbox" ) || !map.tqcontains( "password" ) || !map.tqcontains( "metadata" ) || !map.tqcontains( "name" ) )
+	if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) ||
+	    !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) )
 	{
 		kdWarning() << "Bug: map niet compleet" << endl;
 		return false;
 	}
 
-	this->setName( (*map.tqfind( "name" )).utf8() );
+	this->setName( (*map.find( "name" )).utf8() );
 	
 	_protocol = protocol->getKIOProtocol();
 	if( !_protocol )
 		_protocol = Protocols::firstProtocol()->getKIOProtocol();
 			
-	val = *map.tqfind( "server" );
-	setKioServer( val2, val, (*map.tqfind( "port" )).toInt(), KIO::MetaData(), *map.tqfind( "ssl" ) == "true", false );
+	val = *map.find( "server" );
+	setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false );
 
-	_kurl->setUser( *map.tqfind( "username" ) );
-	_kurl->setPath( *map.tqfind( "mailbox" ) );
+	_kurl->setUser( *map.find( "username" ) );
+	_kurl->setPath( *map.find( "mailbox" ) );
 
-	_kurl->setPass( *map.tqfind( "password" ) );
+	_kurl->setPass( *map.find( "password" ) );
 	
-	TQStringList list = TQStringList::split( ',', *map.tqfind( "metadata" ) );
+	TQStringList list = TQStringList::split( ',', *map.find( "metadata" ) );
 	TQStringList::Iterator it;
 	for( it = list.begin(); it != list.end(); ++it )
 	{
-		int split = (*it).tqfind( "=" );
+		int split = (*it).find( "=" );
 		if( split > 0 )
 			_metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) );
 	}
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index faac9390b..e43b97060 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -292,7 +292,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 		if( ! fileinfo.name.isNull() && isFile )
 		{
 			_new_mailurls->append( fileinfo );
-			if( ! old_list.tqcontains( fileinfo.name ) && _kio->passivePopup() )
+			if( ! old_list.contains( fileinfo.name ) && _kio->passivePopup() )
 				showPassive( fileinfo.name );
 		}
 	}
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index fc0a45ac4..8434fe44b 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -63,13 +63,13 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQMap< TQString, TQString> *metadata = new TQMap< TQString, TQString >;
 
-	if( map->tqcontains( "metadata" ) )
+	if( map->contains( "metadata" ) )
 	{
-		TQStringList list = TQStringList::split( ",", *map->tqfind( "metadata" ) );
+		TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) );
 		TQStringList::Iterator it;
 		for( it = list.begin(); it != list.end(); ++it )
 		{
-			int split = (*it).tqfind( '=' );
+			int split = (*it).find( '=' );
 
 			metadata->insert( (*it).left( split ), (*it).right( (*it).length() - split - 1 ) );
 		}
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 149fd55b0..56f64b765 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -80,8 +80,8 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt
 	(*entries)[ "password" ] = KOrnPassword::readKOrnPassword( boxnr, accountnr, *config );
 	
 	for( input = _accountinput->first(); input; input = _accountinput->next() )
-		if( entries->tqcontains( input->configName() ) )
-			input->setValue( *(entries->tqfind( input->configName() ) ) );
+		if( entries->contains( input->configName() ) )
+			input->setValue( *(entries->find( input->configName() ) ) );
 	
 	this->edInterval->setText( _config->readEntry( "interval", "300" ) );
 	
@@ -115,9 +115,9 @@ void KornAccountCfgImpl::writeConfig()
 
 	protocol->writeEntries( map );
 
-	if( map->tqcontains( "password" ) )
+	if( map->contains( "password" ) )
 	{
-		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->tqfind( "password" ) );
+		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) );
 		map->erase( "password" );
 	}
 
diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h
index 0023cfdc0..2ce5e9dbb 100644
--- a/korn/maildir_proto.h
+++ b/korn/maildir_proto.h
@@ -47,7 +47,7 @@ public:
 	virtual TQString serverName() const { return i18n( "Path:" ); }
 
 	virtual void recheckKURL( KURL &kurl, KIO::MetaData & )
-	                               { kurl.setPath( kurl.host() + "/." + kurl.path().tqreplace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
+	                               { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
 	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { }
 	virtual void deleteMailKURL( KURL &, KIO::MetaData & )  { }
 	virtual void readMailKURL( KURL &, KIO::MetaData & )    { }
diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp
index ee675906f..747d9ec7c 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -67,7 +67,7 @@ TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr)
 	if ( str.isEmpty() )
 		return TQString();
 
-	if ( str.tqfind( "=?" ) < 0 ) {
+	if ( str.find( "=?" ) < 0 ) {
 		// No need to decode
 		return TQString(str);
 	}
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index c42076426..c4ecd6b16 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -64,34 +64,34 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
+	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->tqfind( "tls" ) ) );
-	if( metadata->tqcontains( "auth" ) )
+	if( metadata->contains( "tls" ) )
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
+	if( metadata->contains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
 
 void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->tqcontains( "encryption" ) )
+	if( map->contains( "encryption" ) )
 	{
-		if( *map->tqfind( "encryption" ) == "ssl" )
+		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
 		else
 		{
 			map->insert( "ssl", "false" );
-			metadata += *map->tqfind( "encryption" );
+			metadata += *map->find( "encryption" );
 		}
 		map->erase( "encryption" );
 	}
 
-	if( map->tqcontains( "auth" ) )
+	if( map->contains( "auth" ) )
 	{
-		if( !metadata.isEmpty() && ! (*map->tqfind( "auth" )).isEmpty() )
+		if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() )
 			metadata += ",";
-		metadata += *map->tqfind( "auth" );
+		metadata += *map->find( "auth" );
 		map->erase( "auth" );
 	}
 
diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h
index feaed812b..c828e595f 100644
--- a/korn/pop3_proto.h
+++ b/korn/pop3_proto.h
@@ -44,8 +44,8 @@ public:
 
 	virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); }
 	
-	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/headers/" ) ); }
-	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/remove/" ) ); }
+	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
+	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
 	virtual bool commitDelete () const { return true; }
 	virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); }
 
diff --git a/korn/protocols.cpp b/korn/protocols.cpp
index c35ce4bae..d604e0870 100644
--- a/korn/protocols.cpp
+++ b/korn/protocols.cpp
@@ -42,7 +42,7 @@ const Protocol* Protocols::getProto( const TQString& proto )
 	if( !protocols )
 		fillProtocols();
 		
-	return protocols->tqfind( proto );
+	return protocols->find( proto );
 }
 
 const Protocol* Protocols::firstProtocol()