1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/main.cpp b/kmail/main.cpp
index bb3e0a8a..24de19cd 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
@@ -19,7 +19,7 @@
  */
 #include <config.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdeglobal.h>
 #include <knotifyclient.h>
 #include <dcopclient.h>
@@ -36,10 +36,10 @@
 
 //-----------------------------------------------------------------------------
 
-class KMailApplication : public KUniqueApplication
+class KMailApplication : public TDEUniqueApplication
 {
 public:
-  KMailApplication() : KUniqueApplication() { };
+  KMailApplication() : TDEUniqueApplication() { };
   virtual int newInstance();
   void commitData(TQSessionManager& sm);
 
@@ -58,15 +58,15 @@ int KMailApplication::newInstance()
   if (!kmkernel)
      return 0;
 
-  if (!kmkernel->firstInstance() || !kapp->isRestored())
+  if (!kmkernel->firstInstance() || !tdeApp->isRestored())
     kmkernel->handleCommandLine( true );
-  kmkernel->setFirstInstance(FALSE);
+  kmkernel->setFirstInstance(false);
   return 0;
 }
 
 int main(int argc, char *argv[])
 {
-  // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging
+  // WABA: KMail is a TDEUniqueApplication. Unfortunately this makes debugging
   // a bit harder: You should pass --nofork as commandline argument when using
   // a debugger. In gdb you can do this by typing "set args --nofork" before
   // typing "run".
@@ -87,14 +87,14 @@ int main(int argc, char *argv[])
   // using KMail without KDE)
   KNotifyClient::startDaemon();
 
-  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
+  tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet
 
   KMail::lockOrDie();
 
   //local, do the init
   KMKernel kmailKernel;
   kmailKernel.init();
-  kapp->dcopClient()->setDefaultObject( kmailKernel.objId() );
+  tdeApp->dcopClient()->setDefaultObject( kmailKernel.objId() );
 
   // and session management
   kmailKernel.doSessionManagement();
@@ -104,10 +104,10 @@ int main(int argc, char *argv[])
 
   kmsetSignalHandler(kmsignalHandler);
 
-  kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
+  tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
   kmailKernel.setStartingUp( false ); // Starting up is finished
   // Go!
-  int ret = kapp->exec();
+  int ret = tdeApp->exec();
   // clean up
   kmailKernel.cleanup();