Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 3e5bf9450..be9efe5b9 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -381,7 +381,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
         // [that's not the case when kontact was already running, but korganizer not loaded into it...]
         static const char* const dcopObjectId = "KOrganizerIface";
         TQCString dummy;
-        if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+        if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
           DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
           if ( switchTo ) {
             ref.call( "newInstance()" ); // activate korganizer window
@@ -390,7 +390,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
           DCOPReply reply = ref.call( "load()" );
           if ( reply.isValid() && (bool)reply ) {
             kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-            Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+            Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
           } else
             kdWarning() << "Error loading " << dcopService << endl;
         }
@@ -671,13 +671,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     {
       ensureKorganizerRunning( true );
       // raise korganizer part in kontact or the korganizer app
-      kapp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() );
+      tdeApp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() );
       TQByteArray arg;
       TQDataStream s( arg, IO_WriteOnly );
       s << TQString( "kontact_korganizerplugin" );
-      kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
+      tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
 
-      KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
+      KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" );
       iface->showEventView();
       iface->showDate( date );
       delete iface;
@@ -823,7 +823,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
             summary = i18n( "Re: %1" ).arg( summary );
           }
 
-          TDEApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
+          tdeApp->invokeMailer( incidence->organizer().email(), summary );
           //fall through
         case KMessageBox::Yes: // means "do not send"
           if ( saveFile( "Receiver Not Searched", iCal, TQString( "reply" ) ) ) {
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 3856c1e38..215c83c8d 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -71,7 +71,7 @@ namespace {
   public:
     Formatter() {
       // disabled pending resolution of how to share static objects when dlopening libraries
-      //mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+      //mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
     }
 
     Result format( BodyPart *bodyPart, KMail::HtmlWriter *writer, KMail::Callback & ) const {