diff options
Diffstat (limited to 'libkpimidentities/identitymanager.cpp')
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 939cb7042..dd8479d85 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -66,8 +66,8 @@ static TQCString newDCOPObjectName() return name; } -IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char * name ) - : ConfigManager( parent, name ), DCOPObject( newDCOPObjectName() ) +IdentityManager::IdentityManager( bool readonly, TQObject * tqparent, const char * name ) + : ConfigManager( tqparent, name ), DCOPObject( newDCOPObjectName() ) { mReadOnly = readonly; mConfig = new KConfig( "emailidentities", readonly ); @@ -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.find( (*it).uoid() ); + TQValueList<uint>::Iterator uoid = seenUOIDs.tqfind( (*it).uoid() ); if ( uoid != seenUOIDs.end() ) { const Identity & orig = identityForUoid( *uoid ); // look it up in mIdentities if ( *it != orig ) { @@ -326,7 +326,7 @@ Identity & IdentityManager::modifyIdentityForName( const TQString & name ) { for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it ) if ( (*it).identityName() == name ) return (*it); - kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() tqreplacement!" + kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() replacement!" << "\n name == \"" << name << "\"" << endl; return newFromScratch( name ); } @@ -335,7 +335,7 @@ Identity & IdentityManager::modifyIdentityForUoid( uint uoid ) { for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it ) if ( (*it).uoid() == uoid ) return (*it); - kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() tqreplacement!" + kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() replacement!" << "\n uoid == \"" << uoid << "\"" << endl; return newFromScratch( i18n("Unnamed") ); } @@ -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.find( name ) == names.end() ) return false; + if ( names.tqfind( name ) == names.end() ) return false; // Then, change the default as requested: for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it ) (*it).setIsDefault( (*it).identityName() == name ); @@ -448,7 +448,7 @@ void IdentityManager::createDefaultIdentity() { emailAddress += '@' + defaultdomain; } else { - emailAddress = TQString::null; + emailAddress = TQString(); } } } @@ -488,7 +488,7 @@ int IdentityManager::newUoid() do { uoid = kapp->random(); - } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() ); + } while ( usedUOIDs.tqfind( uoid ) != usedUOIDs.end() ); return uoid; } |