diff options
Diffstat (limited to 'libkpimidentities/identitymanager.cpp')
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 354145021..a087974d8 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -156,9 +156,9 @@ void IdentityManager::commit() // The emitter is always set to KPIM::IdentityManager, so that the connect works // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal TQByteArray data; TQDataStream arg( data, IO_WriteOnly ); - arg << kapp->dcopClient()->appId(); + arg << tdeApp->dcopClient()->appId(); arg << DCOPObject::objId(); // the real objId, for checking in slotIdentitiesChanged - kapp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data ); } void IdentityManager::rollback() @@ -487,7 +487,7 @@ int IdentityManager::newUoid() // default identity do { - uoid = kapp->random(); + uoid = tdeApp->random(); } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() ); return uoid; @@ -506,7 +506,7 @@ void KPIM::IdentityManager::slotIdentitiesChanged( TQCString appId, TQCString ob { // From standalone kmail to standalone korganizer, the appId will differ // From kontact the appId will match, so we need to test the objId - if ( kapp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) { + if ( tdeApp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) { mConfig->reparseConfiguration(); Q_ASSERT( !hasPendingChanges() ); readConfig( mConfig ); |