summaryrefslogtreecommitdiffstats
path: root/libkpimidentities
diff options
context:
space:
mode:
Diffstat (limited to 'libkpimidentities')
-rw-r--r--libkpimidentities/identity.cpp4
-rw-r--r--libkpimidentities/identitycombo.cpp6
-rw-r--r--libkpimidentities/identitymanager.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index 1305a2603..a9b63b857 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -146,7 +146,7 @@ TQString Signature::withSeparator( bool * ok ) const
if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
// already have signature separator at start of sig:
return TQString::tqfromLatin1("\n") += signature;
- else if ( signature.tqfind( TQString::tqfromLatin1("\n-- \n") ) != -1 )
+ else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
// already have signature separator inside sig; don't prepend '\n'
// to improve abusing signatures as templates:
return signature;
@@ -531,7 +531,7 @@ TQString Identity::fullEmailAddr(void) const
// add DTQUOTE's if necessary:
bool needsQuotes=false;
for (unsigned int i=0; i < mFullName.length(); i++) {
- if ( specials.tqcontains( mFullName[i] ) )
+ if ( specials.contains( mFullName[i] ) )
needsQuotes = true;
else if ( mFullName[i] == '\\' || mFullName[i] == '"' ) {
needsQuotes = true;
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index a33c98466..636483c74 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -66,7 +66,7 @@ void IdentityCombo::setCurrentIdentity( const Identity & identity ) {
}
void IdentityCombo::setCurrentIdentity( const TQString & name ) {
- int idx = mIdentityManager->identities().tqfindIndex( name );
+ int idx = mIdentityManager->identities().findIndex( name );
if ( idx < 0 ) return;
if ( idx == currentItem() ) return;
@@ -78,7 +78,7 @@ void IdentityCombo::setCurrentIdentity( const TQString & name ) {
}
void IdentityCombo::setCurrentIdentity( uint uoid ) {
- int idx = mUoidList.tqfindIndex( uoid );
+ int idx = mUoidList.findIndex( uoid );
if ( idx < 0 ) return;
if ( idx == currentItem() ) return;
@@ -109,7 +109,7 @@ void IdentityCombo::slotIdentityManagerChanged() {
uint oldIdentity = mUoidList[ currentItem() ];
reloadUoidList();
- int idx = mUoidList.tqfindIndex( oldIdentity );
+ int idx = mUoidList.findIndex( oldIdentity );
blockSignals( true );
reloadCombo();
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 4cc53e816..8d1fa8449 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -117,7 +117,7 @@ void IdentityManager::commit()
// find added and changed identities:
for ( TQValueList<Identity>::ConstIterator it = mShadowIdentities.begin() ;
it != mShadowIdentities.end() ; ++it ) {
- TQValueList<uint>::Iterator uoid = seenUOIDs.tqfind( (*it).uoid() );
+ TQValueList<uint>::Iterator uoid = seenUOIDs.find( (*it).uoid() );
if ( uoid != seenUOIDs.end() ) {
const Identity & orig = identityForUoid( *uoid ); // look it up in mIdentities
if ( *it != orig ) {
@@ -351,7 +351,7 @@ const Identity & IdentityManager::defaultIdentity() const {
bool IdentityManager::setAsDefault( const TQString & name ) {
// First, check if the identity actually exists:
TQStringList names = shadowIdentities();
- if ( names.tqfind( name ) == names.end() ) return false;
+ if ( names.find( name ) == names.end() ) return false;
// Then, change the default as requested:
for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
(*it).setIsDefault( (*it).identityName() == name );
@@ -488,7 +488,7 @@ int IdentityManager::newUoid()
do {
uoid = kapp->random();
- } while ( usedUOIDs.tqfind( uoid ) != usedUOIDs.end() );
+ } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() );
return uoid;
}