1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index c1eb6ccb..7fd0ba4f 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -24,11 +24,11 @@
 #include "kcursorsaver.h"
 
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <dcopclient.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
@@ -137,19 +137,19 @@ void checkConfigUpdates() {
 
 void lockOrDie() {
 // Check and create a lock file to prevent concurrent access to kmail files
-  TQString appName = kapp->instanceName();
+  TQString appName = tdeApp->instanceName();
   if ( appName.isEmpty() )
     appName = "kmail";
 
   TQString programName;
-  const TDEAboutData *about = kapp->aboutData();
+  const TDEAboutData *about = tdeApp->aboutData();
   if ( about )
     programName = about->programName();
   if ( programName.isEmpty() )
     programName = i18n("KMail");
 
   TQString lockLocation = locateLocal("data", "kmail/lock");
-  KSimpleConfig config(lockLocation);
+  TDESimpleConfig config(lockLocation);
   int oldPid = config.readNumEntry("pid", -1);
   const TQString oldHostName = config.readEntry("hostname");
   const TQString oldAppName = config.readEntry( "appName", appName );
@@ -193,7 +193,7 @@ void lockOrDie() {
     if ( oldHostName == hostName ) {
       // this can only happen if the user is running this application on
       // different displays on the same machine. All other cases will be
-      // taken care of by KUniqueApplication()
+      // taken care of by TDEUniqueApplication()
       if ( oldAppName == appName )
         msg = i18n("%1 already seems to be running on another display on "
                    "this machine. Running %2 more than once "
@@ -262,7 +262,7 @@ void insertLibraryCataloguesAndIcons() {
 void cleanup()
 {
   const TQString lockLocation = locateLocal("data", "kmail/lock");
-  KSimpleConfig config(lockLocation);
+  TDESimpleConfig config(lockLocation);
   config.writeEntry("pid", -1);
   config.sync();
 }