diff options
Diffstat (limited to 'tderesources/kolab/shared')
| -rw-r--r-- | tderesources/kolab/shared/kmailconnection.cpp | 16 | ||||
| -rw-r--r-- | tderesources/kolab/shared/resourcekolabbase.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 8011c15d..24d9c25e 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -55,14 +55,14 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource, mDCOPClient->attach(); mDCOPClient->registerAs( objId, true ); - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; mKMailIcalIfaceStub = 0; delete mDCOPClient; @@ -78,13 +78,13 @@ bool KMailConnection::connectToKMail() // if we are kmail (and probably kontact as well) ourselves, don't try to start us again // this prevents a DCOP deadlock when launching the kmail while kontact is the IMAP backend // provider (and probably vice versa) - if ( kapp->instanceName() == "kmail" ) { + if ( tdeApp->instanceName() == "kmail" ) { // someone, probably ourselves, already offers the interface, if not stop here - const QCStringList services = kapp->dcopClient()->registeredApplications(); + const QCStringList services = tdeApp->dcopClient()->registeredApplications(); for ( uint i = 0; i < services.count(); ++i ) { if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway? continue; - const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] ); + const QCStringList objs = tdeApp->dcopClient()->remoteObjects( services[i] ); if ( objs.contains( dcopObjectId ) ) { dcopService = services[i]; break; @@ -107,7 +107,7 @@ bool KMailConnection::connectToKMail() } } - mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(), + mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(), dcopService, dcopObjectId ); // Attach to the KMail signals diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index ce53bad3..600c1393 100644 --- a/tderesources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -37,7 +37,7 @@ #include <folderselectdialog.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinputdialog.h> #include <kurl.h> #include <tdetempfile.h> |