From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- wizards/groupwisewizard.cpp | 4 ++-- wizards/kmailchanges.cpp | 6 +++--- wizards/kolabkmailchanges.cpp | 2 +- wizards/kolabwizard.cpp | 6 +++--- wizards/servertypemanager.cpp | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'wizards') diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 52b6c1af2..47126b0ad 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -406,8 +406,8 @@ void GroupwiseWizard::slotAboutToShowPage( TQWidget *page ) if ( page == mEmailPage ) { if ( mEmailEdit->text().isEmpty() ) { TQString host = GroupwiseConfig::host(); - int pos = host.tqfindRev( "." ); - if ( pos > 0 ) pos = host.tqfindRev( ".", pos - 1 ); + int pos = host.findRev( "." ); + if ( pos > 0 ) pos = host.findRev( ".", pos - 1 ); if ( pos > 0 ) host = host.mid( pos + 1 ); TQString email = GroupwiseConfig::user() + "@" + host; mEmailEdit->setText( email ); diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 86fd05b3f..d5a9fc8c2 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -280,16 +280,16 @@ void CreateDisconnectedImapAccount::apply() es.setSetting( KEMailSettings::EmailAddress, mEmail ); KPIM::IdentityManager identityManager; - if ( !identityManager.allEmails().tqcontains( mEmail ) ) { + if ( !identityManager.allEmails().contains( mEmail ) ) { // Not sure how to name the identity. First one is "Default", next one mAccountName, but then... // let's use the server name after that. TQString accountName = mAccountName; const TQStringList identities = identityManager.identities(); - if ( identities.tqfind( accountName ) != identities.end() ) { + if ( identities.find( accountName ) != identities.end() ) { accountName = mServer; int i = 2; // And if there's already one, number them - while ( identities.tqfind( accountName ) != identities.end() ) { + while ( identities.find( accountName ) != identities.end() ) { accountName = mServer + " " + TQString::number( i++ ); } } diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index a38c7fd7b..a0eef1fa9 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -108,7 +108,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes ) TQString defaultDomain = KolabConfig::self()->server(); const TQString server = KolabConfig::self()->server(); TQString user = KolabConfig::self()->user(); - int pos = user.tqfind( "@" ); + int pos = user.find( "@" ); // with kolab the userid _is_ the full email if ( pos > 0 ) { // The user typed in a full email address. Assume it's correct diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 6aad529e5..651336a85 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -59,7 +59,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change // If the user gave a full email address, the domain name // of that overrides the server name for the ldap dn const TQString user = KolabConfig::self()->user(); - int pos = user.tqfind( "@" ); + int pos = user.find( "@" ); if ( pos > 0 ) { const TQString h = user.mid( pos+1 ); if ( !h.isEmpty() ) @@ -72,7 +72,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change c.writeEntry( "Default domain", basedn ); } - basedn.tqreplace(".",",dc="); + basedn.replace(".",",dc="); basedn.prepend("dc="); // Set the changes @@ -181,7 +181,7 @@ class KolabPropagator : public KConfigPropagator TQString user = KolabConfig::self()->user(); // We now use the full email address in the freebusy URL - //int pos = user.tqfind( "@" ); + //int pos = user.find( "@" ); //if ( pos > 0 ) user = user.left( pos ); KURL publishURL = freeBusyBaseUrl; diff --git a/wizards/servertypemanager.cpp b/wizards/servertypemanager.cpp index d7c9287f7..fec5bd120 100644 --- a/wizards/servertypemanager.cpp +++ b/wizards/servertypemanager.cpp @@ -54,7 +54,7 @@ TQStringList ServerTypeManager::identifiers() const TQString ServerTypeManager::title( const TQString& identifier ) const { - ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.tqfind( identifier ); + ServerTypeFactoryMap::ConstIterator it = mServerTypeFactoryMap.find( identifier ); if ( it == mServerTypeFactoryMap.end() ) return TQString(); else @@ -63,9 +63,9 @@ TQString ServerTypeManager::title( const TQString& identifier ) const ServerType* ServerTypeManager::serverType( const TQString& identifier ) { - ServerTypeMap::ConstIterator serverIt = mServerTypeMap.tqfind( identifier ); + ServerTypeMap::ConstIterator serverIt = mServerTypeMap.find( identifier ); if ( serverIt == mServerTypeMap.end() ) { // none server type loaded yet - ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.tqfind( identifier ); + ServerTypeFactoryMap::Iterator it = mServerTypeFactoryMap.find( identifier ); if ( it == mServerTypeFactoryMap.end() ) // no factory for this type return 0; -- cgit v1.2.1