diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 (patch) | |
tree | 36613dfe2f86f8ccb96a30f3880507341228eeb0 /kabc/plugins | |
parent | 1e9fe867b0def399c63c42f35e83c3575e91ff83 (diff) | |
download | tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.tar.gz tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kabc/plugins')
-rw-r--r-- | kabc/plugins/dir/resourcedirconfig.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefileconfig.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/resourceldapkio.cpp | 42 | ||||
-rw-r--r-- | kabc/plugins/ldapkio/resourceldapkioconfig.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/net/resourcenetconfig.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/sql/resourcesql.cpp | 4 |
6 files changed, 27 insertions, 27 deletions
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp index 41774b593..819d75d96 100644 --- a/kabc/plugins/dir/resourcedirconfig.cpp +++ b/kabc/plugins/dir/resourcedirconfig.cpp @@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res ) return; } - mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) ); + mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mFileNameEdit->setURL( resource->path() ); if ( mFileNameEdit->url().isEmpty() ) diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp index 51cfdcfcf..92b07594f 100644 --- a/kabc/plugins/file/resourcefileconfig.cpp +++ b/kabc/plugins/file/resourcefileconfig.cpp @@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res ) return; } - mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) ); + mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mFileNameEdit->setURL( resource->fileName() ); if ( mFileNameEdit->url().isEmpty() ) diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index 893a4a90f..0385f541c 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -330,49 +330,49 @@ void ResourceLDAPKIO::init() handle them in the load() method below. These are the default values */ - if ( !mAttributes.tqcontains("objectClass") ) + if ( !mAttributes.contains("objectClass") ) mAttributes.insert( "objectClass", "inetOrgPerson" ); - if ( !mAttributes.tqcontains("commonName") ) + if ( !mAttributes.contains("commonName") ) mAttributes.insert( "commonName", "cn" ); - if ( !mAttributes.tqcontains("formattedName") ) + if ( !mAttributes.contains("formattedName") ) mAttributes.insert( "formattedName", "displayName" ); - if ( !mAttributes.tqcontains("familyName") ) + if ( !mAttributes.contains("familyName") ) mAttributes.insert( "familyName", "sn" ); - if ( !mAttributes.tqcontains("givenName") ) + if ( !mAttributes.contains("givenName") ) mAttributes.insert( "givenName", "givenName" ); - if ( !mAttributes.tqcontains("mail") ) + if ( !mAttributes.contains("mail") ) mAttributes.insert( "mail", "mail" ); - if ( !mAttributes.tqcontains("mailAlias") ) + if ( !mAttributes.contains("mailAlias") ) mAttributes.insert( "mailAlias", "" ); - if ( !mAttributes.tqcontains("phoneNumber") ) + if ( !mAttributes.contains("phoneNumber") ) mAttributes.insert( "phoneNumber", "homePhone" ); - if ( !mAttributes.tqcontains("telephoneNumber") ) + if ( !mAttributes.contains("telephoneNumber") ) mAttributes.insert( "telephoneNumber", "telephoneNumber" ); - if ( !mAttributes.tqcontains("facsimileTelephoneNumber") ) + if ( !mAttributes.contains("facsimileTelephoneNumber") ) mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" ); - if ( !mAttributes.tqcontains("mobile") ) + if ( !mAttributes.contains("mobile") ) mAttributes.insert( "mobile", "mobile" ); - if ( !mAttributes.tqcontains("pager") ) + if ( !mAttributes.contains("pager") ) mAttributes.insert( "pager", "pager" ); - if ( !mAttributes.tqcontains("description") ) + if ( !mAttributes.contains("description") ) mAttributes.insert( "description", "description" ); - if ( !mAttributes.tqcontains("title") ) + if ( !mAttributes.contains("title") ) mAttributes.insert( "title", "title" ); - if ( !mAttributes.tqcontains("street") ) + if ( !mAttributes.contains("street") ) mAttributes.insert( "street", "street" ); - if ( !mAttributes.tqcontains("state") ) + if ( !mAttributes.contains("state") ) mAttributes.insert( "state", "st" ); - if ( !mAttributes.tqcontains("city") ) + if ( !mAttributes.contains("city") ) mAttributes.insert( "city", "l" ); - if ( !mAttributes.tqcontains("organization") ) + if ( !mAttributes.contains("organization") ) mAttributes.insert( "organization", "o" ); - if ( !mAttributes.tqcontains("postalcode") ) + if ( !mAttributes.contains("postalcode") ) mAttributes.insert( "postalcode", "postalCode" ); - if ( !mAttributes.tqcontains("uid") ) + if ( !mAttributes.contains("uid") ) mAttributes.insert( "uid", "uid" ); - if ( !mAttributes.tqcontains("jpegPhoto") ) + if ( !mAttributes.contains("jpegPhoto") ) mAttributes.insert( "jpegPhoto", "jpegPhoto" ); d->mLDAPUrl = KURL(); diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index c23bd22da..271328525 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes, for ( i = 1; i < mMapCombo->count(); i++ ) { TQDictIterator<KLineEdit> it2( mLineEditDict ); for ( ; it2.current(); ++it2 ) { - if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) { + if ( mMapList[ i ].contains( it2.currentKey() ) ) { if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break; } else { if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break; diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/kabc/plugins/net/resourcenetconfig.cpp index 325d99377..b441fbd98 100644 --- a/kabc/plugins/net/resourcenetconfig.cpp +++ b/kabc/plugins/net/resourcenetconfig.cpp @@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res ) return; } - mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) ); + mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mUrlEdit->setURL( resource->url().url() ); } diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp index 7dae03d22..55f02bae7 100644 --- a/kabc/plugins/sql/resourcesql.cpp +++ b/kabc/plugins/sql/resourcesql.cpp @@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * ) TQStringList list = (*it).customs(); TQStringList::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { - int dashPos = (*it).tqfind( '-' ); - int colonPos = (*it).tqfind( ':' ); + int dashPos = (*it).find( '-' ); + int colonPos = (*it).find( ':' ); TQString app = (*it).left( dashPos ); TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 ); TQString value = (*it).right( (*it).length() - colonPos - 1 ); |