6 files changed, 14 insertions, 14 deletions
diff --git a/kinit/README b/kinit/README
index 97ce088cc..644efbaf6 100644
--- a/kinit/README
+++ b/kinit/README
@@ -33,7 +33,7 @@ Starting an application linked against libqt, libtdecore and libtdeui
 in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. 
 Starting the same application via tdeinit takes less than 10ms.
 
-(application without KApplication constructor, the KApplication 
+(application without TDEApplication constructor, the TDEApplication 
 constructor requires an extra 100ms in both cases)
 
 Memory Usage
@@ -43,16 +43,16 @@ An application linked against libqt, libtdecore and libtdeui started
 in the conventional way requires about 498Kb memory. 
 (average of 10 instances) If the same application is started via
 tdeinit it requires about 142Kb. A difference of 356Kb (application 
-without KApplication constructor) 
+without TDEApplication constructor) 
 
-If we take the KApplication constructor into account, an application
+If we take the TDEApplication constructor into account, an application
 started in the conventional way takes about 679Kb memory while the same
 application started via tdeinit requires about 380Kb. Here the difference
 is somewhat less, 299Kb. This seems to be caused by the fact that the
 dynamic linker does "lazy linking". We can force the linker to link
 everything at startup by specifying "LD_BIND_NOW=true". When tdeinit is
 started with this option on, tdeinit is back to its full efficiency, an
-application with a KApplication constructor now uses 338Kb of memory.
+application with a TDEApplication constructor now uses 338Kb of memory.
 A difference of 341Kb with the normal case.
 
 Adapting programs to use tdeinit.
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 11fed9c34..478331fd8 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -1764,7 +1764,7 @@ int main(int argc, char **argv, char **envp)
    // don't change envvars before tdeinit_initsetproctitle()
    unsetenv("LD_BIND_NOW");
    unsetenv("DYLD_BIND_AT_LAUNCH");
-   KApplication::loadedByKdeinit = true;
+   TDEApplication::loadedByKdeinit = true;
 
    d.maxname = strlen(argv[0]);
    d.launcher_pid = 0;
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 2d706e36b..15a0882fe 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -163,8 +163,8 @@ IdleSlave::age(time_t now)
 }
 
 KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
-//  : KApplication( false, false ), // No Styles, No GUI
-  : KApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
+//  : TDEApplication( false, false ), // No Styles, No GUI
+  : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
     DCOPObject("klauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )
diff --git a/kinit/klauncher.h b/kinit/klauncher.h
index 763d20e53..8058bb31e 100644
--- a/kinit/klauncher.h
+++ b/kinit/klauncher.h
@@ -105,7 +105,7 @@ struct serviceResult
   pid_t pid;
 };
 
-class KLauncher : public KApplication, public DCOPObject
+class KLauncher : public TDEApplication, public DCOPObject
 {
    Q_OBJECT
 
diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp
index b53b06be0..f22da9386 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/klauncher_main.cpp
@@ -60,7 +60,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
       return 1;
    }
 
-   TQCString cname = KApplication::launcher();
+   TQCString cname = TDEApplication::launcher();
    char *name = cname.data();
    TDECmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
                        "v1.0");
@@ -79,7 +79,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
    int maxTry = 3;
    while(true)
    {
-      TQCString dcopName = KApplication::dcopClient()->registerAs(name, false);
+      TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false);
       if (dcopName.isEmpty())
       {
          kdWarning() << "[klauncher] DCOP communication problem!" << endl;
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp
index f246e7086..3293c07be 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/klaunchertest.cpp
@@ -28,9 +28,9 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication::tdeinitExec("konsole");
+   TDEApplication::tdeinitExec("konsole");
 
-   KApplication k(argc, argv, "klaunchertest");
+   TDEApplication k(argc, argv, "klaunchertest");
  
    kapp->dcopClient()->registerAs( kapp->name()) ;
 
@@ -38,13 +38,13 @@ int main(int argc, char *argv[])
    TQString error;
    TQCString dcopService;
    int pid;
-   int result = KApplication::startServiceByDesktopName(
+   int result = TDEApplication::startServiceByDesktopName(
 		TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
 
-   result = KApplication::startServiceByDesktopName(
+   result = TDEApplication::startServiceByDesktopName(
 		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",