Rename KApplication to TDEApplication to avoid conflicts with KDE4

309 files changed, 734 insertions, 734 deletions

diff --git a/DEBUG b/DEBUG
index c5df1299b..4bcf3ce7b 100644
--- a/DEBUG
+++ b/DEBUG
@@ -68,7 +68,7 @@ Current language:  auto; currently c++
 (gdb)  
 
 You can now set breakpoints everywhere. For example lets set a breakpoint 
-in the KApplication constructor. Unfortunately gdb is not very good in 
+in the TDEApplication constructor. Unfortunately gdb is not very good in 
 handling C++ names, so it is not really possible to specify the constructor
 directly after the break command. Instead we look up a line of source
 code where we want to place the breakpoint. An external editor is of great 
@@ -79,11 +79,11 @@ are interested in and verify that we have found the correct source line:
 215         parseCommandLine( argc, argv );
 216     }
 217
-218     KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
+218     TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
 219       QApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
 220                     GUIenabled ),
 221       KInstance( KCmdLineArgs::about),
-222       d (new KApplicationPrivate)
+222       d (new TDEApplicationPrivate)
 223     {
 224         if (!GUIenabled)
 (gdb) break 224
@@ -92,14 +92,14 @@ Breakpoint 2 at 0x4048aa7e: file kapp.cpp, line 224.
 
 We can now continue the execution of kedit. Execution will stop when it hits
 a breakpoint of when the program exits. In this case execution will stop
-in the first line of the KApplication constructor:
+in the first line of the TDEApplication constructor:
 
 (gdb) continue
 Continuing.
 Qt: gdb: -nograb added to command-line options.
          Use the -dograb option to enforce grabbing.
  
-Breakpoint 2, KApplication::KApplication (this=0xbffff6a8, allowStyles=true,
+Breakpoint 2, TDEApplication::TDEApplication (this=0xbffff6a8, allowStyles=true,
     GUIenabled=true) at kapp.cpp:224
 224         if (!GUIenabled)
 (gdb) 
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 2a9b9766f..a8580e3f5 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -19,7 +19,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
 <LI><A HREF="#general">Global changes</A></LI>
 <LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
-<LI><A HREF="#KApplication">KApplication</A></LI>
+<LI><A HREF="#TDEApplication">TDEApplication</A></LI>
 <LI><A HREF="#TDECmdLineArgs">TDECmdLineArgs</A></LI>
 <LI><A HREF="#KLocale">KLocale</A></LI>
 <LI><A HREF="#KGlobal">KGlobal: access to KDE global objects.</A></LI>
@@ -107,7 +107,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KApplication">KApplication</A></H3>
+<H3><A NAME="TDEApplication">TDEApplication</A></H3>
 
   doesn't hold any longer a KLocale instance. With this getLocale()
   and isLocaleInstantiated are now replaced by KGlobal::locale()<P>
@@ -128,7 +128,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   KGlobal::dirs()-&gt;findResource.<P>
 
   Use locateLocal to get the path of a writable file. For instance,
-  KApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
+  TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
   but for most cases, simply using KGlobal::config() is enough, if you're happy
   with saving the application's configuration into appnamerc, or
   KSimpleConfig cfg("anothercfgfile") to create a config file with another name.<P>
@@ -146,8 +146,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   appHelpActivated() have all been removed See section for KMainWindow
   for more info.<P>
 
-  The KApplication constructor has changed. Command line arguments and
-  program name should no longer be passed to KApplication but to 
+  The TDEApplication constructor has changed. Command line arguments and
+  program name should no longer be passed to TDEApplication but to 
   TDECmdLineArgs. TDECmdLineArgs performs command line parsing and a command
   line help. See below for more info.<P>
 
@@ -166,7 +166,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   </UL>
  
   TDECmdLineArgs itself will add the command line options supported by Qt 
-  and KApplication.<P>
+  and TDEApplication.<P>
 
   You can also use the KAboutData class to specify name, description and 
   version.<P>
@@ -183,7 +183,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
   i18n is no longer a macro<P>
 
-  KApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
+  TDEApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
 
   but a function on its own. klocale is obsolete and replace every call
   to klocale-&gt;translate with i18n.<P>
@@ -199,7 +199,7 @@ KGlobal allows centralized access to KDE global objects without including
 extraneous headers. object creation is deferred if possible.<P>
 
 All methods are static and headers for returned types are not included. You
-must have created a KApplication object before the methods can be used.<P>
+must have created a TDEApplication object before the methods can be used.<P>
 <TABLE BORDER="0">
 <TR>
   <TD COLSPAN="2">
@@ -271,7 +271,7 @@ mainViewGeometry() instead.<P>
 
 <H3><A NAME="KHelpMenu">KHelpMenu</A></H3>
 
-helpMenu() has been moved to KMainWindow from KApplication (kapp).<P>
+helpMenu() has been moved to KMainWindow from TDEApplication (kapp).<P>
 
 Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
 are now modeless. "About KDE" is a completely new widget.<P>
@@ -281,7 +281,7 @@ If you used in the toplevel window (that is derived from KMainWindow)
 you must now change this to "helpMenu( TQString )". The TQString defaults
 to TQString::null so it is sufficient to write helpMenu().<P>
 
-The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
+The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
 have all been removed. If you need direct access to these or need
 access to a help menu in a class that is not derived from
 KMainWindow then allocate an instance of the new class KHelpMenu.
@@ -792,7 +792,7 @@ Matthias Hoelzer-Kluepfel &lt;<A HREF="mailto:hoelzer@kde.org">hoelzer@kde.org</
 The KWMModuleApplication has been removed. Instead, use the class
 KWinModule in libtdecore. The API is a bit cleaner but very similar,
 so you will feel comfortable immediately. One of the advantages of
-KWinModule is that it doesn't require a special KApplication
+KWinModule is that it doesn't require a special TDEApplication
 subclass. This lead to many problems and misunderstandings in the
 past. KWinModule is now just an object that emits fancy signals (and
 provides some useful lists, like the list of all managed windows).
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index eb17c6fc6..f3a3f0256 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -95,7 +95,7 @@ DCOPClient you do not need to change anything.
 <p>
 It is no longer possible to make calls to an application registered as
 "<appid>-<pid>" with "<appid>" only. The full name can be obtained by using
-either KApplication::startServiceBy...() or DCOPClient::findObject() or 
+either TDEApplication::startServiceBy...() or DCOPClient::findObject() or 
 their command line equivalents "dcopstart" and "dcopfind".
 
 <H4>KLibFactory</H4>
diff --git a/TODO b/TODO
index 9220d264b..dff44b8f0 100644
--- a/TODO
+++ b/TODO
@@ -11,8 +11,8 @@ that we would like to make for the next binary incompatible release.
   help prevent mistakes where developers forget to delete the pointer. Maybe make use of
   Qt4 helper macros? 
 
-- Move all utility functions away from KApplication. TBD: Make KApplication 
-  a very thin wrapper around QApplication. Ideally, KApplication should go 
+- Move all utility functions away from TDEApplication. TBD: Make TDEApplication 
+  a very thin wrapper around QApplication. Ideally, TDEApplication should go 
   away completely. The kapp pointer references everywhere must die. Find a 
   way to make that possible
 
@@ -95,7 +95,7 @@ that we would like to make for the next binary incompatible release.
   Keep source compatibility.
 
 - Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
-  function to KApplication; deref()ing the last reference should only quit the application
+  function to TDEApplication; deref()ing the last reference should only quit the application
   if reference counts are enabled, and the reference count should be disabled by default
   so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
   constructor call setRefCountEnabled(true), and make each KMainWindow hold its own
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index dfc1265cc..10778d6bf 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 							  
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDEApplication app;
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index 91d1d9db4..b27978f47 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
 							  
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDEApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
 	KIOInputStream stream;
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index 16465cb8d..f35f2a3e2 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 							  
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDEApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
 #ifndef USE_FILEINPUTSTREAM
diff --git a/arts/knotify/knotifytest.cpp b/arts/knotify/knotifytest.cpp
index 9ca10cb9d..232b1b8c7 100644
--- a/arts/knotify/knotifytest.cpp
+++ b/arts/knotify/knotifytest.cpp
@@ -5,7 +5,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication app(argc, argv, "knotifytest");
+  TDEApplication app(argc, argv, "knotifytest");
 
 //
   while (1) {
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 1df46ec05..410419302 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -60,7 +60,7 @@ int main(int argc, char **argv) {
 	KGlobal::locale()->setMainCatalogue("tdelibs");
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication app;
+	TDEApplication app;
 	
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	TQString msg;
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 071136a4f..5927f3716 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -74,18 +74,18 @@ compiler later.
 Establishing the Connection:
 ----------------------------
 
-KApplication has gained a method called "KApplication::dcopClient()"
+TDEApplication has gained a method called "TDEApplication::dcopClient()"
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, attach()
-will return false. KApplication will catch a dcop signal and display an
+will return false. TDEApplication will catch a dcop signal and display an
 appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -100,7 +100,7 @@ case:
  */
 appId = client->registerAs(kApp->name());
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
@@ -495,9 +495,9 @@ Code:
 
 int main(int argc, char **argv)
 {
-  KApplication *app;
+  TDEApplication *app;
 
-  app = new KApplication(argc, argv, "testit");
+  app = new TDEApplication(argc, argv, "testit");
   return app->exec();
 }
 
@@ -515,7 +515,7 @@ VmStk:        20 kB
 VmExe:         4 kB
 VmLib:      6588 kB
 
-If I create the KApplication's DCOPClient, and call attach() and
+If I create the TDEApplication's DCOPClient, and call attach() and
 registerAs(), it changes to this:
 
 VmSize:     8080 kB
@@ -531,8 +531,8 @@ resident, but no more data or stack.  So this will be shared between all
 processes, right?  100k to enable DCOP in all apps doesn't seem bad at
 all. :)
 
-OK now for some timings.  Just creating a KApplication and then exiting
-(i.e. removing the call to KApplication::exec) takes this much time:
+OK now for some timings.  Just creating a TDEApplication and then exiting
+(i.e. removing the call to TDEApplication::exec) takes this much time:
 
 0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k
 0inputs+0outputs (1084major+62minor)pagefaults 0swaps
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index a92fb4e50..423571280 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method.
 
 \section establish Establishing the Connection:
 
-KApplication has gained a method called \p KApplication::dcopClient()
+TDEApplication has gained a method called \p TDEApplication::dcopClient()
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 \p DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, 
-DCOPClient::attach() will return false. KApplication will catch a dcop 
+DCOPClient::attach() will return false. TDEApplication will catch a dcop 
 signal and display an appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -62,7 +62,7 @@ case:
 appId = client->registerAs(kapp->name());
 \endcode
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 66bd5088a..1ab43f730 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10
 
 int main(int argc, char **argv)
 {
-  TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false);
-  KApplication app(argc, argv, "testdcop");
+  TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false);
+  TDEApplication app(argc, argv, "testdcop");
 
   tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data());
   
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 7595cfc2b..8421c7b80 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -41,7 +41,7 @@ typedef TQValueList<TQCString> QCStringList;
  * for KDE applications.
  *
  * This class provides IPC and RPC for KDE applications.  Usually you
- * will not have to instantiate one yourself because KApplication
+ * will not have to instantiate one yourself because TDEApplication
  * contains a method to return a pointer to a DCOPClient object which
  * can be used for your whole application.
  *
@@ -62,7 +62,7 @@ typedef TQValueList<TQCString> QCStringList;
  *   client->send("someApp", "someObject", "someFunction(TQString)", data);
  * \endcode
  *
- * @see KApplication::dcopClient()
+ * @see TDEApplication::dcopClient()
  * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
  */
 class DCOP_EXPORT DCOPClient : public TQObject
@@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Returns the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @return the application's main dcop client
    */
   static DCOPClient* mainClient();
@@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Sets the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @param mainClient the new main dcop client
    */
   static void setMainClient( DCOPClient* mainClient);
@@ -772,7 +772,7 @@ signals:
    * synchronous call. In that case, it will enter a local event
    * loop to keep the GUI updated until finally an answer arrives.
    *
-   * In KDE, the KApplication object connects to this signal to be
+   * In KDE, the TDEApplication object connects to this signal to be
    * able to block any user input (i.e. mouse and key events) while
    * we are waiting for an answer. If we did not do this, the
    * application might end up in an illegal state, as a keyboard
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index d0f73aa4e..eb953f1d7 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
 	const char* appname = strdup( argv[ 1 ] );
 	argv[ 1 ] = 0; // sue me
 	TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDEApplication app;
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
 	Driver * object = new Driver( appname );
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index cd62a59c0..2be39f601 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
 		return 0;
 	}
 	TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDEApplication app;
 	if(!app.dcopClient()->attach(  ))
 		return 1;
 
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 8a24f11b6..2afadb769 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent)
 		d->m_domains+="local.";
 		d->m_browseLAN=true;
 	}
- 	connect(KApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
+ 	connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
  	        TQT_SLOT(domainListChanged(int,int)));
 }
 
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 21ad69d89..4780b169d 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -219,7 +219,7 @@
      client->attach();
      if (!client->isApplicationRegistered("kttsd")) {
          TQString error;
-         if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+         if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
              cout << "Starting KTTSD failed with message " << error << endl;
      }
    @endverbatim
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index 0b32eec8e..403bde0b5 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -35,7 +35,7 @@ int main( int argc, char** argv )
 {
     KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
     TDECmdLineArgs::init( argc, argv, about );
-    KApplication a;
+    TDEApplication a;
     Win* win = new Win();
     win->show();
     return a.exec();
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0787bcc4e..9ecf8eb2d 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -37,13 +37,13 @@ static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
 Address::Address() :
   mEmpty( true ), mType( 0 )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 Address::Address( int type ) :
   mEmpty( true ), mType( type )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 bool Address::operator==( const Address &a ) const
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 20d7305b8..417d62b8e 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -438,7 +438,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/key.cpp b/kabc/key.cpp
index 0d917595d..fadc89dce 100644
--- a/kabc/key.cpp
+++ b/kabc/key.cpp
@@ -28,7 +28,7 @@ using namespace KABC;
 Key::Key( const TQString &text, int type )
   : mTextData( text ), mIsBinary( false ), mType( type )
 {
-  mId = KApplication::randomString(8);
+  mId = TDEApplication::randomString(8);
 }
 
 Key::~Key()
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 31a99f9ea..0a58eeec2 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -45,7 +45,7 @@ PhoneNumber::~PhoneNumber()
 
 void PhoneNumber::init()
 {
-  mId = KApplication::randomString( 8 );
+  mId = TDEApplication::randomString( 8 );
 }
 
 void PhoneNumber::validateNumber( const TQString &number )
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index db956bc14..64e8f382a 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -105,7 +105,7 @@ void Addressee::detach()
     mData->empty = true;
     mData->changed = false;
     mData->resource = 0;
-    mData->uid = KApplication::randomString( 10 );
+    mData->uid = TDEApplication::randomString( 10 );
     return;
   } else if ( mData.count() == 1 ) return;
 
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index 110972b31..c5a1a602f 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -20,7 +20,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("bigread","BigReadKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
   AddressBook ab; 
    
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 6a5296f91..5d3d2bd6f 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -17,7 +17,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   AddressBook ab;
   ResourceFile r( "my.kabc", "vcard" );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index d0a0501b3..b1116b2ea 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -40,7 +40,7 @@ int main(int argc,char **argv)
 
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   TQString filename = StdAddressBook::fileName();
   
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index cc91d29b1..39536efbf 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -26,7 +26,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
   kdDebug() << "Creating a" << endl;
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index 99cd1f3ab..08d73b8db 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -23,7 +23,7 @@ int main(int /*argc*/,char /* **argv*/)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */
 
   kdDebug() << "Creating addressees" << endl;
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index 9f70a0eec..c9369d756 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -23,7 +23,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
 
   Address a;
   a.setStreet("Lummerlandstr. 1");
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index f74af6089..f46604dc5 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -14,7 +14,7 @@ int main( int argc,char **argv )
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   AddressLineEdit *lineEdit = new AddressLineEdit( 0 );
 
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index 1c5454630..2abedb9be 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -15,8 +15,8 @@ int main(int argc,char **argv)
   KAboutData aboutData("testdb","TestKabcDB","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-//  KApplication app( false, false );
-  KApplication app;
+//  TDEApplication app( false, false );
+  TDEApplication app;
 
   AddressBook ab;
   
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index 4323db30d..3f4b67e0a 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -26,7 +26,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("list")) {
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index 04a589eef..ee767e523 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -23,7 +23,7 @@ int main(int argc,char **argv)
     KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
 
-    KApplication app( false, false );
+    TDEApplication app( false, false );
     AddressBook *ab = StdAddressBook::self();
 
 #define READ
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index 322bb1ca9..b78fb4a5f 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -22,7 +22,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("multiple")) {
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index 456bb64e3..bb52afd1a 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -29,9 +29,9 @@
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
-  KApplication app;
+  TDEApplication app;
 
   TestLDAPClient test;
   test.setup();
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 5c52e98ee..31d053208 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -169,7 +169,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TQString identifier;
 
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index 082ca480d..8498fc6d0 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -11,7 +11,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
   
   kdDebug() << "Test Write VCard" << endl;
 
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index d3eada6c6..3fcbb851e 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -42,7 +42,7 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   KAboutData aboutData( "testread", "vCard test reader", "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
@@ -50,7 +50,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index d9d92e5aa..11c3c7852 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
 
   KABC::Addressee addressee;
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 3e54e19db..9797ec671 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -265,7 +265,7 @@
   * QPopupMenu for filelist
 
 2001-03-20 Christoph Cullmann <cullmann@kde.org>
-  * kate is now a normal KApplication
+  * kate is now a normal TDEApplication
 
 2001-03-18 Christoph Cullmann <cullmann@kde.org>
   * big location changes of source files
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index a5e295888..1978c867c 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
 //BEGIN KateSchemaManager
 TQString KateSchemaManager::normalSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
 }
 
 TQString KateSchemaManager::printingSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
 }
 
 KateSchemaManager::KateSchemaManager ()
@@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   hbHl = new TQHBox( this );
   layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
-  lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl );
+  lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( defaultSchemaCombo );
 
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index d93f81a86..7f916c6e9 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force
 
   if (m_cursorTimer.isActive ())
   {
-    if ( KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start( KApplication::cursorFlashTime() / 2 );
+    if ( TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 );
     m_view->renderer()->setDrawCaret(true);
   }
 
@@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout ()
 
 void KateViewInternal::focusInEvent (TQFocusEvent *)
 {
-  if (KApplication::cursorFlashTime() > 0)
-    m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+  if (TDEApplication::cursorFlashTime() > 0)
+    m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
   if (m_textHintEnabled)
     m_textHintTimer.start( m_textHintTimeout );
@@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e )
   if ( e->text().length() > 0 ) {
     m_doc->insertText( cursor.line(), cursor.col(), e->text() );
 
-    if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+    if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
     updateView( true );
     updateCursor( cursor, true );
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4292c3ad4..da3d96da9 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    KApplication a;
+    TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle("windows");
     KSimpleConfig cfg( "testkateregressionrc" );
diff --git a/kcmshell/main.h b/kcmshell/main.h
index 6a7c34ee7..f43cf98cb 100644
--- a/kcmshell/main.h
+++ b/kcmshell/main.h
@@ -28,9 +28,9 @@
 #include <kcmultidialog.h>
 
 /**
- * The KApplication instance for kcmshell.
+ * The TDEApplication instance for kcmshell.
  */
-class KCMShell : public KApplication
+class KCMShell : public TDEApplication
 {
     Q_OBJECT
 
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index ec5139d86..483578c72 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      setenv("TDEROOTHOME", "-", 1);
    }
 
-   KApplication::disableAutoDcopRegistration();
+   TDEApplication::disableAutoDcopRegistration();
 #ifdef KBUILDSYCOCA_GUI
-   KApplication k;
+   TDEApplication k;
 #else
-   KApplication k(false, false);
+   TDEApplication k(false, false);
 #endif
    k.disableSessionManagement();
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 81887a695..7148a1e6b 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -121,8 +121,8 @@ int main(int argc, char **argv)
    TDECmdLineArgs::init(argc, argv, &d);
    TDECmdLineArgs::addCmdLineOptions(options);
 
-//   KApplication k(false, false);
-   KApplication k(false);
+//   TDEApplication k(false, false);
+   TDEApplication k(false);
    k.disableSessionManagement();
 
    // this program is in tdelibs so it uses tdelibs as catalog
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
       args.append("--incremental");
       args.append("--checkstamps");
       TQString command = "kbuildsycoca";
-      TQCString _launcher = KApplication::launcher();
+      TQCString _launcher = TDEApplication::launcher();
       if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
       {
          tqWarning("Can't talk to klauncher!");
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 40e1983f7..538cfff09 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -73,19 +73,19 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
       TQByteArray data;
       TQDataStream dataStream( data, IO_WriteOnly );
       dataStream << TQString("kbuildsycoca") << args;
-      TQCString _launcher = KApplication::launcher();
+      TQCString _launcher = TDEApplication::launcher();
 
       kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
-      KApplication::tdeinitExecWait( "kbuildsycoca", args );
+      TDEApplication::tdeinitExecWait( "kbuildsycoca", args );
    }
 }
 
 static void runKonfUpdate()
 {
-   KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
+   TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
 }
 
 static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
    TQStringList args;
    args.append(TQFile::decodeName(oldName));
    args.append(TQFile::decodeName(newName));
-   KApplication::tdeinitExecWait( "kdontchangethehostname", args );
+   TDEApplication::tdeinitExecWait( "kdontchangethehostname", args );
 }
 
 Kded::Kded(bool checkUpdates, bool new_startup)
@@ -876,7 +876,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         "$Id$",
         I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));
 
-     KApplication::installSigpipeHandler();
+     TDEApplication::installSigpipeHandler();
 
      TDECmdLineArgs::init(argc, argv, &aboutData);
 
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 60c7ba8f5..0c1dd1b18 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -358,7 +358,7 @@ void KHostName::changeSessionManager()
       delete client;
       return;
    }
-   TQCString launcher = KApplication::launcher();
+   TQCString launcher = TDEApplication::launcher();
    client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params);
    delete client;
 }
diff --git a/kded/kmimelist.cpp b/kded/kmimelist.cpp
index fff626cac..c82f6d9f7 100644
--- a/kded/kmimelist.cpp
+++ b/kded/kmimelist.cpp
@@ -14,7 +14,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"blurb",false);
+   TDEApplication k(argc,argv,"blurb",false);
 
    KMimeType::List mtl = KMimeType::allMimeTypes( );
    assert( mtl.count() );
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index e2ee3ba57..457908943 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -155,7 +155,7 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
                                   "addCookies(TQString,TQCString,long int)", params))
     {
          // Maybe it wasn't running (e.g. we're opening local html files)
-         KApplication::startServiceByDesktopName( "kcookiejar");
+         TDEApplication::startServiceByDesktopName( "kcookiejar");
          if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
                                        "addCookies(TQString,TQCString,long int)", params))
              kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index adf28d563..b7ae2a8f4 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -83,7 +83,7 @@ HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit)
     m_doingsubmit = false;
     m_inreset = false;
     m_enctype = "application/x-www-form-urlencoded";
-    m_boundary = "----------" + KApplication::randomString( 42 + 13 );
+    m_boundary = "----------" + TDEApplication::randomString( 42 + 13 );
     m_acceptcharset = "UNKNOWN";
     m_malformed = false;
 }
diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp
index cb85550e6..fb5ed8c0d 100644
--- a/khtml/java/tests/testkjavaappletserver.cpp
+++ b/khtml/java/tests/testkjavaappletserver.cpp
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
 
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TQString path_to_tdelibs = "/build/wynnw/kde-src";
 
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index a2843a53a..ffa1e0853 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
 void KHTMLPart::launchJSConfigDialog() {
   TQStringList args;
   args << "khtml_java_js";
-  KApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "kcmshell", args );
 }
 
 TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
@@ -7299,7 +7299,7 @@ void KHTMLPart::launchWalletManager()
 {
 #ifndef KHTML_NO_WALLET
   if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
-    KApplication::startServiceByDesktopName("kwalletmanager_show");
+    TDEApplication::startServiceByDesktopName("kwalletmanager_show");
   } else {
     DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
     r.send("show");
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index c3c0ba23f..e65a41c11 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -450,7 +450,7 @@ public:
    * Java and Plugins support. This might change in the future if the security model
    * is becoming more sophisticated, so don't rely on this behaviour.
    *
-   * ( default false - everything is loaded unless forbidden by KApplication::authorizeURLAction).
+   * ( default false - everything is loaded unless forbidden by TDEApplication::authorizeURLAction).
    */
   void setOnlyLocalReferences( bool enable );
 
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 2831550c3..14169e651 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -637,7 +637,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
     }/*end if*/
 #endif
 
-    KApplication::sendPostedEvents(viewport(), TQEvent::Paint);
+    TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint);
 }
 
 // this is to get rid of a compiler virtual overload mismatch warning. do not remove
@@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
     if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift )
         d->scrollSuspendPreActivate = false;
     if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton
-        && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
+        && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
     {
         if (d->scrollTimerId)
         {
@@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
     {
         if (d->accessKeysPreActivate && _ke->key() != Key_Control)
             d->accessKeysPreActivate=false;
-        if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton))
+        if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton))
         {
 	    displayAccessKeys();
 	    m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText);
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index bc3f00be4..2535b534e 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
   {
       setResizing(true);
-      KApplication::setOverrideCursor(TQCursor(m_cursor));
+      TDEApplication::setOverrideCursor(TQCursor(m_cursor));
       m_vSplitPos = _x;
       m_hSplitPos = _y;
       m_oldpos = -1;
@@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT)
   {
     setResizing(false);
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 
     if(m_vSplit != -1 )
     {
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index e387920d6..f931e9ca5 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
             if ( !berrorPic ) {
                 //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
                 qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
-                                 KApplication::palette().inactive(), true, 1 );
+                                 TDEApplication::palette().inactive(), true, 1 );
             }
             TQPixmap const* pix = i ? &i->pixmap() : 0;
             if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) )
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 860d54718..8db2c590a 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
         setenv( "DISPLAY", ":47", 1 );
     }
 
-    KApplication a;
+    TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle( "windows" );
     KSimpleConfig sc1( "cryptodefaults" );
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index 2cea9f5a4..88e95031e 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -354,9 +354,9 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
 }
 
 #include <kapplication.h>
-void KApplication::dcopFailure( const TQString & )
+void TDEApplication::dcopFailure( const TQString & )
 {
-    tqDebug( "KApplication::dcopFailure" );
+    tqDebug( "TDEApplication::dcopFailure" );
 }
 
 #include <kparts/historyprovider.h>
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index a5ffcae26..257b656c2 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
             "a basic web browser using the KHTML library", "1.0");
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication a;
+    TDEApplication a;
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
     if ( args->count() == 0 ) {
 	TDECmdLineArgs::usage();
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",
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index c5e339b1a..f9e2d237c 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions)
     if (whichActions & FileActions)
     {
         actionMenu->insert( mkdirAction );
-        if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
+        if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
             actionMenu->insert( myActionCollection->action( "trash" ) );
         KConfig *globalconfig = KGlobal::config();
         KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
-        if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
+        if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
             globalconfig->readBoolEntry("ShowDeleteCommand", false))
             actionMenu->insert( myActionCollection->action( "delete" ) );
         actionMenu->insert( actionSeparator );
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 86bd5eeb2..10b8285c1 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -362,7 +362,7 @@ void KFileIconView::slotActivate( TQIconViewItem *item )
 
 void KFileIconView::selected( TQIconViewItem *item )
 {
-    if ( !item || (KApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
+    if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
 	return;
 
     if ( KGlobalSettings::singleClick() ) {
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index 165df42f4..2adb2b15a 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -96,7 +96,7 @@ public:
      * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
      * Successive calls with a different @p appName will add them.
      * @param appName The application's name, i.e. the name passed to the 
-     *                KApplication constructor or KAboutData.
+     *                TDEApplication constructor or KAboutData.
      * @see clearApplicationEvents()
      */
     virtual void addApplicationEvents( const char *appName );
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 8f498aa8d..c8623ced2 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -131,7 +131,7 @@ void KAppTreeListItem::activate()
 void KAppTreeListItem::setOpen( bool o )
 {
     if( o && !parsed ) { // fill the children before opening
-        ((KApplicationTree *) parent())->addDesktopGroup( path, this );
+        ((TDEApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
@@ -144,7 +144,7 @@ bool KAppTreeListItem::isDirectory()
 
 // ----------------------------------------------------------------------
 
-KApplicationTree::KApplicationTree( TQWidget *parent )
+TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
     : KListView( parent ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
@@ -161,7 +161,7 @@ KApplicationTree::KApplicationTree( TQWidget *parent )
 
 // ----------------------------------------------------------------------
 
-bool KApplicationTree::isDirSel()
+bool TDEApplicationTree::isDirSel()
 {
     if (!currentitem) return false; // if currentitem isn't set
     return currentitem->isDirectory();
@@ -182,7 +182,7 @@ static TQPixmap appIcon(const TQString &iconName)
     return normal;
 }
 
-void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
+void TDEApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
 {
    KServiceGroup::Ptr root = KServiceGroup::group(relPath);
    if (!root || !root->isValid()) return;
@@ -244,7 +244,7 @@ void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListIte
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
+void TDEApplicationTree::slotItemHighlighted(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -261,7 +261,7 @@ void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
+void TDEApplicationTree::slotSelectionChanged(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -277,7 +277,7 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::resizeEvent( TQResizeEvent * e)
+void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
 {
     setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
                          -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
@@ -285,7 +285,7 @@ void KApplicationTree::resizeEvent( TQResizeEvent * e)
 }
 
 // Prune empty directories from the tree
-void KApplicationTree::cleanupTree()
+void TDEApplicationTree::cleanupTree()
 {
 	TQListViewItem *item=firstChild();
 	while(item!=0)
@@ -456,7 +456,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
   connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) );
   connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) );
 
-  m_pTree = new KApplicationTree( this );
+  m_pTree = new TDEApplicationTree( this );
   topLayout->addWidget(m_pTree);
 
   connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString& ) ),
diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h
index 3dceb10bc..a6c570172 100644
--- a/kio/kfile/kopenwith.h
+++ b/kio/kfile/kopenwith.h
@@ -26,7 +26,7 @@
 #include <krun.h>
 #include <kservice.h>
 
-class KApplicationTree;
+class TDEApplicationTree;
 class KURLRequester;
 
 class TQWidget;
@@ -161,7 +161,7 @@ protected:
     KURLRequester * edit;
     TQString m_command;
 
-    KApplicationTree* m_pTree;
+    TDEApplicationTree* m_pTree;
     TQLabel *label;
 
     TQString qName, qServiceType;
diff --git a/kio/kfile/kopenwith_p.h b/kio/kfile/kopenwith_p.h
index f395d94bd..8231da27d 100644
--- a/kio/kfile/kopenwith_p.h
+++ b/kio/kfile/kopenwith_p.h
@@ -61,7 +61,7 @@ protected:
     virtual void activate();
     virtual void setOpen( bool o );
 
-    friend class KApplicationTree;
+    friend class TDEApplicationTree;
 };
 
 /* ------------------------------------------------------------------------- */
@@ -69,11 +69,11 @@ protected:
 /**
  * @internal
  */
-class KApplicationTree : public KListView
+class TDEApplicationTree : public KListView
 {
     Q_OBJECT
 public:
-    KApplicationTree( TQWidget *parent );
+    TDEApplicationTree( TQWidget *parent );
 
     /**
      * Add a group of .desktop/.kdelnk entries
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 6bfe09e8d..a1076c134 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -3887,14 +3887,14 @@ void KExecPropsPlugin::slotBrowseExec()
     execEdit->setText( path );
 }
 
-class KApplicationPropsPlugin::KApplicationPropsPluginPrivate
+class TDEApplicationPropsPlugin::TDEApplicationPropsPluginPrivate
 {
 public:
-  KApplicationPropsPluginPrivate()
+  TDEApplicationPropsPluginPrivate()
   {
       m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh?
   }
-  ~KApplicationPropsPluginPrivate()
+  ~TDEApplicationPropsPluginPrivate()
   {
   }
 
@@ -3902,10 +3902,10 @@ public:
   bool m_kdesktopMode;
 };
 
-KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
+TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props )
   : KPropsDlgPlugin( _props )
 {
-  d = new KApplicationPropsPluginPrivate;
+  d = new TDEApplicationPropsPluginPrivate;
   d->m_frame = properties->addPage(i18n("&Application"));
   TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());
 
@@ -4043,23 +4043,23 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
            this, TQT_SIGNAL( changed() ) );
 }
 
-KApplicationPropsPlugin::~KApplicationPropsPlugin()
+TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
 {
   delete d;
 }
 
-// TQString KApplicationPropsPlugin::tabName () const
+// TQString TDEApplicationPropsPlugin::tabName () const
 // {
 //   return i18n ("&Application");
 // }
 
-void KApplicationPropsPlugin::updateButton()
+void TDEApplicationPropsPlugin::updateButton()
 {
     addExtensionButton->setEnabled(availableExtensionsList->currentItem()>-1);
     delExtensionButton->setEnabled(extensionsList->currentItem()>-1);
 }
 
-void KApplicationPropsPlugin::addMimeType( const TQString & name )
+void TDEApplicationPropsPlugin::addMimeType( const TQString & name )
 {
   // Add a mimetype to the list of available mime types if not in the extensionsList
 
@@ -4076,13 +4076,13 @@ void KApplicationPropsPlugin::addMimeType( const TQString & name )
   }
 }
 
-bool KApplicationPropsPlugin::supports( KFileItemList _items )
+bool TDEApplicationPropsPlugin::supports( KFileItemList _items )
 {
   // same constraints as KExecPropsPlugin : desktop file with Type = Application
   return KExecPropsPlugin::supports( _items );
 }
 
-void KApplicationPropsPlugin::applyChanges()
+void TDEApplicationPropsPlugin::applyChanges()
 {
   TQString path = properties->kurl().path();
 
@@ -4121,7 +4121,7 @@ void KApplicationPropsPlugin::applyChanges()
   config.sync();
 }
 
-void KApplicationPropsPlugin::slotAddExtension()
+void TDEApplicationPropsPlugin::slotAddExtension()
 {
   TQListBoxItem *item = availableExtensionsList->firstItem();
   TQListBoxItem *nextItem;
@@ -4143,7 +4143,7 @@ void KApplicationPropsPlugin::slotAddExtension()
   updateButton();
 }
 
-void KApplicationPropsPlugin::slotDelExtension()
+void TDEApplicationPropsPlugin::slotDelExtension()
 {
   TQListBoxItem *item = extensionsList->firstItem();
   TQListBoxItem *nextItem;
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index 91439f8cc..d6a8223dd 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -878,15 +878,15 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
+class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
   /**
    * Constructor
    */
-  KApplicationPropsPlugin( KPropertiesDialog *_props );
-  virtual ~KApplicationPropsPlugin();
+  TDEApplicationPropsPlugin( KPropertiesDialog *_props );
+  virtual ~TDEApplicationPropsPlugin();
 
   virtual void applyChanges();
 
@@ -910,8 +910,8 @@ private:
   TQPushButton *addExtensionButton;
   TQPushButton *delExtensionButton;
 
-  class KApplicationPropsPluginPrivate;
-  KApplicationPropsPluginPrivate *d;
+  class TDEApplicationPropsPluginPrivate;
+  TDEApplicationPropsPluginPrivate *d;
 };
 
 #endif
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 859e75452..9e00687ac 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -6,7 +6,7 @@
 int main(int argc, char** argv)
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KCustomMenuEditorTest");
+  TDEApplication app(argc, argv, "KCustomMenuEditorTest");
   KCustomMenuEditor editor(0);
   KConfig *cfg = new KConfig("kdesktop_custom_menu2");
   editor.load(cfg);
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index 47fcd02ca..3d15c47d0 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -5,7 +5,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app(argc, argv, "kdirselectdialogtest");
+    TDEApplication app(argc, argv, "kdirselectdialogtest");
 
     KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
     if ( u.isValid() )
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index 5c520dd5d..e131bda3a 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c )
 
 int main(int argc, char **argv)
 {
-    KApplication a(argc, argv, "kfiletreeviewtest");
+    TDEApplication a(argc, argv, "kfiletreeviewtest");
     TQString name1;
     TQStringList names;
 
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index db3f46e28..f85995a61 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -44,7 +44,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication a(argc, argv, "kfstest");
+    TDEApplication a(argc, argv, "kfstest");
     TQString name1;
     TQStringList names;
 
diff --git a/kio/kfile/tests/kicondialogtest.cpp b/kio/kfile/tests/kicondialogtest.cpp
index 23301b752..b2c56e159 100644
--- a/kio/kfile/tests/kicondialogtest.cpp
+++ b/kio/kfile/tests/kicondialogtest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kicondialogtest" );
+    TDEApplication app( argc, argv, "kicondialogtest" );
 
 //    KIconDialog::getIcon(); 
 
diff --git a/kio/kfile/tests/knotifytest.cpp b/kio/kfile/tests/knotifytest.cpp
index f6e93fa99..0493b59b4 100644
--- a/kio/kfile/tests/knotifytest.cpp
+++ b/kio/kfile/tests/knotifytest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "knotifytest" );
+    TDEApplication app( argc, argv, "knotifytest" );
     KNotifyDialog *dlg = new KNotifyDialog();
     dlg->addApplicationEvents( "twin" );
     return dlg->exec();
diff --git a/kio/kfile/tests/kopenwithtest.cpp b/kio/kfile/tests/kopenwithtest.cpp
index ea348a94c..f78b1830b 100644
--- a/kio/kfile/tests/kopenwithtest.cpp
+++ b/kio/kfile/tests/kopenwithtest.cpp
@@ -28,7 +28,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kopenwithtest");
+    TDEApplication app(argc, argv, "kopenwithtest");
     KURL::List list;
 
     list += KURL("file:///tmp/testfile.txt");
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 99af39814..0e4851cfb 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -5,7 +5,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kurlrequestertest" );
+    TDEApplication app( argc, argv, "kurlrequestertest" );
     KURL url = KURLRequesterDlg::getURL( "ftp://ftp.kde.org" );
     tqDebug( "Selected url: %s", url.url().latin1());
 
diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h
index d937e8700..9d6624dc0 100644
--- a/kio/kio/jobclasses.h
+++ b/kio/kio/jobclasses.h
@@ -230,7 +230,7 @@ namespace KIO {
 
         /**
          * Updates the last user action timestamp to the given time.
-         * See KApplication::updateUserTimestamp() .
+         * See TDEApplication::updateUserTimestamp() .
          * @since 3.5.6
          */
         void updateUserTimestamp( unsigned long time );
diff --git a/kio/kio/kmessageboxwrapper.h b/kio/kio/kmessageboxwrapper.h
index 94a960135..356d98042 100644
--- a/kio/kio/kmessageboxwrapper.h
+++ b/kio/kio/kmessageboxwrapper.h
@@ -34,7 +34,7 @@ public:
                     const TQString &text, 
                     const TQString &caption = TQString::null)
     {
-	if (KApplication::guiEnabled()) {
+	if (TDEApplication::guiEnabled()) {
      	  kapp->enableStyles();
       	  KMessageBox::error( parent, text, caption );
 	} else 
@@ -45,7 +45,7 @@ public:
                     const TQString &text,
                     const TQString &caption = TQString::null)
     {
-      if (KApplication::guiEnabled()) {
+      if (TDEApplication::guiEnabled()) {
 	 kapp->enableStyles();
          KMessageBox::sorry( parent, text, caption );
       } else
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 461207d9a..09a45b5ea 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -900,7 +900,7 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & )
   args << url.path();
 
   int pid;
-  if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) )
+  if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) )
       return pid;
 
   KProcess p;
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 93cbe677a..cbc72242e 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -818,7 +818,7 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
     }
   }
 
-  int i = KApplication::startServiceByDesktopPath(
+  int i = TDEApplication::startServiceByDesktopPath(
         _service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid, myasn
         );
 
diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp
index 2a468b1e6..599703f9b 100644
--- a/kio/kio/observer.cpp
+++ b/kio/kio/observer.cpp
@@ -61,7 +61,7 @@ Observer::Observer() : DCOPObject("KIO::Observer")
     {
         kdDebug(KDEBUG_OBSERVER) << "Starting kio_uiserver" << endl;
         TQString error;
-        int ret = KApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
+        int ret = TDEApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
                                                              TQStringList(), &error );
         if ( ret > 0 )
         {
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index 3a501d681..29b8482fb 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -245,7 +245,7 @@ void Slave::hold(const KURL &url)
       pid_t pid = m_pid;
       stream << pid;
 
-      TQCString launcher = KApplication::launcher();
+      TQCString launcher = TDEApplication::launcher();
       client->call(launcher, launcher, "waitForSlave(pid_t)",
 	    params, replyType, reply);
    }
@@ -431,7 +431,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     TQDataStream stream(params, IO_WriteOnly);
     stream << protocol << url.host() << socketfile.name();
 
-    TQCString launcher = KApplication::launcher();
+    TQCString launcher = TDEApplication::launcher();
     if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)",
 	    params, replyType, reply)) {
 	error_text = i18n("Cannot talk to klauncher");
@@ -491,7 +491,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
     TQDataStream stream(params, IO_WriteOnly);
     stream << url << socketfile.name();
 
-    TQCString launcher = KApplication::launcher();
+    TQCString launcher = TDEApplication::launcher();
     if (!client->call(launcher, launcher, "requestHoldSlave(KURL,TQString)",
         params, replyType, reply)) {
         delete slave;
diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp
index d0734105c..d2e807077 100644
--- a/kio/kio/slavebase.cpp
+++ b/kio/kio/slavebase.cpp
@@ -246,7 +246,7 @@ DCOPClient *SlaveBase::dcopClient()
 {
     if (!d->dcopClient)
     {
-       d->dcopClient = KApplication::dcopClient();
+       d->dcopClient = TDEApplication::dcopClient();
        if (!d->dcopClient->isAttached())
           d->dcopClient->attach();
        d->dcopClient->setDaemonMode( true );
diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index 672cc0a5c..dc556ea23 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -631,7 +631,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
         d->dcc = new DCOPClient;
         d->dcc->attach();
         if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-           KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+           TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
                                                    TQStringList() );
         }
     }
@@ -895,7 +895,7 @@ int TCPSlaveBase::verifyCertificate()
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
                       if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                         TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
                          TQStringList() );
                       }
 
@@ -1023,7 +1023,7 @@ int TCPSlaveBase::verifyCertificate()
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
                       if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                         TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
                          TQStringList() );
                       }
                    }
@@ -1107,7 +1107,7 @@ int TCPSlaveBase::verifyCertificate()
              d->dcc = new DCOPClient;
              d->dcc->attach();
              if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",
                 TQStringList() );
              }
           }
diff --git a/kio/kioexec/README b/kio/kioexec/README
index 9f844bb97..daaa38bdb 100644
--- a/kio/kioexec/README
+++ b/kio/kioexec/README
@@ -14,7 +14,7 @@ so we have no way to know when the user finished editing the file...
 
 Conclusion: if the application has network transparency built-in, it should
 put "%u" in its desktop file - and kfmexec isn't used -. If it doesn't, either
-it's a KApplication and kfmexec does its job, or it's a KUniqueApplication
+it's a TDEApplication and kfmexec does its job, or it's a KUniqueApplication
 and... kfmexec can't see modifications to the file. Be warned.
 
 From Waldo: "The program doesn't return _at once_. It returns
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 772c27f73..18014f08f 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -283,7 +283,7 @@ int main( int argc, char **argv )
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     KIOExec exec;
 
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index ac9954563..cba281cc7 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -423,7 +423,7 @@ int main( int argc, char **argv )
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     bool useGUI = args->isSet( "dialog" );
 
-    KApplication app( useGUI, useGUI );
+    TDEApplication app( useGUI, useGUI );
 
     TQPtrList<FileProps> m_props;
     m_props.setAutoDelete( true );
diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp
index a9f59ca36..3b2eb8cf7 100644
--- a/kio/misc/kmailservice.cpp
+++ b/kio/misc/kmailservice.cpp
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
     TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication a( false, false );
+    TDEApplication a( false, false );
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index 9af382483..dd9cd33ec 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -265,7 +265,7 @@ TQByteArray KNTLM::getLMv2Response( const TQString &target, const TQString &user
   TQByteArray hash = ntlmv2Hash( target, user, password );
   TQByteArray clientChallenge( 8 );
   for ( uint i = 0; i<8; i++ ) {
-    clientChallenge.data()[i] = KApplication::random() % 0xff;
+    clientChallenge.data()[i] = TDEApplication::random() % 0xff;
   }
   return lmv2Response( hash, clientChallenge, challenge );
 }
@@ -304,7 +304,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   now *= (TQ_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
   for ( uint i = 0; i<8; i++ ) {
-    bl->challenge[i] = KApplication::random() % 0xff;
+    bl->challenge[i] = TDEApplication::random() % 0xff;
   }
   memcpy( blob.data() + sizeof(Blob), targetinfo.data(), targetinfo.size() );
   return blob;
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 1f900426f..527d8545f 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
     TDECmdLineArgs::addCmdLineOptions(options);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    KApplication a(false, false);
+    TDEApplication a(false, false);
 
     TQCString recipient = args->getOption("recipient");
     if (recipient.isEmpty())
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index d0f93aaf1..ea8708863 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 			   I18N_NOOP("telnet protocol handler"), "unknown");
 	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index eca13c463..a88f4e5b1 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -95,7 +95,7 @@ KWalletD::KWalletD(const TQCString &name)
 	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
 	reconfigure();
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
-	connect(KApplication::dcopClient(),
+	connect(TDEApplication::dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
 		TQT_SLOT(slotAppUnregistered(const TQCString&)));
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 		}
 		emitDCOPSignal("walletOpened(TQString)", data);
 		if (_wallets.count() == 1 && _launchManager) {
-			KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
+			TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
 		}
 	} else {
 		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
diff --git a/kio/tests/getalltest.cpp b/kio/tests/getalltest.cpp
index 58c8d5a3f..07d8723ed 100644
--- a/kio/tests/getalltest.cpp
+++ b/kio/tests/getalltest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
 //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
    kdDebug() << "All services" << endl;
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 34fe93677..cd9a99bb8 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -64,9 +64,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     JobTest test;
     test.setup();
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index b4bfc9f07..45ace585f 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -67,9 +67,9 @@ static bool check(const TQString& txt, T a, T b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     KACLTest test;
     test.setup();
diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp
index 7d373824e..1626f2ebc 100644
--- a/kio/tests/kdcopcheck.cpp
+++ b/kio/tests/kdcopcheck.cpp
@@ -91,7 +91,7 @@ int TestService::exec()
 int main(int argc, char *argv[])
 {
    putenv("IGNORE_SYCOCA_VERSION=true");
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    k.dcopClient()->setNotifications(true);
 
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index a831041e1..e62408204 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -7,7 +7,7 @@ using namespace KIO;
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kdefaultprogresstest");
+    TDEApplication app(argc, argv, "kdefaultprogresstest");
 
     DefaultProgress* dlg = new DefaultProgress();
     KURL src("http://this.host.doesn't.exist/this/dir/neither/andthisfileneither");
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 6137f5e71..01d0a36e9 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -151,7 +151,7 @@ void KDirListerTest::completed()
 
 int main ( int argc, char *argv[] )
 {
-  KApplication app( argc, argv, "kdirlistertest" );
+  TDEApplication app( argc, argv, "kdirlistertest" );
 
   KDirListerTest *test = new KDirListerTest( 0 );
   test->show();
diff --git a/kio/tests/kdirwatchtest.cpp b/kio/tests/kdirwatchtest.cpp
index 20676ee49..c741b20f0 100644
--- a/kio/tests/kdirwatchtest.cpp
+++ b/kio/tests/kdirwatchtest.cpp
@@ -28,9 +28,9 @@ int main (int argc, char **argv)
   TDECmdLineArgs::init(argc, argv, "KDirWatchTest",
 		     "Test for KDirWatch", "1.0");
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
-  KApplication a;
+  TDEApplication a;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   myTest testObject;
diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp
index 95b0cf61a..82c669c74 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/kio/tests/kionetrctest.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::addCmdLineOptions( options );
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
-    KApplication app;
+    TDEApplication app;
 
     if ( !count )
         args->usage();
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index f1dd1a9b0..099ce468b 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -10,7 +10,7 @@ int main ( int argc, char** argv )
 {
     KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
 
     TQString usr, pass, comment, label;
     label = "Site:";
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index 2e7e398e4..72a7ffb05 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -496,7 +496,7 @@ static KCmdLineOptions options[] =
 int main(int argc, char **argv) {
   TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp
index bde2ff5ff..026d4173b 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/kio/tests/kmimefromext.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString fileName = args->arg( 0 );
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 5d01384f6..02a4b6f37 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -17,7 +17,7 @@ int main ( int argc, char** argv )
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() < 1 )
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index e8fd7850d..1f4dc95c6 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -30,7 +30,7 @@ int main(int argc, char **argv) {
                         "1.0");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEApplication app;
 
     KURL url;
     url.setPath("/tmp");
diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp
index 673948374..d8f47859b 100644
--- a/kio/tests/kruntest.cpp
+++ b/kio/tests/kruntest.cpp
@@ -121,7 +121,7 @@ void checkPDE(const KService &service, const KURL::List &urls, bool hs, bool tf,
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
 
   // First some non-interactive tests
   checkBN( "/usr/bin/ls", true, "ls");
diff --git a/kio/tests/kscantest.cpp b/kio/tests/kscantest.cpp
index 347993af8..14abd1b33 100644
--- a/kio/tests/kscantest.cpp
+++ b/kio/tests/kscantest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kscantest" );
+    TDEApplication app( argc, argv, "kscantest" );
     KScanDialog *dlg = KScanDialog::getScanDialog();
     if ( !dlg ) {
 	tqDebug("*** EEK, no Scan-service available, aborting!");
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp
index 086836f37..45f94ac3c 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/ksycocatest.cpp
@@ -67,7 +67,7 @@ void debug(const char *format, const char *txt)
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    TQCString instname = "kword";
    TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/ksycocaupdatetest.cpp
index 1d9e3fcaa..e7778e056 100644
--- a/kio/tests/ksycocaupdatetest.cpp
+++ b/kio/tests/ksycocaupdatetest.cpp
@@ -4,7 +4,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
 
    KService::rebuildKSycoca(0);
    return 0;
diff --git a/kio/tests/ktradertest.cpp b/kio/tests/ktradertest.cpp
index d2ceb4c00..b05444dfd 100644
--- a/kio/tests/ktradertest.cpp
+++ b/kio/tests/ktradertest.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false ); // no GUI
+  TDEApplication app( false, false ); // no GUI
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 6eb661c70..3dbd8c648 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
     app.disableAutoDcopRegistration();
 
     // Allow testing of the search engine using both delimiters...
diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp
index d777fe0df..c8dc99595 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/kio/tests/kurlcompletiontest.cpp
@@ -164,9 +164,9 @@ void KURLCompletionTest::testLocalURL()
 
 int main( int argc, char **argv )
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     {
         KURLCompletionTest test;
diff --git a/kio/tests/metatest.cpp b/kio/tests/metatest.cpp
index f450c46c1..034d740ed 100644
--- a/kio/tests/metatest.cpp
+++ b/kio/tests/metatest.cpp
@@ -187,9 +187,9 @@ int main( int argc, char **argv )
     TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kio/tests/netaccesstest.cpp b/kio/tests/netaccesstest.cpp
index 9fb0ff07a..a9aeb66d4 100644
--- a/kio/tests/netaccesstest.cpp
+++ b/kio/tests/netaccesstest.cpp
@@ -24,7 +24,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
 
   KURL srcURL( "ftp://ftp.kde.org/pub/kde/README" );
   KURL tmpURL( "file:/tmp/netaccesstest_README" );
diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp
index f2b740224..52dea6ac7 100644
--- a/kio/tests/previewtest.cpp
+++ b/kio/tests/previewtest.cpp
@@ -55,7 +55,7 @@ void PreviewTest::slotFailed()
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "previewtest");
+    TDEApplication app(argc, argv, "previewtest");
     PreviewTest *w = new PreviewTest;
     w->show();
     app.setMainWidget(w);
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index 77cf13764..ae94d83e6 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
 
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 16b785d03..bb9eb5866 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -5011,7 +5011,7 @@ void HTTPProtocol::cleanCache()
    {
       // Touch file.
       utime(TQFile::encodeName(cleanFile), 0);
-      KApplication::startServiceByDesktopPath("http_cache_cleaner.desktop");
+      TDEApplication::startServiceByDesktopPath("http_cache_cleaner.desktop");
    }
 }
 
@@ -5789,7 +5789,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy )
   info.qop = "";
 
   // cnonce is recommended to contain about 64 bits of entropy
-  info.cnonce = KApplication::randomString(16).latin1();
+  info.cnonce = TDEApplication::randomString(16).latin1();
 
   // HACK: Should be fixed according to RFC 2617 section 3.2.2
   info.nc = "00000001";
diff --git a/kioslave/metainfo/metainfo.cpp b/kioslave/metainfo/metainfo.cpp
index 21e24e428..9bc99981f 100644
--- a/kioslave/metainfo/metainfo.cpp
+++ b/kioslave/metainfo/metainfo.cpp
@@ -42,7 +42,7 @@ extern "C"
 
 int kdemain(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kio_metainfo", false, true);
+    TDEApplication app(argc, argv, "kio_metainfo", false, true);
 
     if (argc != 4)
     {
diff --git a/kmdi/test/main.cpp b/kmdi/test/main.cpp
index 7a1cab885..4f14a410c 100644
--- a/kmdi/test/main.cpp
+++ b/kmdi/test/main.cpp
@@ -27,7 +27,7 @@
 
 #ifndef NO_KDE
 # include <kapplication.h>
- KApplication* theApp;
+ TDEApplication* theApp;
 #else
 # include <tqapplication.h>
  TQApplication* theApp;
@@ -42,7 +42,7 @@
 int main( int argc, char **argv )
 {
 #ifndef NO_KDE
-   KApplication a(argc,argv,"KFourChildren");
+   TDEApplication a(argc,argv,"KFourChildren");
 #else
    TQApplication a(argc,argv);
 #endif
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index 709460862..1f5c01768 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -81,7 +81,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   GhnsWidget wid;
   app.setMainWidget( &wid );
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/khotnewstuff.cpp
index cf68255a3..bbca71b89 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/khotnewstuff.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::addCmdLineOptions(op);
 	args = TDECmdLineArgs::parsedArgs();
 
-	KApplication i;
+	TDEApplication i;
 
 	KNS::DownloadDialog d;
 	if(args->isSet("type")) d.setType(args->getOption("type"));
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 6a37aa61d..c572f347d 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -72,7 +72,7 @@ void KNewStuff::download()
 TQString KNewStuff::downloadDestination( Entry * )
 {
   return KGlobal::dirs()->saveLocation( "tmp" ) +
-         KApplication::randomString( 10 );
+         TDEApplication::randomString( 10 );
 }
 
 void KNewStuff::upload()
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index 451be8b43..189a90067 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -110,7 +110,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   MyWidget wid;
   app.setMainWidget( &wid );
diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp
index 7792c5d43..3675781ea 100644
--- a/kparts/tests/example.cpp
+++ b/kparts/tests/example.cpp
@@ -121,7 +121,7 @@ void Shell::slotFileEdit()
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kpartstest" );
+  TDEApplication app( argc, argv, "kpartstest" );
 
   Shell *shell = new Shell;
 
diff --git a/kparts/tests/ghostview.cpp b/kparts/tests/ghostview.cpp
index d7cf9d102..5d1bbe5b3 100644
--- a/kparts/tests/ghostview.cpp
+++ b/kparts/tests/ghostview.cpp
@@ -103,7 +103,7 @@ int main( int argc, char **argv )
 {
   TDECmdLineArgs::init(argc, argv, "ghostviewtest", description, version);
   TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Shell *shell = new Shell;
   if ( args->count() == 1 )
diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp
index bb54521d1..82c464a5a 100644
--- a/kparts/tests/normalktm.cpp
+++ b/kparts/tests/normalktm.cpp
@@ -108,7 +108,7 @@ void Shell::slotFileEdit()
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen()
+  TDEApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen()
 
   Shell *shell = new Shell;
 
diff --git a/krandr/randr.cpp b/krandr/randr.cpp
index f1b1aae21..dd54f87be 100644
--- a/krandr/randr.cpp
+++ b/krandr/randr.cpp
@@ -254,7 +254,7 @@ KDE_EXPORT bool RandRScreen::confirm()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                KApplication::kApplication()->mainWidget(),
+                TDEApplication::kApplication()->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Setting Change"),
@@ -846,7 +846,7 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                KApplication::kApplication()->mainWidget(),
+                TDEApplication::kApplication()->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Settings"),
diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp
index b5d9ec32f..8fa2e03c0 100644
--- a/kresources/managerimpl.cpp
+++ b/kresources/managerimpl.cpp
@@ -45,7 +45,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family )
 {
   kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
 
-  mId = KApplication::randomString( 8 );
+  mId = TDEApplication::randomString( 8 );
 
   // Register with DCOP
   if ( !kapp->dcopClient()->isRegistered() ) {
diff --git a/kresources/resource.cpp b/kresources/resource.cpp
index b9cdd95c4..83d24cbf5 100644
--- a/kresources/resource.cpp
+++ b/kresources/resource.cpp
@@ -61,7 +61,7 @@ Resource::Resource( const KConfig* config )
     d->mName = i18n("resource");
     d->mReadOnly = false;
     d->mActive = true;
-    d->mIdentifier = KApplication::randomString( 10 );
+    d->mIdentifier = TDEApplication::randomString( 10 );
   }
 }
 
diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp
index 452d9cf27..6624b9ffe 100644
--- a/kresources/testresources.cpp
+++ b/kresources/testresources.cpp
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "testresources", "Kresource Test", "0" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   Manager<TestResource> manager( "test" );
   
diff --git a/kspell2/tests/backgroundtest.cpp b/kspell2/tests/backgroundtest.cpp
index 8050115ad..a732799e5 100644
--- a/kspell2/tests/backgroundtest.cpp
+++ b/kspell2/tests/backgroundtest.cpp
@@ -159,7 +159,7 @@ void BackgroundTest::slotMisspelling( const TQString& word, int start )
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     BackgroundTest test;
 
diff --git a/kspell2/tests/test.cpp b/kspell2/tests/test.cpp
index e9b72a794..e8ceabaf7 100644
--- a/kspell2/tests/test.cpp
+++ b/kspell2/tests/test.cpp
@@ -30,7 +30,7 @@ using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     Broker::Ptr broker = Broker::openBroker();
 
diff --git a/kspell2/tests/test_config.cpp b/kspell2/tests/test_config.cpp
index 4ef3f588e..2d243bd46 100644
--- a/kspell2/tests/test_config.cpp
+++ b/kspell2/tests/test_config.cpp
@@ -26,7 +26,7 @@ using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     SettingsDialog *dialog = new SettingsDialog( 0 );
 
diff --git a/kspell2/tests/test_configdialog.cpp b/kspell2/tests/test_configdialog.cpp
index e90d01d7c..a9ff16cdd 100644
--- a/kspell2/tests/test_configdialog.cpp
+++ b/kspell2/tests/test_configdialog.cpp
@@ -27,7 +27,7 @@ using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     Broker::Ptr broker = Broker::openBroker();
     ConfigDialog *dialog = new ConfigDialog( broker, 0 );
diff --git a/kspell2/tests/test_dialog.cpp b/kspell2/tests/test_dialog.cpp
index bc5d808a8..19503e307 100644
--- a/kspell2/tests/test_dialog.cpp
+++ b/kspell2/tests/test_dialog.cpp
@@ -54,7 +54,7 @@ void TestDialog::doneChecking( const TQString& buf )
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     TestDialog test;
     test.check( "This is a sample buffer. Whih this thingg will "
diff --git a/kspell2/tests/test_filter.cpp b/kspell2/tests/test_filter.cpp
index eafaf622f..430f157dd 100644
--- a/kspell2/tests/test_filter.cpp
+++ b/kspell2/tests/test_filter.cpp
@@ -28,7 +28,7 @@ using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "Filter");
+    TDEApplication app(argc, argv, "Filter");
 
     TQString buffer = TQString( "This is     a sample buffer.      Please test me." );
 
diff --git a/kspell2/tests/test_highlighter.cpp b/kspell2/tests/test_highlighter.cpp
index ce5c64501..c11972254 100644
--- a/kspell2/tests/test_highlighter.cpp
+++ b/kspell2/tests/test_highlighter.cpp
@@ -29,7 +29,7 @@
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     TQTextEdit *test = new TQTextEdit();
     KSpell2::Highlighter *hl = new KSpell2::Highlighter( test );
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 11a06f29a..4302976c8 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -93,7 +93,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
 
 AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency)
 {
-	if (tqApp->inherits("KApplication")) {
+	if (tqApp->inherits("TDEApplication")) {
 		connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
 	}
 
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 56cbeb09f..544f692e0 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -7,7 +7,7 @@
  KDE3 port (C) 2001-2002 Maksim Orlovich <mo002j@mail.rochester.edu>
  Port version 0.9.7
 
- Palette setup code is from KApplication,
+ Palette setup code is from TDEApplication,
 		Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
 		Copyright (C) 1998, 1999, 2000 KDE Team
 
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 3e2019383..1e002cd4a 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -6,7 +6,7 @@
 
  KDE3 port (C) 2001 Maksim Orlovich <mo002j@mail.rochester.edu>
 
- Palette setup code is from KApplication,
+ Palette setup code is from TDEApplication,
 Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
 Copyright (C) 1998, 1999, 2000 KDE Team
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 22986730f..e6ffce721 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -38,7 +38,7 @@ static const char ver[] = "0.9.1";
 int main(int argc, char **argv)
 {
     TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
-    KApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
+    TDEApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
 
     KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
     TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc");
diff --git a/kunittest/tester.h b/kunittest/tester.h
index 5e47f7ccb..75eebd39c 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -152,7 +152,7 @@ SampleTest - 1 test passed, 1 test failed
  *
  *     TDECmdLineArgs::init(argc, argv, &about);
  *     TDECmdLineArgs::addCmdLineOptions( options );
- *     KApplication app;
+ *     TDEApplication app;
  *
  *     KUnitTest::RunnerGUI runner(0);
  *     runner.show();
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index c8327a25e..2238616c2 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -177,7 +177,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
    */
   if(withfallback)
   {
-    KApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
+    TDEApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
   }
   else
   {
diff --git a/kutils/tests/kfindtest.cpp b/kutils/tests/kfindtest.cpp
index 29710c070..6c64245dc 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/kutils/tests/kfindtest.cpp
@@ -124,7 +124,7 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength)
 int main(int argc, char **argv)
 {
 	TDECmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
-	KApplication app;
+	TDEApplication app;
 
 	TQString text = "This file is part of the KDE project.\n"
 	               "This library is free software; you can redistribute it and/or\n"
diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp
index d7d6d6e6e..26b0f7c9e 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/kutils/tests/kreplacetest.cpp
@@ -253,7 +253,7 @@ static void testReplacementHistory()
 int main( int argc, char **argv )
 {
     TDECmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     testReplacementHistory(); // #130831
 
diff --git a/kwallet/backend/tests/backendtest.cpp b/kwallet/backend/tests/backendtest.cpp
index e7599b3a2..ea74054b7 100644
--- a/kwallet/backend/tests/backendtest.cpp
+++ b/kwallet/backend/tests/backendtest.cpp
@@ -7,7 +7,7 @@
 #include "kwalletbackend.h"
 
 int main(int argc, char **argv) {
-   KApplication a(argc, argv, "kwalletbackendtest");
+   TDEApplication a(argc, argv, "kwalletbackendtest");
 
    KWallet::Backend be("ktestwallet");
    printf("KWalletBackend constructed\n");
diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp
index d25a74395..0900f9d20 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/kwallet/tests/kwalletasync.cpp
@@ -45,7 +45,7 @@ int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletasync" );
+	TDEApplication app( "kwalletasync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp
index 38197691a..cee1cc127 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/kwallet/tests/kwalletboth.cpp
@@ -67,7 +67,7 @@ int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletboth" );
+	TDEApplication app( "kwalletboth" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletsync.cpp b/kwallet/tests/kwalletsync.cpp
index 541f593c0..93baa01ab 100644
--- a/kwallet/tests/kwalletsync.cpp
+++ b/kwallet/tests/kwalletsync.cpp
@@ -25,7 +25,7 @@ int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletsync" );
+	TDEApplication app( "kwalletsync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp
index 4c7b343cb..e4a1f89a0 100644
--- a/libkscreensaver/kscreensaver.cpp
+++ b/libkscreensaver/kscreensaver.cpp
@@ -67,7 +67,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
     if ( w == 0 ) w = 600;
     if ( h == 0 ) h = 420;
     resize( w, h );
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
     show();
 }
 
@@ -79,12 +79,12 @@ KScreenSaver::~KScreenSaver()
 
 void KScreenSaver::embed( TQWidget *w )
 {
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
 #ifdef Q_WS_X11 //FIXME
     XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0);
 #endif
     w->setGeometry( 0, 0, width(), height() );
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
 }
 
 bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e )
diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp
index da5b2a2df..75c2e72dd 100644
--- a/libkscreensaver/main.cpp
+++ b/libkscreensaver/main.cpp
@@ -98,7 +98,7 @@ KDE_EXPORT int main(int argc, char *argv[])
 
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     KCrash::setCrashHandler( crashHandler );
     KGlobal::locale()->insertCatalogue("klock");
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 44211c696..1611721ba 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -92,7 +92,7 @@ void TestService::slotStatusChange()
 
 int main( int argc, char** argv )
 {
-	KApplication app(argc, argv, "testdcop");
+	TDEApplication app(argc, argv, "testdcop");
 	TestService * test = new TestService;
 	Q_UNUSED( test );
 	return app.exec();
diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS
index a76f6be1e..aad1c76e9 100644
--- a/tdecore/AUTHORS
+++ b/tdecore/AUTHORS
@@ -1,5 +1,5 @@
 Matthias Kalle Dalheimer <kalle@kde.org>:
-classes KConfig, KTextStream, KColorSet, KApplication
+classes KConfig, KTextStream, KColorSet, TDEApplication
 automake, autoconf, maintenance
 
 Richard Moore <moorer@cs.man.ac.uk>:
@@ -40,7 +40,7 @@ Christian Czezatke <e9025461@student.tuwien.ac.at>
 KProcess class
 
 Matthias Ettrich <ettrich@kde.org>
-KWM, Changes to KApplication and KIconLoader
+KWM, Changes to TDEApplication and KIconLoader
 
 Stephan Kulow <coolo@kde.org>
 heavy modifications to KURL, autoconf and automake stuff
diff --git a/tdecore/DESIGN.COLOR b/tdecore/DESIGN.COLOR
index b997a6de0..56ffd1774 100644
--- a/tdecore/DESIGN.COLOR
+++ b/tdecore/DESIGN.COLOR
@@ -25,7 +25,7 @@ contrast at all which can lead to a completely unreadable UI.
 Color schemes are supported by Qt (see TQColorGroup) and can be
 configured on a KDE wide basis from the Control Panel. The settings
 are stored in the global KDE configuration file under the "General"
-setting. The KApplication class takes care that the configured
+setting. The TDEApplication class takes care that the configured
 settings are passed on to Qt. Application developers can just use the
 values provided by TQColorGroup.
 
diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox
index c0e13a339..cbf8f69d9 100644
--- a/tdecore/Mainpage.dox
+++ b/tdecore/Mainpage.dox
@@ -6,7 +6,7 @@ support, site-independent access to the filesystem and a large number
 of other (but no less important) things.
 <p>
 All Trinity applications should link to the tdecore library. Also, using a
-KApplication derived class instead of TQApplication is almost
+TDEApplication derived class instead of TQApplication is almost
 mandatory if you expect your application to behave nicely within the
 Trinity environment.
 
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 896981d33..d6d380707 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -657,7 +657,7 @@ Host[$e]=$(hostname)
 KDE3 Kiosk Application API
 ==========================
 
-Three new methods have been added to KApplication:
+Three new methods have been added to TDEApplication:
 
 - bool authorize(QString action); // Generic actions
 - bool authorizeKAction(QString action); // For KActions exclusively
diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo
index 496f75ecd..91d87329f 100644
--- a/tdecore/README.kstartupinfo
+++ b/tdecore/README.kstartupinfo
@@ -30,7 +30,7 @@ ASNs which will stay too long until a timeout ). For improving the quality
 of ASN and reducing the number of ASNs that don't detect when the application
 has started, some .desktop file entries may be helpful ( see below ).
  If you want to start an application in your code, prefer using KRun or
-KApplication::startServiceByXXX() calls. Classes like KProcess don't create
+TDEApplication::startServiceByXXX() calls. Classes like KProcess don't create
 ASN, so if you need to use it, you have to send it manually ( only in case
 ASN is useful in this case, it shouldn't be sent e.g. for system processes ).
  
@@ -148,8 +148,8 @@ forks into background, it sends the PID change. That's how compliant
 applications should work, and this support for ASN should be provided
 by toolkits. All KDE application should be compliant by now, since
 tdelibs do all the necessary things. The KDE_STARTUP_ENV variable
-is read and unset in KApplication constructor, and _KDE_STARTUP_ID
-is set on every toplevel window in KApplication::setTopWidget().
+is read and unset in TDEApplication constructor, and _KDE_STARTUP_ID
+is set on every toplevel window in TDEApplication::setTopWidget().
  However, majority of applications aren't compliant now, and even
 if I succeed making this thing a standard ( part of NETWM_SPEC
 or whatever ), there still will be old applications that won't behave
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index 52175e2eb..41660e59a 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -71,11 +71,11 @@
 // 2) If another widget accepts the AccelOverride, it will expect to get a normal
 // Qt generated KeyPress event afterwards. So we let Qt handle the X11 keyboard event
 // again. However, this will first generate an AccelOverride event, and we already
-// had send that one. To compnesate for this, the global event filter in KApplication
+// had send that one. To compnesate for this, the global event filter in TDEApplication
 // is instructed to eat the next AccelOveride event. Qt will then send a normal KeyPress
 // event and from then on everything is normal again.
 //
-// kde_g_bKillAccelOverride is used to tell KApplication::notify to eat the next
+// kde_g_bKillAccelOverride is used to tell TDEApplication::notify to eat the next
 // AccelOverride event.
 
 bool kde_g_bKillAccelOverride = false;
@@ -147,7 +147,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
 		kapp->sendEvent( kapp->focusWidget(), &ke );
 
 		// If the Override event was accepted from a non-KAccel widget,
-		//  then kill the next AccelOverride in KApplication::notify.
+		//  then kill the next AccelOverride in TDEApplication::notify.
 		if( ke.isAccepted() && !g_bAccelActivated )
 			kde_g_bKillAccelOverride = true;
 
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index fc0198d87..e3ee63353 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -24,10 +24,10 @@
 #include <kconfig.h>
 
 
-KAppDCOPInterface::KAppDCOPInterface(KApplication * theKApp)
+KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp)
 	: DCOPObject( "MainApplication-Interface")
 {
-	m_KApplication = theKApp;
+	m_TDEApplication = theKApp;
 }
 
 KAppDCOPInterface::~KAppDCOPInterface()
@@ -51,12 +51,12 @@ TQCString KAppDCOPInterface::caption()
 
 void KAppDCOPInterface::quit()
 {
-	m_KApplication->quit();
+	m_TDEApplication->quit();
 }
 
 void KAppDCOPInterface::updateUserTimestamp( ulong time )
 {
-	m_KApplication->updateUserTimestamp( time );
+	m_TDEApplication->updateUserTimestamp( time );
 }
 
 void KAppDCOPInterface::reparseConfiguration()
@@ -65,6 +65,6 @@ void KAppDCOPInterface::reparseConfiguration()
 }
 
 void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) {
-	m_KApplication->broadcastKeyCode(keyCode);
+	m_TDEApplication->broadcastKeyCode(keyCode);
 }
 
diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h
index 187c9f5ae..164c8b115 100644
--- a/tdecore/kappdcopiface.h
+++ b/tdecore/kappdcopiface.h
@@ -26,12 +26,12 @@
 #include <dcopref.h>
 #include "tdelibs_export.h"
 
-class KApplication;
+class TDEApplication;
 
 /**
-This is the main interface to the KApplication.  This will provide a consistant
+This is the main interface to the TDEApplication.  This will provide a consistant
 dcop interface to all KDE applications that use it.
-@short DCOP interface to KApplication.
+@short DCOP interface to TDEApplication.
 @author Ian Reinhart Geiser <geiseri@yahoo.com>
 */
 class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
@@ -41,10 +41,10 @@ K_DCOP
 public:
 	/**
 	Construct a new interface object.
-	@param theKapp - The parent KApplication object
+	@param theKapp - The parent TDEApplication object
 	    that will provide us with the functional interface.
 	*/
-	KAppDCOPInterface( KApplication * theKapp );
+	KAppDCOPInterface( TDEApplication * theKapp );
 	/**
 	Destructor
 	Cleans up the dcop connection.
@@ -65,14 +65,14 @@ k_dcop:
 
 	void updateUserTimestamp( ulong time );
 	/**
-	Send a fake keypress to all KApplication instances
+	Send a fake keypress to all TDEApplication instances
 	For internal use in connecting insecure function keys to
 	KDE applications while the X keyboard is locked.
 	**/
 	void sendFakeKey( unsigned int keyCode);
 
 private:
-	KApplication *m_KApplication;
+	TDEApplication *m_TDEApplication;
 };
 
 #endif
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index dd804107a..1f0dae669 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -175,10 +175,10 @@ KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
 bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
 bool kde_kiosk_admin = false;
 
-KApplication* KApplication::KApp = 0L;
-bool KApplication::loadedByKdeinit = false;
-DCOPClient *KApplication::s_DCOPClient = 0L;
-bool KApplication::s_dcopClientNeedsPostInit = false;
+TDEApplication* TDEApplication::KApp = 0L;
+bool TDEApplication::loadedByKdeinit = false;
+DCOPClient *TDEApplication::s_DCOPClient = 0L;
+bool TDEApplication::s_dcopClientNeedsPostInit = false;
 
 #ifdef Q_WS_X11
 static Atom atom_DesktopWindow;
@@ -230,7 +230,7 @@ static void kde_ice_ioerrorhandler( IceConn conn )
 #endif
 
 #ifdef Q_WS_WIN
-void KApplication_init_windows(bool GUIenabled);
+void TDEApplication_init_windows(bool GUIenabled);
 
 class QAssistantClient;
 #endif
@@ -238,10 +238,10 @@ class QAssistantClient;
 /*
   Private data to make keeping binary compatibility easier
  */
-class KApplicationPrivate
+class TDEApplicationPrivate
 {
 public:
-  KApplicationPrivate()
+  TDEApplicationPrivate()
     :   actionRestrictions( false ),
 	refCount( 1 ),
 	oldIceIOErrorHandler( 0 ),
@@ -260,7 +260,7 @@ public:
   {
   }
 
-  ~KApplicationPrivate()
+  ~TDEApplicationPrivate()
   {
 #ifdef Q_WS_WIN
      delete qassistantclient;
@@ -439,7 +439,7 @@ public:
 static TQPtrList<TQWidget>*x11Filter = 0;
 static bool autoDcopRegistration = true;
 
-void KApplication::installX11EventFilter( TQWidget* filter )
+void TDEApplication::installX11EventFilter( TQWidget* filter )
 {
     if ( !filter )
         return;
@@ -449,12 +449,12 @@ void KApplication::installX11EventFilter( TQWidget* filter )
     x11Filter->append( filter );
 }
 
-void KApplication::x11FilterDestroyed()
+void TDEApplication::x11FilterDestroyed()
 {
     removeX11EventFilter( static_cast< const TQWidget* >( sender()));
 }
 
-void KApplication::removeX11EventFilter( const TQWidget* filter )
+void TDEApplication::removeX11EventFilter( const TQWidget* filter )
 {
     if ( !x11Filter || !filter )
         return;
@@ -471,7 +471,7 @@ void KApplication::removeX11EventFilter( const TQWidget* filter )
 // in KAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02
 extern bool kde_g_bKillAccelOverride;
 
-bool KApplication::notify(TQObject *receiver, TQEvent *event)
+bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
 {
     TQEvent::Type t = event->type();
     if (kde_g_bKillAccelOverride)
@@ -583,7 +583,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
     return TQApplication::notify(receiver, event);
 }
 
-void KApplication::checkAppStartedSlot()
+void TDEApplication::checkAppStartedSlot()
 {
 #if defined Q_WS_X11
     KStartupInfo::handleAutoAppStartedSending();
@@ -604,7 +604,7 @@ static TQPtrList<KSessionManaged>* sessionClients()
   instance specific config object.
   Syntax:  "session/<appname>_<sessionId>"
  */
-TQString KApplication::sessionConfigName() const
+TQString TDEApplication::sessionConfigName() const
 {
     TQString sessKey = sessionKey();
     if ( sessKey.isEmpty() && !d->sessionKey.isEmpty() )
@@ -621,14 +621,14 @@ static SmcConn tmpSmcConnection = 0;
 #endif
 static TQTime* smModificationTime = 0;
 
-KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
+TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
                             bool allowStyles, bool GUIenabled ) :
   TQApplication( argc, argv, GUIenabled ), KInstance(rAppName),
 #ifdef Q_WS_X11
   display(0L),
   argb_visual(false),
 #endif
-  d (new KApplicationPrivate())
+  d (new TDEApplicationPrivate())
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -646,7 +646,7 @@ KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
 //  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
   TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ),	// We need to be able to run command line apps
   KInstance( TDECmdLineArgs::about),
@@ -654,7 +654,7 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
   display(0L),
   argb_visual(false),
 #endif
-  d (new KApplicationPrivate)
+  d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -671,10 +671,10 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
 }
 
 #ifdef Q_WS_X11
-KApplication::KApplication( Display *dpy, bool allowStyles ) :
+TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
-  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -687,10 +687,10 @@ KApplication::KApplication( Display *dpy, bool allowStyles ) :
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
+TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -704,11 +704,11 @@ KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual,
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
 		            bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     if ((visual) && (colormap))
         getX11RGBAInformation(dpy);
@@ -723,11 +723,11 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
 		            bool allowStyles, KInstance * _instance ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( _instance ), display(0L), d (new KApplicationPrivate)
+  KInstance( _instance ), display(0L), d (new TDEApplicationPrivate)
 {
     if ((visual) && (colormap))
         getX11RGBAInformation(dpy);
@@ -743,7 +743,7 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
 }
 #endif
 
-KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
   TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 GUIenabled ),
   KInstance( _instance ),
@@ -751,7 +751,7 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _insta
   display(0L),
 #endif
   argb_visual(false),
-  d (new KApplicationPrivate)
+  d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -768,12 +768,12 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _insta
 }
 
 #ifdef Q_WS_X11
-KApplication::KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
+TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
                            bool allowStyles, bool GUIenabled ) :
   TQApplication( display ), KInstance(rAppName),
   display(0L),
   argb_visual(false),
-  d (new KApplicationPrivate())
+  d (new TDEApplicationPrivate())
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -793,7 +793,7 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const TQCSt
 }
 #endif
 
-int KApplication::xioErrhandler( Display* dpy )
+int TDEApplication::xioErrhandler( Display* dpy )
 {
     if(kapp)
     {
@@ -808,7 +808,7 @@ int KApplication::xioErrhandler( Display* dpy )
     return 0;
 }
 
-int KApplication::xErrhandler( Display* dpy, void* err_ )
+int TDEApplication::xErrhandler( Display* dpy, void* err_ )
 { // no idea how to make forward decl. for XErrorEvent
 #ifdef Q_WS_X11
     XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
@@ -821,7 +821,7 @@ int KApplication::xErrhandler( Display* dpy, void* err_ )
     return 0;
 }
 
-void KApplication::iceIOErrorHandler( _IceConn *conn )
+void TDEApplication::iceIOErrorHandler( _IceConn *conn )
 {
     emit shutDown();
 
@@ -846,7 +846,7 @@ public:
   }
 };
 
-void KApplication::init(bool GUIenabled)
+void TDEApplication::init(bool GUIenabled)
 {
   d->guiEnabled = GUIenabled;
   if ((getuid() != geteuid()) ||
@@ -1030,7 +1030,7 @@ void KApplication::init(bool GUIenabled)
   }
   d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler );
 #elif defined(Q_WS_WIN)
-  KApplication_init_windows(GUIenabled);
+  TDEApplication_init_windows(GUIenabled);
 #else
   // FIXME(E): Implement for Qt Embedded
 #endif
@@ -1057,7 +1057,7 @@ static int my_system (const char *command) {
 }
 
 
-DCOPClient *KApplication::dcopClient()
+DCOPClient *TDEApplication::dcopClient()
 {
   if (s_DCOPClient)
     return s_DCOPClient;
@@ -1081,7 +1081,7 @@ DCOPClient *KApplication::dcopClient()
   return s_DCOPClient;
 }
 
-void KApplication::dcopClientPostInit()
+void TDEApplication::dcopClientPostInit()
 {
   if( s_dcopClientNeedsPostInit )
     {
@@ -1092,7 +1092,7 @@ void KApplication::dcopClientPostInit()
     }
 }
 
-void KApplication::dcopAutoRegistration()
+void TDEApplication::dcopAutoRegistration()
 {
   if (autoDcopRegistration)
      {
@@ -1102,12 +1102,12 @@ void KApplication::dcopAutoRegistration()
      }
 }
 
-void KApplication::disableAutoDcopRegistration()
+void TDEApplication::disableAutoDcopRegistration()
 {
   autoDcopRegistration = false;
 }
 
-KConfig* KApplication::sessionConfig()
+KConfig* TDEApplication::sessionConfig()
 {
     if (pSessionConfig)
         return pSessionConfig;
@@ -1117,16 +1117,16 @@ KConfig* KApplication::sessionConfig()
     return pSessionConfig;
 }
 
-void KApplication::ref()
+void TDEApplication::ref()
 {
     d->refCount++;
-    //kdDebug() << "KApplication::ref() : refCount = " << d->refCount << endl;
+    //kdDebug() << "TDEApplication::ref() : refCount = " << d->refCount << endl;
 }
 
-void KApplication::deref()
+void TDEApplication::deref()
 {
     d->refCount--;
-    //kdDebug() << "KApplication::deref() : refCount = " << d->refCount << endl;
+    //kdDebug() << "TDEApplication::deref() : refCount = " << d->refCount << endl;
     if ( d->refCount <= 0 )
         quit();
 }
@@ -1153,11 +1153,11 @@ bool KSessionManaged::commitData(TQSessionManager&)
 }
 
 
-void KApplication::disableSessionManagement() {
+void TDEApplication::disableSessionManagement() {
   bSessionManagement = false;
 }
 
-void KApplication::enableSessionManagement() {
+void TDEApplication::enableSessionManagement() {
   bSessionManagement = true;
 #ifdef Q_WS_X11
   // Session management support in Qt/TDE is awfully broken.
@@ -1181,7 +1181,7 @@ void KApplication::enableSessionManagement() {
 }
 
 
-bool KApplication::requestShutDown(
+bool TDEApplication::requestShutDown(
     ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode )
 {
 #ifdef Q_WS_X11
@@ -1244,7 +1244,7 @@ bool KApplication::requestShutDown(
 #endif
 }
 
-void KApplication::propagateSessionManager()
+void TDEApplication::propagateSessionManager()
 {
 #ifdef Q_WS_X11
     TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
@@ -1279,7 +1279,7 @@ void KApplication::propagateSessionManager()
 #endif
 }
 
-void KApplication::commitData( TQSessionManager& sm )
+void TDEApplication::commitData( TQSessionManager& sm )
 {
     d->session_save = true;
     bool canceled = false;
@@ -1352,7 +1352,7 @@ static void checkRestartVersion( TQSessionManager& sm )
     sm.setRestartCommand( restartCommand );
 }
 
-void KApplication::saveState( TQSessionManager& sm )
+void TDEApplication::saveState( TQSessionManager& sm )
 {
     d->session_save = true;
 #ifdef Q_WS_X11
@@ -1434,12 +1434,12 @@ void KApplication::saveState( TQSessionManager& sm )
     d->session_save = false;
 }
 
-bool KApplication::sessionSaving() const
+bool TDEApplication::sessionSaving() const
 {
     return d->session_save;
 }
 
-void KApplication::startKdeinit()
+void TDEApplication::startKdeinit()
 {
 #ifndef Q_WS_WIN //TODO
   KInstance inst( "starttdeinitlock" );
@@ -1464,7 +1464,7 @@ void KApplication::startKdeinit()
 #endif
 }
 
-void KApplication::dcopFailure(const TQString &msg)
+void TDEApplication::dcopFailure(const TQString &msg)
 {
   static int failureCount = 0;
   failureCount++;
@@ -1560,13 +1560,13 @@ static const KCmdLineOptions kde_options[] =
 };
 
 void
-KApplication::addCmdLineOptions()
+TDEApplication::addCmdLineOptions()
 {
    TDECmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
    TDECmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
 }
 
-void KApplication::parseCommandLine( )
+void TDEApplication::parseCommandLine( )
 {
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde");
 
@@ -1686,12 +1686,12 @@ void KApplication::parseCommandLine( )
 
 }
 
-TQString KApplication::geometryArgument() const
+TQString TDEApplication::geometryArgument() const
 {
     return d->geometry_arg;
 }
 
-TQPixmap KApplication::icon() const
+TQPixmap TDEApplication::icon() const
 {
   if( !aIconPixmap.pm.icon) {
       aIconPixmap.pm.icon = new TQPixmap;
@@ -1702,12 +1702,12 @@ TQPixmap KApplication::icon() const
   return *aIconPixmap.pm.icon;
 }
 
-TQString KApplication::iconName() const
+TQString TDEApplication::iconName() const
 {
   return aIconName.isNull() ? (TQString)instanceName() : aIconName;
 }
 
-TQPixmap KApplication::miniIcon() const
+TQPixmap TDEApplication::miniIcon() const
 {
   if (!aIconPixmap.pm.miniIcon) {
       aIconPixmap.pm.miniIcon = new TQPixmap;
@@ -1718,14 +1718,14 @@ TQPixmap KApplication::miniIcon() const
   return *aIconPixmap.pm.miniIcon;
 }
 
-TQString KApplication::miniIconName() const
+TQString TDEApplication::miniIconName() const
 {
   return aMiniIconName.isNull() ? (TQString)instanceName() : aMiniIconName;
 }
 
 extern void kDebugCleanup();
 
-KApplication::~KApplication()
+TDEApplication::~TDEApplication()
 {
   delete aIconPixmap.pm.miniIcon;
   aIconPixmap.pm.miniIcon = 0L;
@@ -1784,7 +1784,7 @@ public:
 #endif
 
 #if defined(Q_WS_X11) && defined(COMPOSITE)
-bool KApplication::isCompositionManagerAvailable() {
+bool TDEApplication::isCompositionManagerAvailable() {
 	bool have_manager = false;
 	const char *home;
 	struct passwd *p;
@@ -1816,7 +1816,7 @@ bool KApplication::isCompositionManagerAvailable() {
 	return have_manager;
 }
 
-bool KApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
+bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
 	bool compositing_manager_available;
 	if (force_available) {
 		compositing_manager_available = available;
@@ -1895,7 +1895,7 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool
 	return compositing_manager_available;
 }
 
-Display* KApplication::openX11RGBADisplay() {
+Display* TDEApplication::openX11RGBADisplay() {
 	TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
 	char *display = 0;
 	if ( qtargs->isSet("display"))
@@ -1910,9 +1910,9 @@ Display* KApplication::openX11RGBADisplay() {
 	return dpy;
 }
 
-Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
+Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
 	getX11RGBAInformation(dpy);
-	if (KApplication::isCompositionManagerAvailable() == true) {
+	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_visual;
 	}
 	else {
@@ -1920,9 +1920,9 @@ Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
 	}
 }
 
-Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
+Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
 	getX11RGBAInformation(dpy);
-	if (KApplication::isCompositionManagerAvailable() == true) {
+	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_colormap;
 	}
 	else {
@@ -1930,11 +1930,11 @@ Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
 	}
 }
 
-bool KApplication::isX11CompositionAvailable() {
+bool TDEApplication::isX11CompositionAvailable() {
 	return (argb_visual & isCompositionManagerAvailable());
 }
 
-void KApplication::getX11RGBAInformation(Display *dpy) {
+void TDEApplication::getX11RGBAInformation(Display *dpy) {
 	if ( !dpy ) {
 		argb_visual = false;
 		return;
@@ -1976,14 +1976,14 @@ void KApplication::getX11RGBAInformation(Display *dpy) {
 	return;
 }
 #else
-void KApplication::getX11RGBAInformation(Display *dpy) {
+void TDEApplication::getX11RGBAInformation(Display *dpy) {
 }
 
-bool KApplication::isCompositionManagerAvailable() {
+bool TDEApplication::isCompositionManagerAvailable() {
 	return false;
 }
 
-bool KApplication::detectCompositionManagerAvailable(bool force_available) {
+bool TDEApplication::detectCompositionManagerAvailable(bool force_available) {
 	const char *home;
 	struct passwd *p;
 	p = getpwuid(getuid());
@@ -2021,36 +2021,36 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available) {
 	return false;
 }
 
-Display* KApplication::openX11RGBADisplay() {
+Display* TDEApplication::openX11RGBADisplay() {
 	return 0;
 }
 
-Qt::HANDLE KApplication::getX11RGBAVisual(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) {
 	return 0;
 }
 
-Qt::HANDLE KApplication::getX11RGBAColormap(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) {
 	return 0;
 }
 
-bool KApplication::isX11CompositionAvailable() {
+bool TDEApplication::isX11CompositionAvailable() {
 	return false;
 }
 
-KApplication KApplication::KARGBApplication( bool allowStyles ) {
-	return KApplication::KApplication(allowStyles, true);
+TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) {
+	return TDEApplication::TDEApplication(allowStyles, true);
 }
 #endif
 
 static bool kapp_block_user_input = false;
 
-void KApplication::dcopBlockUserInput( bool b )
+void TDEApplication::dcopBlockUserInput( bool b )
 {
     kapp_block_user_input = b;
 }
 
 #ifdef Q_WS_X11
-bool KApplication::x11EventFilter( XEvent *_event )
+bool TDEApplication::x11EventFilter( XEvent *_event )
 {
     switch ( _event->type ) {
         case ClientMessage:
@@ -2185,7 +2185,7 @@ bool KApplication::x11EventFilter( XEvent *_event )
 }
 #endif // Q_WS_X11
 
-void KApplication::updateUserTimestamp( unsigned long time )
+void TDEApplication::updateUserTimestamp( unsigned long time )
 {
 #if defined Q_WS_X11
     if( time == 0 )
@@ -2205,7 +2205,7 @@ void KApplication::updateUserTimestamp( unsigned long time )
 #endif
 }
 
-unsigned long KApplication::userTimestamp() const
+unsigned long TDEApplication::userTimestamp() const
 {
 #if defined Q_WS_X11
     return GET_QT_X_USER_TIME();
@@ -2214,7 +2214,7 @@ unsigned long KApplication::userTimestamp() const
 #endif
 }
 
-void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time )
+void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time )
 {
 #if defined Q_WS_X11
     if( time == 0 )
@@ -2223,7 +2223,7 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned
 #endif
 }
 
-void KApplication::invokeEditSlot( const char *slot )
+void TDEApplication::invokeEditSlot( const char *slot )
 {
   TQObject *object = TQT_TQOBJECT(focusWidget());
   if( !object )
@@ -2238,7 +2238,7 @@ void KApplication::invokeEditSlot( const char *slot )
   object->tqt_invoke( idx, 0 );
 }
 
-void KApplication::addKipcEventMask(int id)
+void TDEApplication::addKipcEventMask(int id)
 {
     if (id >= 32)
     {
@@ -2248,7 +2248,7 @@ void KApplication::addKipcEventMask(int id)
     kipcEventMask |= (1 << id);
 }
 
-void KApplication::removeKipcEventMask(int id)
+void TDEApplication::removeKipcEventMask(int id)
 {
     if (id >= 32)
     {
@@ -2258,7 +2258,7 @@ void KApplication::removeKipcEventMask(int id)
     kipcEventMask &= ~(1 << id);
 }
 
-void KApplication::enableStyles()
+void TDEApplication::enableStyles()
 {
     if (!useStyles)
     {
@@ -2267,12 +2267,12 @@ void KApplication::enableStyles()
     }
 }
 
-void KApplication::disableStyles()
+void TDEApplication::disableStyles()
 {
     useStyles = false;
 }
 
-void KApplication::applyGUIStyle()
+void TDEApplication::applyGUIStyle()
 {
     if ( !useStyles ) return;
 
@@ -2299,7 +2299,7 @@ void KApplication::applyGUIStyle()
     kdisplaySetPalette();
 }
 
-TQString KApplication::caption() const
+TQString TDEApplication::caption() const
 {
   // Caption set from command line ?
   if( !aCaption.isNull() )
@@ -2318,7 +2318,7 @@ TQString KApplication::caption() const
 // 1999-09-20: Espen Sand
 // An attempt to simplify consistent captions.
 //
-TQString KApplication::makeStdCaption( const TQString &userCaption,
+TQString TDEApplication::makeStdCaption( const TQString &userCaption,
                                       bool withAppName, bool modified ) const
 {
   TQString s = userCaption.isEmpty() ? caption() : userCaption;
@@ -2337,14 +2337,14 @@ TQString KApplication::makeStdCaption( const TQString &userCaption,
   return s;
 }
 
-TQPalette KApplication::createApplicationPalette()
+TQPalette TDEApplication::createApplicationPalette()
 {
     KConfig *config = KGlobal::config();
     KConfigGroupSaver saver( config, "General" );
     return createApplicationPalette( config, KGlobalSettings::contrast() );
 }
 
-TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ )
+TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ )
 {
     TQColor trinity4Background( 239, 239, 239 );
     TQColor trinity4Blue( 103,141,178 );
@@ -2435,7 +2435,7 @@ TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_
 }
 
 
-void KApplication::kdisplaySetPalette()
+void TDEApplication::kdisplaySetPalette()
 {
 #ifdef Q_WS_MACX
     //Can I have this on other platforms, please!? --Sam
@@ -2453,7 +2453,7 @@ void KApplication::kdisplaySetPalette()
 }
 
 
-void KApplication::kdisplaySetFont()
+void TDEApplication::kdisplaySetFont()
 {
     TQApplication::setFont(KGlobalSettings::generalFont(), true);
     TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
@@ -2471,7 +2471,7 @@ void KApplication::kdisplaySetFont()
 }
 
 
-void KApplication::kdisplaySetStyle()
+void TDEApplication::kdisplaySetStyle()
 {
     if (useStyles)
     {
@@ -2482,7 +2482,7 @@ void KApplication::kdisplaySetStyle()
 }
 
 
-void KApplication::propagateSettings(SettingsCategory arg)
+void TDEApplication::propagateSettings(SettingsCategory arg)
 {
     KConfigBase* config = KGlobal::config();
     KConfigGroupSaver saver( config, "KDE" );
@@ -2524,7 +2524,7 @@ void KApplication::propagateSettings(SettingsCategory arg)
     emit settingsChanged(arg);
 }
 
-void KApplication::installKDEPropertyMap()
+void TDEApplication::installKDEPropertyMap()
 {
 #ifndef QT_NO_SQL
     static bool installed = false;
@@ -2566,7 +2566,7 @@ void KApplication::installKDEPropertyMap()
 #endif
 }
 
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
                                const TQString& _appname) const
 {
     return invokeHelp( anchor, _appname, "" );
@@ -2575,7 +2575,7 @@ void KApplication::invokeHelp( const TQString& anchor,
 #ifndef Q_WS_WIN
 // for win32 we're using simple help tools like Qt Assistant,
 // see kapplication_win.cpp
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
                                const TQString& _appname,
                                const TQCString& startup_id ) const
 {
@@ -2609,7 +2609,7 @@ void KApplication::invokeHelp( const TQString& anchor,
 }
 #endif
 
-void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const
+void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const
 {
    kdWarning() << "invoking HTML help is deprecated! use docbook and invokeHelp!\n";
 
@@ -2644,28 +2644,28 @@ void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& to
 }
 
 
-void KApplication::invokeMailer(const TQString &address, const TQString &subject)
+void TDEApplication::invokeMailer(const TQString &address, const TQString &subject)
 {
     return invokeMailer(address,subject,"");
 }
 
-void KApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id)
+void TDEApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id)
 {
    invokeMailer(address, TQString::null, TQString::null, subject, TQString::null, TQString::null,
        TQStringList(), startup_id );
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL)
+void TDEApplication::invokeMailer(const KURL &mailtoURL)
 {
     return invokeMailer( mailtoURL, "" );
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id )
+void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id )
 {
     return invokeMailer( mailtoURL, startup_id, false);
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments )
+void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments )
 {
    TQString address = KURL::decode_string(mailtoURL.path()), subject, cc, bcc, body;
    TQStringList queries = TQStringList::split('&', mailtoURL.query().mid(1));
@@ -2698,7 +2698,7 @@ void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_
    invokeMailer( address, cc, bcc, subject, body, TQString::null, attachURLs, startup_id );
 }
 
-void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
+void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & messageFile, const TQStringList &attachURLs)
 {
@@ -2780,7 +2780,7 @@ static TQStringList splitEmailAddressList( const TQString & aStr )
   return list;
 }
 
-void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc,
+void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & /*messageFile TODO*/, const TQStringList &attachURLs,
                                 const TQCString& startup_id )
@@ -2913,7 +2913,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
 }
 #endif
 
-void KApplication::invokeBrowser( const TQString &url )
+void TDEApplication::invokeBrowser( const TQString &url )
 {
     return invokeBrowser( url, "" );
 }
@@ -2921,7 +2921,7 @@ void KApplication::invokeBrowser( const TQString &url )
 #ifndef Q_WS_WIN
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
-void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
+void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
 {
    TQString error;
 
@@ -2937,38 +2937,38 @@ void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_
 }
 #endif
 
-void KApplication::cut()
+void TDEApplication::cut()
 {
   invokeEditSlot( TQT_SLOT( cut() ) );
 }
 
-void KApplication::copy()
+void TDEApplication::copy()
 {
   invokeEditSlot( TQT_SLOT( copy() ) );
 }
 
-void KApplication::paste()
+void TDEApplication::paste()
 {
   invokeEditSlot( TQT_SLOT( paste() ) );
 }
 
-void KApplication::clear()
+void TDEApplication::clear()
 {
   invokeEditSlot( TQT_SLOT( clear() ) );
 }
 
-void KApplication::selectAll()
+void TDEApplication::selectAll()
 {
   invokeEditSlot( TQT_SLOT( selectAll() ) );
 }
 
-void KApplication::broadcastKeyCode(unsigned int keyCode)
+void TDEApplication::broadcastKeyCode(unsigned int keyCode)
 {
   emit coreFakeKeyPress(keyCode);
 }
 
 TQCString
-KApplication::launcher()
+TDEApplication::launcher()
 {
    return "klauncher";
 }
@@ -3010,7 +3010,7 @@ startServiceInternal( const TQCString &function,
    stream << _name << URLs;
    TQCString replyType;
    TQByteArray replyData;
-   TQCString _launcher = KApplication::launcher();
+   TQCString _launcher = TDEApplication::launcher();
    TQValueList<TQCString> envs;
 #ifdef Q_WS_X11
    if (tqt_xdisplay()) {
@@ -3057,7 +3057,7 @@ startServiceInternal( const TQCString &function,
 }
 
 int
-KApplication::startServiceByName( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByName( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3069,7 +3069,7 @@ KApplication::startServiceByName( const TQString& _name, const TQString &URL,
 }
 
 int
-KApplication::startServiceByName( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByName( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3078,7 +3078,7 @@ KApplication::startServiceByName( const TQString& _name, const TQStringList &URL
 }
 
 int
-KApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3090,7 +3090,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQString &
 }
 
 int
-KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3099,7 +3099,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringLi
 }
 
 int
-KApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3111,7 +3111,7 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQString &
 }
 
 int
-KApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3120,14 +3120,14 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
 }
 
 int
-KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid )
 {
     return tdeinitExec( name, args, error, pid, "" );
 }
 
 int
-KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid, const TQCString& startup_id )
 {
    return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
@@ -3135,27 +3135,27 @@ KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
 }
 
 int
-KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid )
 {
     return tdeinitExecWait( name, args, error, pid, "" );
 }
 
 int
-KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid, const TQCString& startup_id )
 {
    return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
         name, args, error, 0, pid, startup_id, false);
 }
 
-TQString KApplication::tempSaveName( const TQString& pFilename ) const
+TQString TDEApplication::tempSaveName( const TQString& pFilename ) const
 {
   TQString aFilename;
 
   if( TQDir::isRelativePath(pFilename) )
     {
-      kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl;
+      kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl;
       aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath();
     }
   else
@@ -3177,14 +3177,14 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const
 }
 
 
-TQString KApplication::checkRecoverFile( const TQString& pFilename,
+TQString TDEApplication::checkRecoverFile( const TQString& pFilename,
         bool& bRecover ) const
 {
   TQString aFilename;
 
   if( TQDir::isRelativePath(pFilename) )
     {
-      kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl;
+      kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl;
       aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath();
     }
   else
@@ -3249,7 +3249,7 @@ bool checkAccess(const TQString& pathname, int mode)
     return false; // No
 }
 
-void KApplication::setTopWidget( TQWidget *topWidget )
+void TDEApplication::setTopWidget( TQWidget *topWidget )
 {
   if( !topWidget )
       return;
@@ -3270,12 +3270,12 @@ void KApplication::setTopWidget( TQWidget *topWidget )
 #endif
 }
 
-TQCString KApplication::startupId() const
+TQCString TDEApplication::startupId() const
 {
     return d->startup_id;
 }
 
-void KApplication::setStartupId( const TQCString& startup_id )
+void TDEApplication::setStartupId( const TQCString& startup_id )
 {
     if( startup_id == d->startup_id )
         return;
@@ -3299,7 +3299,7 @@ void KApplication::setStartupId( const TQCString& startup_id )
 
 // read the startup notification env variable, save it and unset it in order
 // not to propagate it to processes started from this app
-void KApplication::read_app_startup_id()
+void TDEApplication::read_app_startup_id()
 {
 #if defined Q_WS_X11
     KStartupInfoId id = KStartupInfo::currentStartupIdEnv();
@@ -3308,7 +3308,7 @@ void KApplication::read_app_startup_id()
 #endif
 }
 
-int KApplication::random()
+int TDEApplication::random()
 {
    static bool init = false;
    if (!init)
@@ -3328,7 +3328,7 @@ int KApplication::random()
    return rand();
 }
 
-TQString KApplication::randomString(int length)
+TQString TDEApplication::randomString(int length)
 {
    if (length <=0 ) return TQString::null;
 
@@ -3346,7 +3346,7 @@ TQString KApplication::randomString(int length)
    return str;
 }
 
-bool KApplication::authorize(const TQString &genericAction)
+bool TDEApplication::authorize(const TQString &genericAction)
 {
    if (!d->actionRestrictions)
       return true;
@@ -3356,7 +3356,7 @@ bool KApplication::authorize(const TQString &genericAction)
    return config->readBoolEntry(genericAction, true);
 }
 
-bool KApplication::authorizeKAction(const char *action)
+bool TDEApplication::authorizeKAction(const char *action)
 {
    if (!d->actionRestrictions || !action)
       return true;
@@ -3366,7 +3366,7 @@ bool KApplication::authorizeKAction(const char *action)
    return authorize(action_prefix + action);
 }
 
-bool KApplication::authorizeControlModule(const TQString &menuId)
+bool TDEApplication::authorizeControlModule(const TQString &menuId)
 {
    if (menuId.isEmpty() || kde_kiosk_exception)
       return true;
@@ -3375,7 +3375,7 @@ bool KApplication::authorizeControlModule(const TQString &menuId)
    return config->readBoolEntry(menuId, true);
 }
 
-TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds)
+TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds)
 {
    KConfig *config = KGlobal::config();
    KConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
@@ -3389,41 +3389,41 @@ TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds)
    return result;
 }
 
-void KApplication::initUrlActionRestrictions()
+void TDEApplication::initUrlActionRestrictions()
 {
   d->urlActionRestrictions.setAutoDelete(true);
   d->urlActionRestrictions.clear();
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("open", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
 // TEST:
-//  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+//  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
 //  ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, false));
-//  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+//  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
 //  ("list", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQDir::homeDirPath(), true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("link", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true));
 
   // We allow redirections to file: but not from internet protocols, redirecting to file:
   // is very popular among io-slaves and we don't want to break them
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", ":internet", TQString::null, TQString::null, "file", TQString::null, TQString::null, false));
 
   // local protocols may redirect everywhere
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", ":local", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
 
   // Anyone may redirect to about:
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "about", TQString::null, TQString::null, true));
 
   // Anyone may redirect to itself, cq. within it's own group
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true));
 
   KConfig *config = KGlobal::config();
@@ -3461,22 +3461,22 @@ void KApplication::initUrlActionRestrictions()
     if (urlPath.startsWith("$TMP"))
        urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
 
-    d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
+    d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule
     	( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled));
   }
 }
 
-void KApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
+void TDEApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
 {
   if (authorizeURLAction(action, _baseURL, _destURL))
      return;
 
-  d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule
         ( action, _baseURL.protocol(), _baseURL.host(), _baseURL.path(-1),
                   _destURL.protocol(), _destURL.host(), _destURL.path(-1), true));
 }
 
-bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
+bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
 {
   if (_destURL.isEmpty())
      return true;
@@ -3492,7 +3492,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU
   destURL.setPath(TQDir::cleanDirPath(destURL.path()));
   TQString destClass = KProtocolInfo::protocolClass(destURL.protocol());
 
-  for(KApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first();
+  for(TDEApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first();
       rule; rule = d->urlActionRestrictions.next())
   {
      if ((result != rule->permission) && // No need to check if it doesn't make a difference
@@ -3507,7 +3507,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU
 }
 
 
-uint KApplication::keyboardModifiers()
+uint TDEApplication::keyboardModifiers()
 {
 #ifdef Q_WS_X11
     Window root;
@@ -3525,7 +3525,7 @@ uint KApplication::keyboardModifiers()
 #endif
 }
 
-uint KApplication::mouseState()
+uint TDEApplication::mouseState()
 {
     uint mousestate;
 #ifdef Q_WS_X11
@@ -3550,7 +3550,7 @@ uint KApplication::mouseState()
     return mousestate & 0xff00;
 }
 
-TQ_ButtonState KApplication::keyboardMouseState()
+TQ_ButtonState TDEApplication::keyboardMouseState()
 {
     int ret = 0;
 #ifdef Q_WS_X11
@@ -3597,7 +3597,7 @@ TQ_ButtonState KApplication::keyboardMouseState()
     return static_cast< ButtonState >( ret );
 }
 
-void KApplication::installSigpipeHandler()
+void TDEApplication::installSigpipeHandler()
 {
 #ifdef Q_OS_UNIX
     struct sigaction act;
@@ -3608,7 +3608,7 @@ void KApplication::installSigpipeHandler()
 #endif
 }
 
-void KApplication::sigpipeHandler(int)
+void TDEApplication::sigpipeHandler(int)
 {
     int saved_errno = errno;
     // Using kdDebug from a signal handler is not a good idea.
@@ -3624,12 +3624,12 @@ void KApplication::sigpipeHandler(int)
     errno = saved_errno;
 }
 
-bool KApplication::guiEnabled()
+bool TDEApplication::guiEnabled()
 {
     return kapp && kapp->d->guiEnabled;
 }
 
-void KApplication::virtual_hook( int id, void* data )
+void TDEApplication::virtual_hook( int id, void* data )
 { KInstance::virtual_hook( id, data ); }
 
 void KSessionManaged::virtual_hook( int, void* )
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index 6793c9510..89aaab2e2 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -48,9 +48,9 @@ class KSessionManaged;
 class KStyle;
 class KURL;
 
-#define kapp KApplication::kApplication()
+#define kapp TDEApplication::kApplication()
 
-class KApplicationPrivate;
+class TDEApplicationPrivate;
 
 /**
 * Controls and provides information to all KDE applications.
@@ -68,10 +68,10 @@ class KApplicationPrivate;
 * @li Installs a signal handler for the SIGCHLD signal in order to
 * avoid zombie children. If you want to catch this signal yourself or
 * don't want it to be caught at all, you have set a new signal handler
-* (or SIG_IGN) after KApplication's constructor has run.
+* (or SIG_IGN) after TDEApplication's constructor has run.
 * @li Installs an empty signal handler for the SIGPIPE signal using
 * installSigpipeHandler(). If you want to catch this signal
-* yourself, you have set a new signal handler after KApplication's
+* yourself, you have set a new signal handler after TDEApplication's
 * constructor has run.
 * @li It can start new services
 *
@@ -93,7 +93,7 @@ class KApplicationPrivate;
 * @short Controls and provides information to all KDE applications.
 * @author Matthias Kalle Dalheimer <kalle@kde.org>
 */
-class TDECORE_EXPORT KApplication : public TQApplication, public KInstance
+class TDECORE_EXPORT TDEApplication : public TQApplication, public KInstance
 {
 
   Q_OBJECT
@@ -115,9 +115,9 @@ public:
    *
    * If ARGB (transparent) widgets are to be used in your application,
    * please use
-   * KApplication app(KApplication::openX11RGBADisplay());
+   * TDEApplication app(TDEApplication::openX11RGBADisplay());
    * or
-   * KApplication app(KApplication::openX11RGBADisplay(), useStyles);
+   * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles);
    *
    * @param allowStyles Set to false to disable the loading on plugin based
    * styles. This is only useful to applications that do not display a GUI
@@ -128,7 +128,7 @@ public:
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
    */
-  KApplication( bool allowStyles=true, bool GUIenabled=true);
+  TDEApplication( bool allowStyles=true, bool GUIenabled=true);
 
 #ifdef Q_WS_X11
   /**
@@ -148,7 +148,7 @@ public:
    * 
    * @see RGBADisplay()
    */
-  KApplication(Display *display, bool allowStyles);
+  TDEApplication(Display *display, bool allowStyles);
 
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
@@ -177,7 +177,7 @@ public:
    * 
    * @see RGBADisplay()
    */
-  KApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles);
+  TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles);
 
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
@@ -202,11 +202,11 @@ public:
    *
    * @since KDE 3.3
    */
-  KApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0,
+  TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0,
                bool allowStyles=true);
 
   /**
-   * Constructor. Parses command-line arguments. Use this constructor to use KApplication
+   * Constructor. Parses command-line arguments. Use this constructor to use TDEApplication
    * in a Motif or Xt program.
    *
    * @param display Will be passed to Qt as the X display. The display must be valid and already
@@ -229,7 +229,7 @@ public:
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
    */
-  KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
+  TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
                bool allowStyles=true, bool GUIenabled=true);
 #endif
 
@@ -257,7 +257,7 @@ public:
    */
   // REMOVE FOR KDE 4.0 - using it only gives crashing applications because
   // TDECmdLineArgs::init isn't called
- KApplication(int& argc, char** argv,
+ TDEApplication(int& argc, char** argv,
               const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED;
 
   /**
@@ -265,19 +265,19 @@ public:
     */
   static void addCmdLineOptions();
 
-  virtual ~KApplication();
+  virtual ~TDEApplication();
 
   /**
    * Returns the current application object.
    *
    * This is similar to the global TQApplication pointer tqApp. It
-   * allows access to the single global KApplication object, since
+   * allows access to the single global TDEApplication object, since
    * more than one cannot be created in the same application. It
    * saves you the trouble of having to pass the pointer explicitly
    * to every function that may require it.
    * @return the current application object
    */
-  static KApplication* kApplication() { return KApp; }
+  static TDEApplication* kApplication() { return KApp; }
 
   /**
    * Returns the application session config object.
@@ -450,7 +450,7 @@ public:
 
   /**
    * Disable automatic dcop registration
-   * Must be called before creating a KApplication instance to have an effect.
+   * Must be called before creating a TDEApplication instance to have an effect.
    */
   static void disableAutoDcopRegistration();
 
@@ -951,10 +951,10 @@ public:
   /**
    * @internal
    * Opens the display
-   * This can be used to initialize a KApplication with RGBA support like this:
-   * KApplication app(KApplication::openX11RGBADisplay());
+   * This can be used to initialize a TDEApplication with RGBA support like this:
+   * TDEApplication app(TDEApplication::openX11RGBADisplay());
    * or
-   * KApplication app(KApplication::openX11RGBADisplay(), useStyles);
+   * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles);
    */
    static Display* openX11RGBADisplay();
 
@@ -978,7 +978,7 @@ public:
    * You must first call getX11RGBAInformation()
    * 
    * Note that getX11RGBAInformation() has already
-   * been called if you used the default KApplication
+   * been called if you used the default TDEApplication
    * constructor.
    *
    * Additionally, at least one application must have called
@@ -994,7 +994,7 @@ public:
    * Enables style plugins.
    *
    * This is useful only to applications that normally
-   * do not display a GUI and create the KApplication with
+   * do not display a GUI and create the TDEApplication with
    * allowStyles set to false.
    */
   void enableStyles();
@@ -1215,7 +1215,7 @@ public:
 
 public slots:
   /**
-   * Tells KApplication about one more operation that should be finished
+   * Tells TDEApplication about one more operation that should be finished
    * before the application exits. The standard behavior is to exit on the
    * "last window closed" event, but some events should outlive the last window closed
    * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
@@ -1223,7 +1223,7 @@ public slots:
   void ref();
 
   /**
-   * Tells KApplication that one operation such as those described in ref() just finished.
+   * Tells TDEApplication that one operation such as those described in ref() just finished.
    * The application exits if the counter is back to 0.
    */
   void deref();
@@ -1232,13 +1232,13 @@ protected:
   /**
    * @internal Used by KUniqueApplication
    */
-  KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance );
+  TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance );
 
 #ifdef Q_WS_X11
   /**
    * @internal Used by KUniqueApplication
    */
-  KApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
+  TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
 		  bool allowStyles, KInstance* _instance );
 
   /**
@@ -1252,7 +1252,7 @@ protected:
   int kipcEventMask;
 
   /// Current application object.
-  static KApplication *KApp;
+  static TDEApplication *KApp;
   int pArgc;
 
   /**
@@ -1261,8 +1261,8 @@ protected:
    *
    * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() )
    *
-   * This method can be used in KApplication subclasses to implement application wide
-   * edit actions not supported by the KApplication class.  For example (in your subclass):
+   * This method can be used in TDEApplication subclasses to implement application wide
+   * edit actions not supported by the TDEApplication class.  For example (in your subclass):
    *
    * \code
    * void MyApplication::deselect()
@@ -1386,7 +1386,7 @@ public:
    * Installs a handler for the SIGPIPE signal. It is thrown when you write to
    * a pipe or socket that has been closed.
    * The handler is installed automatically in the constructor, but you may
-   * need it if your application or component does not have a KApplication
+   * need it if your application or component does not have a TDEApplication
    * instance.
    */
   static void installSigpipeHandler();
@@ -1401,7 +1401,7 @@ public:
 
 signals:
   /**
-   * Emitted when KApplication has changed its palette due to a KControl request.
+   * Emitted when TDEApplication has changed its palette due to a KControl request.
    *
    * Normally, widgets will update their palette automatically, but you
    * should connect to this to program special behavior.
@@ -1409,7 +1409,7 @@ signals:
   void kdisplayPaletteChanged();
 
   /**
-   * Emitted when KApplication has changed its GUI style in response to a KControl request.
+   * Emitted when TDEApplication has changed its GUI style in response to a KControl request.
    *
    * Normally, widgets will update their styles automatically (as they would
    * respond to an explicit setGUIStyle() call), but you should connect to
@@ -1418,7 +1418,7 @@ signals:
   void kdisplayStyleChanged();
 
   /**
-   * Emitted when KApplication has changed its font in response to a KControl request.
+   * Emitted when TDEApplication has changed its font in response to a KControl request.
    *
    * Normally widgets will update their fonts automatically, but you should
    * connect to this to monitor global font changes, especially if you are
@@ -1431,7 +1431,7 @@ signals:
   void kdisplayFontChanged();
 
   /**
-   * Emitted when KApplication has changed either its GUI style, its font or its palette
+   * Emitted when TDEApplication has changed either its GUI style, its font or its palette
    * in response to a kdisplay request. Normally, widgets will update their styles
    * automatically, but you should connect to this to program special
    * behavior. */
@@ -1451,7 +1451,7 @@ signals:
 
   /**
    * Emitted when the global settings have been changed - see KGlobalSettings
-   * KApplication takes care of calling reparseConfiguration on KGlobal::config()
+   * TDEApplication takes care of calling reparseConfiguration on KGlobal::config()
    * so that applications/classes using this only have to re-read the configuration
    * @param category the category among the enum above
    */
@@ -1536,12 +1536,12 @@ private:
 
   int captionLayout;
 
-  KApplication(const KApplication&);
-  KApplication& operator=(const KApplication&);
+  TDEApplication(const TDEApplication&);
+  TDEApplication& operator=(const TDEApplication&);
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KApplicationPrivate* d;
+  TDEApplicationPrivate* d;
 };
 
 
@@ -1572,7 +1572,7 @@ class KSessionManagedPrivate;
 
    KSessionManaged makes it possible to provide implementations for
  TQApplication::commitData() and TQApplication::saveState(), without
-   subclassing KApplication. KMainWindow internally makes use of this.
+   subclassing TDEApplication. KMainWindow internally makes use of this.
 
    You don't need to do anything with this class when using
    KMainWindow. Instead, use KMainWindow::saveProperties(),
@@ -1591,7 +1591,7 @@ public:
     /**
        See TQApplication::saveState() for documentation.
 
-       This function is just a convenience version to avoid subclassing KApplication.
+       This function is just a convenience version to avoid subclassing TDEApplication.
 
        Return true to indicate a successful state save or false to
        indicate a problem and to halt the shutdown process (will
@@ -1601,7 +1601,7 @@ public:
     /**
        See TQApplication::commitData() for documentation.
 
-       This function is just a convenience version to avoid subclassing KApplication.
+       This function is just a convenience version to avoid subclassing TDEApplication.
 
        Return true to indicate a successful commit of data or false to
        indicate a problem and to halt the shutdown process (will
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index abf0694b4..e5b19a28c 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -32,7 +32,7 @@
 #include "shellapi.h"
 
 /**
- * MS Windows-related actions for KApplication startup.
+ * MS Windows-related actions for TDEApplication startup.
  * 
  * - Use Qt translation which will be usable for TQFileDialog 
  *    and other Qt-only GUIs. The "qt_<language>.qm" file should be stored
@@ -40,7 +40,7 @@
  *
  * @internal
 */
-void KApplication_init_windows(bool /*GUIenabled*/)
+void TDEApplication_init_windows(bool /*GUIenabled*/)
 {
 	TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() 
 		+ "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" );
@@ -54,11 +54,11 @@ void KApplication_init_windows(bool /*GUIenabled*/)
 //unsafe; create kapplication_p.h instead!
 typedef void* IceIOErrorHandler;
 
-class KApplicationPrivate
+class TDEApplicationPrivate
 {
 public:
-  KApplicationPrivate();
-  ~KApplicationPrivate();
+  TDEApplicationPrivate();
+  ~TDEApplicationPrivate();
 
   bool actionRestrictions : 1;
   bool guiEnabled : 1;
@@ -74,7 +74,7 @@ public:
   QAssistantClient* qassistantclient;
 };
 
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
 	const TQString& _appname, const TQCString& startup_id ) const
 {
 	if (!d->qassistantclient) {
@@ -90,14 +90,14 @@ void KApplication::invokeHelp( const TQString& anchor,
 
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
-void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
+void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
 {
 	TQCString s = url.latin1();
 	const unsigned short *l = (const unsigned short *)s.data();
 	ShellExecuteA(0, "open", s.data(), 0, 0, SW_NORMAL);
 }
 
-void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
+void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & /*messageFile TODO*/, const TQStringList &attachURLs,
                                 const TQCString& startup_id )
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 1e3cafbae..4d77c3da2 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -189,7 +189,7 @@ void KClipboardSynchronizer::setReverseSynchronizing( bool enable )
     self()->setupSignals();
 }
 
-// private, called by KApplication
+// private, called by TDEApplication
 void KClipboardSynchronizer::newConfiguration( int config )
 {
     s_sync = (config & Synchronize);
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 7facc86fd..c13959e61 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -40,7 +40,7 @@ class TDECORE_EXPORT KClipboardSynchronizer : public TQObject
 public:
     /** Systray widget for manipulating the clipboard. */
     friend class KlipperWidget;
-    friend class KApplication;
+    friend class TDEApplication;
 
     /**
      * Returns the KClipboardSynchronizer singleton object.
@@ -115,7 +115,7 @@ private:
 private:
     // needed by klipper
     enum Configuration { Synchronize = 1 };
-    // called by KApplication upon kipc message, invoked by klipper
+    // called by TDEApplication upon kipc message, invoked by klipper
     static void newConfiguration( int config );
 
 };
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 6550f9144..d9e564d4a 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -188,7 +188,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noK
    win32_slashify(mCwd, PATH_MAX);
 #endif
    if (!noKApp)
-      KApplication::addCmdLineOptions();
+      TDEApplication::addCmdLineOptions();
 }
 
 TQString TDECmdLineArgs::cwd()
@@ -671,7 +671,7 @@ TDECmdLineArgs::parseAllArgs()
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argc
  */
@@ -679,7 +679,7 @@ int *
 TDECmdLineArgs::tqt_argc()
 {
    if (!argsList)
-      KApplication::addCmdLineOptions(); // Lazy bastards!
+      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
    static int tqt_argc = -1;
    if( tqt_argc != -1 )
@@ -702,7 +702,7 @@ TDECmdLineArgs::tqt_argc()
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argv
  */
@@ -710,7 +710,7 @@ char ***
 TDECmdLineArgs::tqt_argv()
 {
    if (!argsList)
-      KApplication::addCmdLineOptions(); // Lazy bastards!
+      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
    static char** tqt_argv;
    if( tqt_argv != NULL )
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 0b89fd3bb..142544aeb 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -68,7 +68,7 @@ struct TDECORE_EXPORT KCmdLineOptions
 #define KCmdLineLastOption { 0, 0, 0 }
 
 class TDECmdLineArgsList;
-class KApplication;
+class TDEApplication;
 class KUniqueApplication;
 class KCmdLineParsedOptions;
 class KCmdLineParsedArgs;
@@ -107,7 +107,7 @@ class TDECmdLineArgsPrivate;
  *     ....
  *
  *     // Handle our own options/arguments
- *     // A KApplication will usually do this in main but this is not
+ *     // A TDEApplication will usually do this in main but this is not
  *     // necessary.
  *     // A KUniqueApplication might want to handle it in newInstance().
  *
@@ -221,7 +221,7 @@ class TDECmdLineArgsPrivate;
  */
 class TDECORE_EXPORT TDECmdLineArgs
 {
-  friend class KApplication;
+  friend class TDEApplication;
   friend class KUniqueApplication;
   friend class TQPtrList<TDECmdLineArgs>;
 public:
@@ -242,7 +242,7 @@ public:
    * @param _description A short description of what your application is about.
    * @param _version A version.
    * @param noKApp Set this true to not add commandline options for
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    *
    * @since 3.2
    */
@@ -270,7 +270,7 @@ public:
    * @param _argv As passed to @p main(...).
    * @param about A KAboutData object describing your program.
    * @param noKApp Set this true to not add commandline options for
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    */
   static void init(int _argc, char **_argv,
                    const KAboutData *about, bool noKApp = false);
@@ -522,8 +522,8 @@ public:
 
   /**
    *  Reset all option definitions, i.e. cancel all addCmdLineOptions calls.
-   *  Note that KApplication's options are removed too, you might want to
-   *  call KApplication::addCmdLineOptions if you want them back.
+   *  Note that TDEApplication's options are removed too, you might want to
+   *  call TDEApplication::addCmdLineOptions if you want them back.
    *
    *  You usually don't want to call this method.
    */
@@ -582,14 +582,14 @@ private:
   static void parseAllArgs();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argc
    */
   static int *tqt_argc();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argv
    */
@@ -648,7 +648,7 @@ private:
   void load( TQDataStream &);
 
   /**
-   * @internal for KApplication only
+   * @internal for TDEApplication only
    *
    * Initialize class.
    *
diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp
index 709e39de3..968c45d02 100644
--- a/tdecore/kconfig.cpp
+++ b/tdecore/kconfig.cpp
@@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   {
      TQStringList args;
      args << "--check" << updateFile;
-     KApplication::tdeinitExecWait("kconf_update", args);
+     TDEApplication::tdeinitExecWait("kconf_update", args);
      reparseConfiguration();
   }
   setGroup(oldGroup);
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index 494f997f2..eb8f8c4cf 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -43,7 +43,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase configSkeleton( "dummy1", "dummy2" );
   configSkeleton.readConfig();
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp
index b1afe7973..f15b4bb15 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/kconfig_compiler/example/example.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase *prefs = new ExamplePrefsBase("Trans1", "Folder2");
   
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp
index efb2a20a9..492d4f494 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/kconfigbackend.cpp
@@ -1178,7 +1178,7 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser)
     // Note: We don't ask the user if we should not ask this question again because we can't save the answer.
     errorMsg += i18n("Please contact your system administrator.");
     TQString cmdToExec = KStandardDirs::findExe(TQString("kdialog"));
-    KApplication *app = kapp;
+    TDEApplication *app = kapp;
     if (!cmdToExec.isEmpty() && app)
     {
       KProcess lprocess;
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 7c0706e46..600bceb69 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -1887,7 +1887,7 @@ protected:
   /**
    * Reads the locale and put in the configuration data struct.
    * Note that this should be done in the constructor, but this is not
-   * possible due to some mutual dependencies in KApplication::init()
+   * possible due to some mutual dependencies in TDEApplication::init()
    */
   void setLocale();
 
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index af9cc6dd7..4a3b778d9 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -176,7 +176,7 @@ KCrash::defaultCrashHandler (int sig)
           // we have already tested this
           argv[i++] = "--appname";
           argv[i++] = appName;
-          if (KApplication::loadedByKdeinit)
+          if (TDEApplication::loadedByKdeinit)
             argv[i++] = "--tdeinit";
 
           // only add apppath if it's not NULL
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 9f2d1458c..d3cc3c6b6 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -81,7 +81,7 @@ static TQCString getDescrFromNum(unsigned int _num)
 {
   if (!KDebugCache) {
     kdd.setObject(KDebugCache, new TQIntDict<KDebugEntry>( 601 ));
-    // Do not call this deleter from ~KApplication
+    // Do not call this deleter from ~TDEApplication
     KGlobal::unregisterStaticDeleter(&kdd);
     KDebugCache->setAutoDelete(true);
   }
@@ -175,7 +175,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
   if ( !kDebug_data )
   {
       pcd.setObject(kDebug_data, new kDebugPrivate());
-      // Do not call this deleter from ~KApplication
+      // Do not call this deleter from ~TDEApplication
       KGlobal::unregisterStaticDeleter(&pcd);
 
       // create the dcop interface if it has not been created yet
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index e7d259628..90b2e9444 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     KConfig config("twinrc", true);
     config.setGroup( "Notification Messages" );
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index d7aadbc3f..931ee6a98 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -242,7 +242,7 @@ int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
  * of other (but no less important) things.
  *
  * All KDE applications should link to the tdecore library. Also, using a
- * KApplication derived class instead of TQApplication is almost
+ * TDEApplication derived class instead of TQApplication is almost
  * mandatory if you expect your application to behave nicely within the
  * KDE environment.
  */
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index d257097bf..74cdaa603 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -266,7 +266,7 @@ TQColor KGlobalSettings::buttonTextColor()
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
+//   TDEApplication::kdisplaySetPalette()
 TQColor KGlobalSettings::baseColor()
 {
     KConfigGroup g( KGlobal::config(), "General" );
@@ -275,7 +275,7 @@ TQColor KGlobalSettings::baseColor()
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
+//   TDEApplication::kdisplaySetPalette()
 TQColor KGlobalSettings::textColor()
 {
     KConfigGroup g( KGlobal::config(), "General" );
@@ -284,7 +284,7 @@ TQColor KGlobalSettings::textColor()
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
+//   TDEApplication::kdisplaySetPalette()
 TQColor KGlobalSettings::highlightedTextColor()
 {
     KConfigGroup g( KGlobal::config(), "General" );
@@ -293,7 +293,7 @@ TQColor KGlobalSettings::highlightedTextColor()
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
+//   TDEApplication::kdisplaySetPalette()
 TQColor KGlobalSettings::highlightColor()
 {
     initColors();
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 5fef2f67a..5fad8fa5a 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -543,15 +543,15 @@ private:
      */
     static void initColors();
     /**
-     * drop cached values for fonts (called by KApplication)
+     * drop cached values for fonts (called by TDEApplication)
      */
     static void rereadFontSettings();
     /**
-     * drop cached values for paths (called by KApplication)
+     * drop cached values for paths (called by TDEApplication)
      */
     static void rereadPathSettings();
     /**
-     * drop cached values for mouse settings (called by KApplication)
+     * drop cached values for mouse settings (called by TDEApplication)
      */
     static void rereadMouseSettings();
 
@@ -578,7 +578,7 @@ private:
     static TQColor * alternateColor;
     static KMouseSettings *s_mouseSettings;
 
-    friend class KApplication;
+    friend class TDEApplication;
 };
 
 #endif
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index db5a8ff5a..998d7a97f 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -88,7 +88,7 @@ public:
      * Usually, you use the default iconloader, which can be accessed via
      * KGlobal::iconLoader(), so you hardly ever have to create an
      * iconloader object yourself. That one is the current KInstance's
-     * (typically KApplication's) iconloader.
+     * (typically TDEApplication's) iconloader.
      * @see KGlobal::iconLoader()
      * @see KInstance::iconLoader()
      */
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 56e2e0106..2d94d10c1 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -55,12 +55,12 @@ class TDECORE_EXPORT KInstance
 
     /**
      *  Constructor.
-     *  When building a KInstance that is not your KApplication,
+     *  When building a KInstance that is not your TDEApplication,
      *  make sure that the KAboutData and the KInstance have the same life time.
      *  You have to destroy both, since the instance doesn't own the about data.
      *  Don't build a KAboutData on the stack in this case !
      *  Building a KAboutData on the stack is only ok for usage with
-     *  TDECmdLineArgs and KApplication (not destroyed until the app exits).
+     *  TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
      *  @param aboutData data about this instance (see KAboutData)
      */
     KInstance( const KAboutData * aboutData );
diff --git a/tdecore/kipc.h b/tdecore/kipc.h
index 45e96f194..82bf22748 100644
--- a/tdecore/kipc.h
+++ b/tdecore/kipc.h
@@ -37,13 +37,13 @@
  * Communications Protocol.
  *
  * Messages with id code < 32 are called "System Messages". These are
- * directly handled by KApplication. Examples are: PaletteChanged and
- * StyleChanged. Messages with id code >= 32 are user messages. KApplication
+ * directly handled by TDEApplication. Examples are: PaletteChanged and
+ * StyleChanged. Messages with id code >= 32 are user messages. TDEApplication
  * emits the signal kipcMessage(id,arg) for each user message it receives.
  *
  * KIPC is implemented using X11 ClientMessage events.
  *
- * @see KApplication::kipcMessage()
+ * @see TDEApplication::kipcMessage()
  * @author Geert Jansen <jansen@kde.org>
  */
 class TDECORE_EXPORT KIPC
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index aa88db925..10df2c445 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -255,7 +255,7 @@ public:
 
     /**
      * @internal
-     * Internal Method, called by the KApplication destructor.
+     * Internal Method, called by the TDEApplication destructor.
      * Do not call it.
      * This is what makes it possible to rely on ~KLibFactory
      * being called in all cases, whether the library is unloaded
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index 15f3909b8..56f4ecd82 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -336,7 +336,7 @@ KLockFile::LockResult KLockFile::lock(int options)
      
      struct timeval tv;
      tv.tv_sec = 0;
-     tv.tv_usec = n*((KApplication::random() % 200)+100);
+     tv.tv_usec = n*((TDEApplication::random() % 200)+100);
      if (n < 2000)
         n = n * 2;
      
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index bf5b67d4c..2ee6728e6 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -32,7 +32,7 @@ class KInstance;
  * An extension to TQMimeSourceFactory that uses KIconLoader to
  * find images.
  *
- * Normally you don't have to instantiate this class at all, KApplication does that for
+ * Normally you don't have to instantiate this class at all, TDEApplication does that for
  * you automagically and sets TQMimeSourceFactory::setDefaultFactory().
  *
  * @author Peter Putzer <putzer@kde.org>
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index bfde017af..e4ae533ef 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -241,7 +241,7 @@ bool KNotifyClient::startDaemon()
   if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) {
     if( firstTry ) {
       firstTry = false;
-      return KApplication::startServiceByDesktopName(daemonName) == 0;
+      return TDEApplication::startServiceByDesktopName(daemonName) == 0;
     }
     return false;
   }
@@ -296,7 +296,7 @@ public:
 		else if (!m_instances.isEmpty())
 		{
 			kdWarning(160) << "Tried to remove an Instance that is not the current," << endl;
-			kdWarning(160) << "Resetting to the main KApplication." << endl;
+			kdWarning(160) << "Resetting to the main TDEApplication." << endl;
 			m_instances.clear();
 		}
 		else
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 1eeebbb0a..66ee95fab 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -217,7 +217,7 @@ namespace KNotifyClient
 	 * placed appropriately.
 	 *
 	 * Call it by KNotifyClient::event(widget->winId(), "EventName");
-	 * It will use KApplication::kApplication->dcopClient() to communicate to
+	 * It will use TDEApplication::kApplication->dcopClient() to communicate to
 	 * the server
 	 * @param winId The winId() of the widget where the event originates
 	 * @param message The name of the event
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 9a596334b..fbd096cbf 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -32,7 +32,7 @@ class TQSocketNotifier;
  * @author Christian Czezatke <e9025461@student.tuwien.ac.at>
  *
  *  A class for internal use by KProcess only. -- Exactly one instance
- *  of this class is created by KApplication.
+ *  of this class is created by TDEApplication.
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
@@ -43,13 +43,13 @@ class TDECORE_EXPORT KProcessController : public TQObject
 public:
   /**
    * Create an instance if none exists yet.
-   * Called by KApplication::KApplication()
+   * Called by TDEApplication::TDEApplication()
    */
   static void ref();
 
   /**
    * Destroy the instance if one exists and it is not referenced any more.
-   * Called by KApplication::~KApplication()
+   * Called by TDEApplication::~TDEApplication()
    */
   static void deref();
 
diff --git a/tdecore/krandomsequence.cpp b/tdecore/krandomsequence.cpp
index 04240733f..9529ccabb 100644
--- a/tdecore/krandomsequence.cpp
+++ b/tdecore/krandomsequence.cpp
@@ -78,7 +78,7 @@ void KRandomSequence::setSeed( long lngSeed1 )
   }
   else if (lngSeed1 == 0)
   {
-    m_lngSeed1 = -((KApplication::random() & ~1)+1);
+    m_lngSeed1 = -((TDEApplication::random() & ~1)+1);
   }
   else
   {
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 8fa6e3c29..256d03f17 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -50,7 +50,7 @@ public:
    * 
    * @param lngSeed Seed to initialize the sequence with.
    * If lngSeed is 0, the sequence is initialized with a value from
-   * KApplication::random().
+   * TDEApplication::random().
    */
   KRandomSequence( long lngSeed = 0 );
 
@@ -73,7 +73,7 @@ public:
    * Restart the sequence based on lngSeed.
    * @param lngSeed Seed to initialize the sequence with.
    * If lngSeed is 0, the sequence is initialized with a value from
-   * KApplication::random().
+   * TDEApplication::random().
    */
   void setSeed( long lngSeed = 0 );
 
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 77fec4efd..560cca391 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -91,12 +91,12 @@ class KStandardDirsPrivate;
  * @li socket - UNIX Sockets (specific for both current host and current user)
  * @li emoticons - Emoticons themes  (Since KDE 3.4)
  *
- * A type that is added by the class KApplication if you use it, is
+ * A type that is added by the class TDEApplication if you use it, is
  * appdata. This one makes the use of the type data a bit easier as it
  * appends the name of the application.
  * So while you had to ::locate("data", "appname/filename") so you can
- * also write ::locate("appdata", "filename") if your KApplication instance
- * is called "appname" (as set via KApplication's constructor or KAboutData, if
+ * also write ::locate("appdata", "filename") if your TDEApplication instance
+ * is called "appname" (as set via TDEApplication's constructor or KAboutData, if
  * you use the global KStandardDirs object KGlobal::dirs()).
  * Please note though that you cannot use the "appdata"
  * type if you intend to use it in an applet for Kicker because 'appname' would
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index 1cb8ce345..0a0d5d253 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -129,9 +129,9 @@ KStartupInfo::KStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, cons
 void KStartupInfo::init( int flags_P )
     {
     // d == NULL means "disabled"
-    if( !KApplication::kApplication())
+    if( !TDEApplication::kApplication())
         return;
-    if( !KApplication::kApplication()->getDisplay())
+    if( !TDEApplication::kApplication()->getDisplay())
         return;
 
     d = new KStartupInfoPrivate( flags_P );
@@ -171,7 +171,7 @@ void KStartupInfo::got_message( const TQString& msg_P )
 // if the application stops responding for a while, KWinModule may get
 // the information about the already mapped window before KXMessages
 // actually gets the info about the started application (depends
-// on their order in X11 event filter in KApplication)
+// on their order in X11 event filter in TDEApplication)
 // simply delay info from KWinModule a bit
 // SELI???
 namespace
@@ -494,7 +494,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
 
 void KStartupInfo::appStarted()
     {
-    if( kapp != NULL )  // KApplication constructor unsets the env. variable
+    if( kapp != NULL )  // TDEApplication constructor unsets the env. variable
         appStarted( kapp->startupId());
     else
         appStarted( KStartupInfo::currentStartupIdEnv().id());
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index f71a0b830..c2063b7c2 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -248,8 +248,8 @@ class TDECORE_EXPORT KStartupInfo
 
 	/**
 	 * Returns the current startup notification identification for the current
-	 * startup notification environment variable. Note that KApplication constructor
-	 * unsets the variable and you have to use KApplication::startupId .
+	 * startup notification environment variable. Note that TDEApplication constructor
+	 * unsets the variable and you have to use TDEApplication::startupId .
 	 * @return the current startup notification identification
 	 */
         static KStartupInfoId currentStartupIdEnv();
diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp
index 3e30aa7c1..fe9e50d57 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/ksycoca.cpp
@@ -333,7 +333,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
          {
            triedLaunchingKdeinit = true;
            kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl;
-           KApplication::startKdeinit();
+           TDEApplication::startKdeinit();
            // Ok, the new database should be here now, open it.
          }
          if (!openDatabase(false))
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index c134914c1..8a4d88c2e 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -72,7 +72,7 @@ bool
 KTempDir::create(const TQString &directoryPrefix, int mode)
 {
    // make sure the random seed is randomized
-   (void) KApplication::random();
+   (void) TDEApplication::random();
 
    TQCString nme = TQFile::encodeName(directoryPrefix) + "XXXXXX";
    char *realName;
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index 4632f0053..db8ba796d 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -93,7 +93,7 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension,
 		  int mode)
 {
    // make sure the random seed is randomized
-   (void) KApplication::random();
+   (void) TDEApplication::random();
 
    TQCString ext = TQFile::encodeName(fileExtension);
    TQCString nme = TQFile::encodeName(filePrefix) + "XXXXXX" + ext;
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 271264e95..97a8eec1b 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -187,7 +187,7 @@ KUniqueApplication::start()
 #ifdef Q_WS_X11
            // say we're up and running ( probably no new window will appear )
            KStartupInfoId id;
-           if( kapp != NULL ) // KApplication constructor unsets the env. variable
+           if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
                id.initId( kapp->startupId());
            else
                id = KStartupInfo::currentStartupIdEnv();
@@ -211,7 +211,7 @@ KUniqueApplication::start()
      {
 #ifdef Q_WS_X11
          KStartupInfoId id;
-         if( kapp != NULL ) // KApplication constructor unsets the env. variable
+         if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
              id.initId( kapp->startupId());
          else
              id = KStartupInfo::currentStartupIdEnv();
@@ -274,7 +274,7 @@ KUniqueApplication::start()
      TQCString new_asn_id;
 #if defined Q_WS_X11
      KStartupInfoId id;
-     if( kapp != NULL ) // KApplication constructor unsets the env. variable
+     if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
          id.initId( kapp->startupId());
      else
          id = KStartupInfo::currentStartupIdEnv();
@@ -315,7 +315,7 @@ KUniqueApplication::start()
 
 
 KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique)
-  : KApplication( allowStyles, GUIenabled, initHack( configUnique )),
+  : TDEApplication( allowStyles, GUIenabled, initHack( configUnique )),
     DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
@@ -331,7 +331,7 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
 #ifdef Q_WS_X11
 KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
 		Qt::HANDLE colormap, bool allowStyles, bool configUnique)
-  : KApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
+  : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
     DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
@@ -489,7 +489,7 @@ void KUniqueApplication::setHandleAutoStarted()
 }
 
 void KUniqueApplication::virtual_hook( int id, void* data )
-{ KApplication::virtual_hook( id, data );
+{ TDEApplication::virtual_hook( id, data );
   DCOPObject::virtual_hook( id, data ); }
 
 #include "kuniqueapplication.moc"
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index e9dca8d99..eaa79dc57 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -42,10 +42,10 @@ class KUniqueApplicationPrivate;
  * option (see TDECmdLineArgs::addTempFileOption()), to delete tempfiles after use.
  * Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this.
  *
- * @see KApplication DCOPObject
+ * @see TDEApplication DCOPObject
  * @author Preston Brown <pbrown@kde.org>
  */
-class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
+class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject
 {
   Q_OBJECT
 public:
@@ -56,7 +56,7 @@ public:
    * styles. This is only useful to applications that do not display a GUI
    * normally. If you do create an application with @p allowStyles set to false
    * it normally runs in the background but under special circumstances
-   * displays widgets.  Call KApplication::enableStyles() before 
+   * displays widgets.  Call TDEApplication::enableStyles() before 
    * displaying any widgets.
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
@@ -82,7 +82,7 @@ public:
    * styles. This is only useful to applications that do not display a GUI
    * normally. If you do create an application with @p allowStyles set to false
    * it normally runs in the background but under special circumstances
-   * displays widgets.  Call KApplication::enableStyles() before 
+   * displays widgets.  Call TDEApplication::enableStyles() before 
    * displaying any widgets.
    * @param configUnique If true, the uniqueness of the application will
    *                 depend on the value of the "MultipleInstances"
diff --git a/tdecore/libtdecore_weak.nmcheck b/tdecore/libtdecore_weak.nmcheck
index dc43acb6b..a72cebff4 100644
--- a/tdecore/libtdecore_weak.nmcheck
+++ b/tdecore/libtdecore_weak.nmcheck
@@ -1,7 +1,7 @@
 # KDE namespace check file
 
 # tdelibs classes
-KApplication::*
+TDEApplication::*
 
 # these should preferably go in some namespace in KDE4
 kDebugPrivate::*
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index a3c975d94..02d9daa8d 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -468,7 +468,7 @@ void KSocksSocketDevice::initSocks()
     return;
 
   if (kapp == 0L)
-    return;			// no KApplication, so don't initialise
+    return;			// no TDEApplication, so don't initialise
                                 // this should, however, test for KInstance
 
   init = true;
diff --git a/tdecore/tests/KIDLTest.cpp b/tdecore/tests/KIDLTest.cpp
index e714bc52f..f022e307a 100644
--- a/tdecore/tests/KIDLTest.cpp
+++ b/tdecore/tests/KIDLTest.cpp
@@ -18,7 +18,7 @@ TQString KIDLTest::hello( const TQString& name )
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "kidlservertest", false /* No GUI */ );
+    TDEApplication app( argc, argv, "kidlservertest", false /* No GUI */ );
 
     app.dcopClient()->attach();
     app.dcopClient()->registerAs( "kidlservertest" );
diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp
index 87884c05a..75d5949c7 100644
--- a/tdecore/tests/KIDLTestClient.cpp
+++ b/tdecore/tests/KIDLTestClient.cpp
@@ -5,7 +5,7 @@
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ );
+    TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ );
 
     kapp->dcopClient()->attach();
     // kapp->dcopClient()->registerAs( "kidlclienttest" );
diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp
index 8830d34c7..543efd706 100644
--- a/tdecore/tests/dcopkonqtest.cpp
+++ b/tdecore/tests/dcopkonqtest.cpp
@@ -4,7 +4,7 @@
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "KIDLTestClient", false );
+    TDEApplication app( argc, argv, "KIDLTestClient", false );
 
     kapp->dcopClient()->attach();
     // kapp->dcopClient()->registerAs( "kidlclienttest" );
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 11227517d..6c5e135dc 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -31,10 +31,10 @@ main(int argc, char *argv[])
    KAboutData about("kapptest", "kapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
 
-   KApplication a;
+   TDEApplication a;
 
    KSycoca *s = KSycoca::self();
   
    tqWarning("s->language() %s", s->language().latin1());
-   tqWarning("Offset of aIconName: %ld", (long) &(static_cast<KApplication *>(0)->aIconName));
+   tqWarning("Offset of aIconName: %ld", (long) &(static_cast<TDEApplication *>(0)->aIconName));
 }
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 85f464c9e..086cae304 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv) {
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	KApplication app(false, false);
+	TDEApplication app(false, false);
 
         TQStringList lst = KCalendarSystemFactory::calendarSystems();
 	kdDebug() << "Supported calendar types: " << endl;
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 4aa05a48b..d04a21bff 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -31,7 +31,7 @@ main(int argc, char *argv[])
 
    // MyWidget::addCmdLineOptions();
 
-   KApplication k( false, false /*true, true*/ );
+   TDEApplication k( false, false /*true, true*/ );
 
    // Get application specific arguments
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); 
@@ -81,7 +81,7 @@ main(int argc, char *argv[])
 {
    TDECmdLineArgs::init( argc, argv, "testapp", description, version);
 
-   KApplication k( true, true );
+   TDEApplication k( true, true );
 
    k.exec();
    return 0;
diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/kconfigtestgui.cpp
index af560b496..6f8c6e0e0 100644
--- a/tdecore/tests/kconfigtestgui.cpp
+++ b/tdecore/tests/kconfigtestgui.cpp
@@ -192,7 +192,7 @@ void KConfigTestView::writeButtonClicked()
 
 int main( int argc, char **argv )
 {
-  KApplication a( argc, argv, "bla" );
+  TDEApplication a( argc, argv, "bla" );
 
   KConfigTestView *w = new KConfigTestView();
   a.setMainWidget( w );
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index 8904354c5..9c7b081de 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -53,9 +53,9 @@ void testkasciistricmp()
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   testkasciistricmp();
 
diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp
index 96a7a6813..fba38f8bf 100644
--- a/tdecore/tests/kiconloadertest.cpp
+++ b/tdecore/tests/kiconloadertest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-  KApplication app(argc,argv,"kiconloadertest"/*,false,false*/);
+  TDEApplication app(argc,argv,"kiconloadertest"/*,false,false*/);
 
   KIconLoader * mpLoader = KGlobal::iconLoader();
   KIcon::Context mContext = KIcon::Application;
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index 136aa6d70..0f33714b3 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -18,7 +18,7 @@ MyObject::MyObject()
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kipc");
+    TDEApplication app(argc, argv, "kipc");
 
     if (argc == 3) 
     {
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index f752467d6..3c8df342e 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -100,7 +100,7 @@ void Test::createFields()
 int main( int argc, char ** argv )
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication a( argc, argv, "klocaletest" );
+  TDEApplication a( argc, argv, "klocaletest" );
 
   KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
   KGlobal::locale()->setCountry(TQString::fromLatin1("C"));
diff --git a/tdecore/tests/kmacroexpandertest.cpp b/tdecore/tests/kmacroexpandertest.cpp
index 11fb4fd8b..fe3f66c65 100644
--- a/tdecore/tests/kmacroexpandertest.cpp
+++ b/tdecore/tests/kmacroexpandertest.cpp
@@ -52,7 +52,7 @@ protected:
 int main(int argc, char *argv[])
 {
   TDECmdLineArgs::init(argc, argv, ":", "", "", "");
-  KApplication app(false,false);
+  TDEApplication app(false,false);
   TQString s, s2;
 
   TQMap<TQChar,TQStringList> map1;
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index a6ce6431d..87af50f00 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -339,7 +339,7 @@ int main (int argc, char *argv[])
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
 
-    KApplication app;
+    TDEApplication app;
 
     if (!count)
     {
diff --git a/tdecore/tests/kmemtest.cpp b/tdecore/tests/kmemtest.cpp
index 83c452e50..0a2a1bdb8 100644
--- a/tdecore/tests/kmemtest.cpp
+++ b/tdecore/tests/kmemtest.cpp
@@ -235,9 +235,9 @@ int main(int argc, char *argv[])
   }
 //  showMem("second");
 
-    KApplication app(argc,argv,"kurltest");
+    TDEApplication app(argc,argv,"kurltest");
 
-//  showMem("After KApplication constructor");
+//  showMem("After TDEApplication constructor");
 
 //  malloc(10*1024);
 
diff --git a/tdecore/tests/knotifytest.cpp b/tdecore/tests/knotifytest.cpp
index 8eb0586c0..27076a1e8 100644
--- a/tdecore/tests/knotifytest.cpp
+++ b/tdecore/tests/knotifytest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-	KApplication app( argc, argv, "knotifytest" );
+	TDEApplication app( argc, argv, "knotifytest" );
     KNotifyClient::userEvent( "This is a notification to notify you :)", 
                               KNotifyClient::Messagebox,
                               KNotifyClient::Error );
diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp
index af04cd421..bec7c0dd2 100644
--- a/tdecore/tests/kprocesstest.cpp
+++ b/tdecore/tests/kprocesstest.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 {
  KProcess p1, p2, p3, p4;
  Dummy dummy; 
- KApplication app(argc, argv, "kprocesstest");
+ TDEApplication app(argc, argv, "kprocesstest");
 
 
  printf("Welcome to the KProcess Demo Application!\n");
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp
index 446dacb30..c637e35b2 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/kprociotest.cpp
@@ -32,7 +32,7 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n
 int main(int argc, char *argv[])
 {
  Dummy dummy; 
- KApplication app(argc, argv, "kprociotest");
+ TDEApplication app(argc, argv, "kprociotest");
 
  printf("Welcome to the KProcIO Demo Application!\n");
 
diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp
index 8f337c2f1..53c42facb 100644
--- a/tdecore/tests/krandomsequencetest.cpp
+++ b/tdecore/tests/krandomsequencetest.cpp
@@ -26,7 +26,7 @@
 int
 main(int argc, char *argv[])
 {
-   KApplication a(argc, argv, "krandomsequencetest");
+   TDEApplication a(argc, argv, "krandomsequencetest");
 
    long seed;
    KRandomSequence seq;
diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp
index 368a1106f..cb8bffbfd 100644
--- a/tdecore/tests/krfcdatetest.cpp
+++ b/tdecore/tests/krfcdatetest.cpp
@@ -21,7 +21,7 @@ bool check(TQString txt, time_t a, time_t b)
 
 int main(int argc, char *argv[])
 {
-  KApplication app(argc,argv,"kurltest",false,false);
+  TDEApplication app(argc,argv,"kurltest",false,false);
 
   time_t a;
   time_t b;
diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp
index 699be34cf..f9fbffa65 100644
--- a/tdecore/tests/ksimpleconfigtest.cpp
+++ b/tdecore/tests/ksimpleconfigtest.cpp
@@ -20,7 +20,7 @@
 
 int main( int argc, char **argv )
 {
-  KApplication  a( argc, argv, "kconfigtest" );
+  TDEApplication  a( argc, argv, "kconfigtest" );
 
   KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" );
 
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index 62fc74905..c599c4570 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -59,9 +59,9 @@ main(int argc, char *argv[])
 {
    KAboutData about("socktest", "SockTest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
-   KApplication::addCmdLineOptions();
+   TDEApplication::addCmdLineOptions();
 
-   KApplication app;
+   TDEApplication app;
 
    TQString host, port;
 
diff --git a/tdecore/tests/kstdacceltest.cpp b/tdecore/tests/kstdacceltest.cpp
index ff8842139..4540e89d7 100644
--- a/tdecore/tests/kstdacceltest.cpp
+++ b/tdecore/tests/kstdacceltest.cpp
@@ -23,8 +23,8 @@ static bool check(TQString txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
-  KApplication app(argc,argv,"kstdacceltest",false,false);
+  TDEApplication::disableAutoDcopRegistration();
+  TDEApplication app(argc,argv,"kstdacceltest",false,false);
 
   check( "shortcutDefault FullScreen", KStdAccel::shortcutDefault( KStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
   check( "shortcutDefault BeginningOfLine", KStdAccel::shortcutDefault( KStdAccel::BeginningOfLine ).toString(), "Home" );
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index 69e9a0200..973402ffc 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication a(argc, argv, "whatever", false);
+  TDEApplication a(argc, argv, "whatever", false);
   KStandardDirs t;
   KConfig config; // to add custom entries - a bit tricky :/
 
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index 60404f03a..ec3a004cd 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -28,8 +28,8 @@
 int
 main(int argc, char *argv[])
 {
-   KApplication a(argc, argv, "ktempfiletest");
-   printf("Making tempfile after KApplication constructor.\n");
+   TDEApplication a(argc, argv, "ktempfiletest");
+   printf("Making tempfile after TDEApplication constructor.\n");
    KTempFile f4;
    printf("Filename = %s\n", f4.name().ascii());
 
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index ddfbc8f7a..47d709a9b 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -81,9 +81,9 @@ void testAdjustPath()
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   KURL::List lst;
 
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index cf9717499..ce30a9642 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -30,7 +30,7 @@ main(int argc, char *argv[])
    KAboutData about("kapptest", "kapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
 
-   KApplication a;
+   TDEApplication a;
 
    TQString error;
    TQCString dcopService;
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 97c545e1e..56a3e943d 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
     tqDebug("qt arg[%d] = %s", i, qtargs->arg(i));
   }
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *kdeargs = TDECmdLineArgs::parsedArgs("tde");
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index cbf090676..138c38ce4 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -536,10 +536,10 @@ int main_console(int argc, char **argv)
 		case MODE_TDE_AUTOADD_ICON:
 		{
 			printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]);
-			KApplication::disableAutoDcopRegistration();
+			TDEApplication::disableAutoDcopRegistration();
 			KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
 			TDECmdLineArgs::init(&aboutd);
-			KApplication app(false, false);
+			TDEApplication app(false, false);
 
 			TQStringList rds = KGlobal::dirs()->resourceDirs("icon");
 			for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) {
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index 5be5e9330..aba9b3905 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -36,7 +36,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 			   I18N_NOOP("A CUPS configuration tool"),
 			   I18N_NOOP("A CUPS configuration tool"),"0.0.1");
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication	app;
+	TDEApplication	app;
 	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 
 	KURL	configfile;
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index c9730adba..115f3fd02 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname)
 		if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213)
 		{
 			f.close();
-			destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8);
+			destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8);
 			f.setName(destname);
 
 			if (f.open(IO_WriteOnly))
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 05e1aa0df..171daf45d 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile()
 {
 	TQString	f;
 	// be sure the file doesn't exist
-	do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f));
+	do f = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); while (TQFile::exists(f));
 	return f;
 }
 
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 26a0d8e96..2bfebcfa4 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -21,7 +21,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	
 	KGlobal::locale()->setMainCatalogue("tdelibs");
 
-	KApplication app;
+	TDEApplication app;
 	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 	bool	doConfig = args->isSet("tdeconfig");
 	bool	doSrvConfig = args->isSet("serverconfig");
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 545d3b94d..d4652878f 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -133,7 +133,7 @@ void KMWDriverTest::slotTest()
 {
 	if (!m_printer) return;
 
-	TQString	name = "tmpprinter_"+KApplication::randomString(8);
+	TQString	name = "tmpprinter_"+TDEApplication::randomString(8);
 	// save printer name (can be non empty when modifying a printer)
 	TQString	oldname = m_printer->name();
 
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 443cc89e8..3f04c9196 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * )
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "drawdemo" );
+    TDEApplication app( argc, argv, "drawdemo" );
     DrawView   draw;
     app.setMainWidget( &draw );
     draw.show();
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index a1dc6b5e0..332ba1fc4 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -17,7 +17,7 @@
 
 int main( int argc, char ** argv )
 {
-    KApplication a(argc, argv, "helpviewer");
+    TDEApplication a(argc, argv, "helpviewer");
 
     TQString home;
     if (argc > 1)
diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS
index 9e7ce9592..7d64d96b1 100644
--- a/tdeui/AUTHORS
+++ b/tdeui/AUTHORS
@@ -10,7 +10,7 @@ Maintainer of KPixmapEffect, KStyle, KThemeStyle, and KThemeBase - as well as
 general misc coding here and there. 
 
 Matthias Kalle Dalheimer <kalle@kde.org>:
-classes KApplication, KConfig, KTextStream, KColorSet, 
+classes TDEApplication, KConfig, KTextStream, KColorSet, 
 automake, autoconf, maintenance
 
 Richard Moore <moorer@cs.man.ac.uk>:
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 270c00ec4..4937b3a87 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -1133,7 +1133,7 @@ void KAction::slotPopupActivated()
             state = kpm->state();
         else { // just a QPopupMenu? We'll ask for the state now then (small race condition?)
             kdDebug(129) << "KAction::slotPopupActivated not a KPopupMenu -> using keyboardMouseState()" << endl;
-            state = KApplication::keyboardMouseState();
+            state = TDEApplication::keyboardMouseState();
         }
         emit activated( KAction::PopupMenuActivation, state );
         slotActivated();
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index c13d87b27..f1e6995ee 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -186,7 +186,7 @@ void KDETrayProxy::withdrawWindow( Window w )
 int main( int argc, char* argv[] )
     {
     TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
-    KApplication app( false ); // no styles
+    TDEApplication app( false ); // no styles
     app.disableSessionManagement();
     KDETrayProxy proxy;
     return app.exec();
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index a26519729..0392f7d50 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -65,7 +65,7 @@ KIconView::KIconView( TQWidget *parent, const char *name, WFlags f )
              this, TQT_SLOT( slotOnViewport() ) );
     connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
              this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
-    slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+    slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
     if ( kapp ) { // maybe null when used inside designer
         connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
         kapp->addKipcEventMask( KIPC::SettingsChanged );
@@ -123,7 +123,7 @@ void KIconView::slotOnViewport()
 
 void KIconView::slotSettingsChanged(int category)
 {
-    if ( category != KApplication::SETTINGS_MOUSE )
+    if ( category != TDEApplication::SETTINGS_MOUSE )
       return;
     m_bUseSingle = KGlobalSettings::singleClick();
     //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl;
@@ -167,7 +167,7 @@ void KIconView::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
   TQIconViewItem* previousItem = currentItem();
   setCurrentItem( m_pCurrentItem );
 
@@ -243,7 +243,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
     return;
   }
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   m_pAutoSelect->stop();
 
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 0518d870c..6d197d813 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -595,7 +595,7 @@ void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map )
 
 void KKeyChooser::slotSettingsChanged( int category )
 {
-    if( category == KApplication::SETTINGS_SHORTCUTS )
+    if( category == TDEApplication::SETTINGS_SHORTCUTS )
         readGlobalKeys(); // reread
 }
 
diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp
index 13c5ab325..04705ad36 100644
--- a/tdeui/klistbox.cpp
+++ b/tdeui/klistbox.cpp
@@ -34,7 +34,7 @@ KListBox::KListBox( TQWidget *parent, const char *name, WFlags f )
 	     this, TQT_SLOT( slotOnViewport() ) );
     connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ),
 	     this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) );
-    slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+    slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
     if (kapp)
     {
         connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
@@ -71,7 +71,7 @@ void KListBox::slotOnViewport()
 
 void KListBox::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
         return;
     m_bUseSingle = KGlobalSettings::singleClick();
 
@@ -116,7 +116,7 @@ void KListBox::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   TQListBoxItem* previousItem = item( currentItem() ); 
   setCurrentItem( m_pCurrentItem );
@@ -178,7 +178,7 @@ void KListBox::slotAutoSelect()
 
 void KListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos )
 {
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
     
   m_pAutoSelect->stop();
   
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index b52fe6876..29f255c3a 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -438,7 +438,7 @@ KListView::KListView( TQWidget *parent, const char *name )
   connect (this, TQT_SIGNAL(contentsMoving(int,int)),
                    this, TQT_SLOT(cleanItemHighlighter()));
 
-  slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+  slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
   if (kapp)
   {
     connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
@@ -543,7 +543,7 @@ void KListView::slotSettingsChanged(int category)
 {
   switch (category)
   {
-  case KApplication::SETTINGS_MOUSE:
+  case TDEApplication::SETTINGS_MOUSE:
     d->dragDelay =  KGlobalSettings::dndEventDelay();
     d->bUseSingle = KGlobalSettings::singleClick();
 
@@ -563,7 +563,7 @@ void KListView::slotSettingsChanged(int category)
 
     break;
 
-  case KApplication::SETTINGS_POPUPMENU:
+  case TDEApplication::SETTINGS_POPUPMENU:
     d->contextMenuKey = KGlobalSettings::contextMenuKey ();
     d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress ();
 
@@ -604,7 +604,7 @@ void KListView::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   TQListViewItem* previousItem = currentItem();
   setCurrentItem( d->pCurrentItem );
@@ -646,7 +646,7 @@ void KListView::slotAutoSelect()
       if( selectionMode() == TQListView::Single )
                 emit selectionChanged( d->pCurrentItem );
     }
-    else if( (keybstate & KApplication::ControlModifier) )
+    else if( (keybstate & TDEApplication::ControlModifier) )
       setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() );
     else {
       bool block = signalsBlocked();
@@ -691,7 +691,7 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c )
         }
         else
         {
-            ButtonState keybstate = KApplication::keyboardMouseState();
+            ButtonState keybstate = TDEApplication::keyboardMouseState();
 
             d->autoSelect.stop();
 
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index ffb59588b..5d2a1e705 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -92,7 +92,7 @@ public:
     }
     bool saveState( TQSessionManager& )
     {
-        KConfig* config = KApplication::kApplication()->sessionConfig();
+        KConfig* config = TDEApplication::kApplication()->sessionConfig();
         if ( KMainWindow::memberList->first() ){
             // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this
             // hook is useful for better document orientation
@@ -303,9 +303,9 @@ void KMainWindow::parseGeometry(bool parsewidth)
         if ( parsewidth && !(m & YValue) )
             y = geometry().y();
         if ( (m & XNegative) )
-            x = KApplication::desktop()->width()  + x - w;
+            x = TDEApplication::desktop()->width()  + x - w;
         if ( (m & YNegative) )
-            y = KApplication::desktop()->height() + y - h;
+            y = TDEApplication::desktop()->height() + y - h;
         move(x, y);
     }
 #endif
@@ -1226,7 +1226,7 @@ void KMainWindow::setIcon( const TQPixmap& p )
 {
     TQMainWindow::setIcon( p );
 #ifdef Q_WS_X11 
-    // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which
+    // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
     // is used by KMainWindow, sets it
     KWin::setIcons( winId(), p, TQPixmap());
 #endif
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index 8aba596f1..d03a2efcf 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -73,7 +73,7 @@ class DCOPObject;
  * not supported.
 *
  * KMainWindow will set icon, mini icon and caption, which it gets
- * from KApplication. It provides full session management, and
+ * from TDEApplication. It provides full session management, and
  * will save its position, geometry and positions of toolbars and
  * menubar on logout. If you want to save additional data, reimplement
  * saveProperties() and (to read them again on next login)
@@ -90,7 +90,7 @@ class DCOPObject;
  *  window is closed. If you do not want this behavior, specify 0 as
  *  widget flag in the constructor.
  *
- * @see KApplication
+ * @see TDEApplication
  * @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.org), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by Sven Radej (radej@kde.org)
 
  */
@@ -798,9 +798,9 @@ protected:
     // would be useful only for the annoying 'really quit' dialog, which
     // also doesn't make sense in apps with multiple mainwindows.
     // And saving configuration in something called queryExit()? IMHO
-    // one can e.g. use KApplication::shutDown(), which if nothing else
+    // one can e.g. use TDEApplication::shutDown(), which if nothing else
     // has at least better fitting name.
-    // See also KApplication::sessionSaving().
+    // See also TDEApplication::sessionSaving().
     // This stuff should get changed somehow, so that it at least doesn't
     // mess with session management.
     /**
@@ -820,15 +820,15 @@ protected:
 
        If you need to do serious things on exit (like shutting a
        dial-up connection down), connect to the signal
- KApplication::shutDown().
+ TDEApplication::shutDown().
 
        Default implementation returns @p true. Returning @p false will
        cancel the exiting. In the latter case, the last window will
-       remain visible. If KApplication::sessionSaving() is true, refusing
+       remain visible. If TDEApplication::sessionSaving() is true, refusing
        the exit will also cancel KDE logout.
 
        @see queryClose()
-       @see KApplication::sessionSaving()
+       @see TDEApplication::sessionSaving()
      */
     virtual bool queryExit();
 
@@ -840,7 +840,7 @@ protected:
        safe to close it, i.e. without the user losing some data.
 
        Default implementation returns true. Returning @p false will cancel
-       the closing, and, if KApplication::sessionSaving() is true, it will also
+       the closing, and, if TDEApplication::sessionSaving() is true, it will also
        cancel KDE logout.
 
        Reimplement this function to prevent the user from losing data.
@@ -864,7 +864,7 @@ protected:
        may be canceled, in which case the document should remain open.
 
        @see queryExit()
-       @see KApplication::sessionSaving()
+       @see TDEApplication::sessionSaving()
     */
     virtual bool queryClose();
 
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index ee526dcdb..2dd4c8ca5 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text,
                                 parent, "about", true, true,
                                 KStdGuiItem::ok() );
     
-    TQPixmap ret = KApplication::kApplication()->icon();
+    TQPixmap ret = TDEApplication::kApplication()->icon();
     if (ret.isNull())
         ret = TQMessageBox::standardIcon(TQMessageBox::Information);
     dialog->setIcon(ret);
diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h
index 419d1edc7..f9d76688c 100644
--- a/tdeui/kmessagebox.h
+++ b/tdeui/kmessagebox.h
@@ -74,7 +74,7 @@ public:
    Notify = 1,        ///< Emit a KNotifyClient event
    AllowLink = 2,     ///< The message may contain links.
    Dangerous = 4,     ///< The action to be confirmed by the dialog is a potentially destructive one
-   PlainCaption = 8,  /**< Do not use KApplication::makeStdCaption()
+   PlainCaption = 8,  /**< Do not use TDEApplication::makeStdCaption()
    		           @since 3.4
 		       */
    NoExec = 16        /**< Do not call exec() in createKMessageBox()
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 11af50f43..5209c515f 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -55,7 +55,7 @@ class TQPopupMenu;
  *
  * \b X-TDE-UniqueApplet \n
  *
- * Similar to KApplication and KUniqueApplication there are
+ * Similar to TDEApplication and KUniqueApplication there are
  * two types of panel applets. Use unique applets when it makes no
  * sence to run more than one instance of a applet in the panel. A
  * good example for unique applets is the taskbar applet.  Use normal
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index fec6bd2ee..e8d7e5a28 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -56,7 +56,7 @@ class KPanelExtensionPrivate;
  *
  * \b X-TDE-UniqueExtension \n
  *
- * Similar to KApplication and KUniqueApplication there are
+ * Similar to TDEApplication and KUniqueApplication there are
  * two types of panel extensions. Use unique extensions when it makes no
  * sence to run more than one instance of an extension in the panel. A
  * good example for unique extensions is the taskbar extension.  Use normal
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index aa447ed5c..1f233f23d 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -96,7 +96,7 @@ private:
   *
   * KToolBar uses a global config group to load toolbar settings on
   * construction. It will reread this config group on a
-  * KApplication::appearanceChanged() signal.
+  * TDEApplication::appearanceChanged() signal.
   *
   * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
   */
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index a2d3c27fe..1316081c6 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -670,7 +670,7 @@ void KToolBarButton::slotClicked()
 
   // emit buttonClicked when the button was clicked while being in an extension popupmenu
   if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
-    ButtonState state = KApplication::keyboardMouseState();
+    ButtonState state = TDEApplication::keyboardMouseState();
     if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton )
       state = ButtonState( Qt::LeftButton | state );
     emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 1767bec5f..b8b7d40f8 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -54,7 +54,7 @@ static const char * item_xpm[] = {
 "        ......        "};
 
 
-KApplication *app;
+TDEApplication *app;
 
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -212,7 +212,7 @@ void TopLevel::slotToggleSingleColumn( bool b )
 
 int main( int argc, char ** argv )
 {
-    app = new KApplication ( argc, argv, "ItemContainerTest" );
+    app = new TDEApplication ( argc, argv, "ItemContainerTest" );
 
     TopLevel *toplevel = new TopLevel(0, "itemcontainertest");
 
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index 6103c6ba4..e87c7ebf2 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -16,7 +16,7 @@
 
 int main(int argc, char** argv)
 {
-  (void)new KApplication(argc, argv, "KAboutDialogTest");
+  (void)new TDEApplication(argc, argv, "KAboutDialogTest");
   TQImage logo;
   TQImage bg;
   TQPixmap pix;
diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/kactiontest.cpp
index ea97883c8..238f912c5 100644
--- a/tdeui/tests/kactiontest.cpp
+++ b/tdeui/tests/kactiontest.cpp
@@ -8,7 +8,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kactiontest" );
+    TDEApplication app( argc, argv, "kactiontest" );
 
     KActionCollection coll( static_cast<TQObject *>( 0 ) );
 
diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp
index 59a57dc6a..dc708f2b5 100644
--- a/tdeui/tests/kblendtest.cpp
+++ b/tdeui/tests/kblendtest.cpp
@@ -89,7 +89,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "KBlendTest");
+    TDEApplication app(argc, argv, "KBlendTest");
     KBlendWidget w;
     app.setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 1773c47f9..8f2052b28 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 
 int main(int argc, char **argv) {
-  KApplication a(argc, argv, "dummy");
+  TDEApplication a(argc, argv, "dummy");
 
   // example 1
   {
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index facd17bca..019f6bd43 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -4,7 +4,7 @@
 
 int main (int argc,char **argv)
 {
-    KApplication app( argc, argv, "kcharselecttest" );
+    TDEApplication app( argc, argv, "kcharselecttest" );
 
     KCharSelect selector( 0, "char selector" );
     selector.resize( selector.sizeHint() );
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index f372e6a96..83f29a70e 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -28,7 +28,7 @@ int main( int argc, char *argv[] )
 
 	KLocale::setMainCatalogue("tdelibs");
 	TQApplication::setColorMode( TQApplication::CustomColors );
-	KApplication a( argc, argv, "KColorDialogTest" );
+	TDEApplication a( argc, argv, "KColorDialogTest" );
         KConfig aConfig;
         aConfig.setGroup( "KColorDialog-test" );
     
diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp
index 68f50371b..3f61da00f 100644
--- a/tdeui/tests/kcolortest.cpp
+++ b/tdeui/tests/kcolortest.cpp
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
       else
 	printf("Usage: %s [int_vs_fade | fullscreen [old_way]]\n ", argv[0]);
     }
-    KApplication *app = new KApplication(argc, argv, "KColorTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KColorTest");
     KColorWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 44b849b44..234f62543 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -217,7 +217,7 @@ void KComboBoxTest::quitApp()
 
 int main ( int argc, char **argv)
 {
-  KApplication a(argc, argv, "kcomboboxtest");
+  TDEApplication a(argc, argv, "kcomboboxtest");
   KComboBoxTest* t= new KComboBoxTest;
   a.setMainWidget (t);
   t->show ();
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 3e60a0ddd..617957b4c 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -186,7 +186,7 @@ TQStringList Form1::defaultItems() const
 
 int main(int argc, char **argv )
 {
-    KApplication app( argc, argv, "kcompletiontest" );
+    TDEApplication app( argc, argv, "kcompletiontest" );
 
     Form1 *form = new Form1();
     form->show();
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index bea01a434..da5e872e1 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -6,7 +6,7 @@
 int main(int argc, char** argv)
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDatePickertest");
+  TDEApplication app(argc, argv, "KDatePickertest");
   KDatePicker picker;
   app.setMainWidget(&picker);
   picker.show();
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index ab55b0a32..55ba7cbea 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -5,7 +5,7 @@
 int main(int argc, char** argv)
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDateTimeWidgettest");
+  TDEApplication app(argc, argv, "KDateTimeWidgettest");
   KDateTimeWidget dateTimeWidget;
   app.setMainWidget(&dateTimeWidget);
   dateTimeWidget.show();
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index af75b42bc..6e1c8d504 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -6,7 +6,7 @@
 int main(int argc, char** argv)
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDateWidgettest");
+  TDEApplication app(argc, argv, "KDateWidgettest");
   KDateWidget dateWidget;
   app.setMainWidget(&dateWidget);
   dateWidget.show();
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index 28f7d4cf2..fbf93bfe8 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -55,7 +55,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KDesatTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KDesatTest");
     KDesatWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index c3653b59f..b1c7d422c 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "DialogBaseTest");
+  TDEApplication app(argc, argv, "DialogBaseTest");
   // -----
   TQString text= // the explanation shown by the example dialog
     "<center><h1>DialogBase Example</h1></center><hr><br>"
diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp
index 84895c414..fbbb799fc 100644
--- a/tdeui/tests/kdocktest.cpp
+++ b/tdeui/tests/kdocktest.cpp
@@ -54,7 +54,7 @@ DockTest::DockTest( TQWidget* parent )
 int
 main( int argc, char** argv )
 {
-  KApplication a( argc,argv, "docktest" );
+  TDEApplication a( argc,argv, "docktest" );
   DockTest* ap = new DockTest();
   ap->setCaption("DockWidget demo");
   a.setMainWidget( ap );
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 7847a6299..1720ca09a 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -768,7 +768,7 @@ TQString DirectoryView::selectedDir()
 /**********************************************************************************************/
 
 int main(int argc, char* argv[]) {
-  KApplication app(argc,argv,"kdockwidgetdemo");
+  TDEApplication app(argc,argv,"kdockwidgetdemo");
 
 #if 0
   SFileDialog* openfile = new SFileDialog();
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 74d8ecac4..dfe9bfff7 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -242,7 +242,7 @@ void DockApplication::gSetPix2() {
 }
 
 int main(int argc, char* argv[]) {
-  KApplication a(argc,argv, "kdockdemoapp1");
+  TDEApplication a(argc,argv, "kdockdemoapp1");
   DockApplication* ap = new DockApplication("DockWidget demo");
   ap->setCaption("DockWidget demo");
   a.setMainWidget(ap);
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 6fa2d1571..ea749cd6e 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -51,7 +51,7 @@ void KDualColorWidget::slotCurrentChanged(KDualColorButton::DualColor current)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KDualColorTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KDualColorTest");
     KDualColorWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index 90dbb74d0..177a8b6ec 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -4,7 +4,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "keditlistboxtest" );
+    TDEApplication app( argc, argv, "keditlistboxtest" );
 
     KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
     KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp
index 17a593e74..42d6f659f 100644
--- a/tdeui/tests/kedittest.cpp
+++ b/tdeui/tests/kedittest.cpp
@@ -4,7 +4,7 @@
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kedittest" );
+  TDEApplication app( argc, argv, "kedittest" );
   KEdit *edit = new KEdit( 0L );
   TQPopupMenu *pop = new TQPopupMenu( 0L );
   pop->insertItem( "Popupmenu item" );
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp
index 205fd48f7..4ef49fec7 100644
--- a/tdeui/tests/kfontdialogtest.cpp
+++ b/tdeui/tests/kfontdialogtest.cpp
@@ -31,7 +31,7 @@
 
  int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "KFontDialogTest" );
+  TDEApplication app( argc, argv, "KFontDialogTest" );
 
   KConfig aConfig;
   aConfig.setGroup( "KFontDialog-test" );
diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp
index 6942ca55d..dcd45673c 100644
--- a/tdeui/tests/kgradienttest.cpp
+++ b/tdeui/tests/kgradienttest.cpp
@@ -98,7 +98,7 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KGradientTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KGradientTest");
     KGradientWidget w;
     w.resize(250 * cols, 250 * rows);
     app->setMainWidget(&w);
diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp
index 2f00c9296..af7cc60cd 100644
--- a/tdeui/tests/khashtest.cpp
+++ b/tdeui/tests/khashtest.cpp
@@ -126,7 +126,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
 int main(int argc, char **argv)
 {
 
-    KApplication *app = new KApplication(argc, argv, "KHashTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KHashTest");
     KHashWidget w;
     w.resize(250 * cols, 250 * rows);
     app->setMainWidget(&w);
diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp
index 66db4617a..5db3babff 100644
--- a/tdeui/tests/kinputdialogtest.cpp
+++ b/tdeui/tests/kinputdialogtest.cpp
@@ -12,7 +12,7 @@
 
 int main( int argc, char *argv[] )
 {
-  KApplication app( argc, argv, "kinputdialogtest" );
+  TDEApplication app( argc, argv, "kinputdialogtest" );
 
   bool ok;
   TQString svalue;
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 59db252e2..12a267a02 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "JanusWidgetTest");
+  TDEApplication app(argc, argv, "JanusWidgetTest");
   // -----
   KJanusWidget* janus = new KJanusWidget( 0, 0, KJanusWidget::IconList );
 
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 54ae8b6e1..48f2f1430 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -134,7 +134,7 @@ KLedTest::timeout()
 
 int main( int argc, char **argv )
 {
-    KApplication a( argc, argv, "KLedTest" );
+    TDEApplication a( argc, argv, "KLedTest" );
     KLedTest widget;
     // -----
     /*
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index 7db673bb1..012a22b7f 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "klineedittest");
+  TDEApplication app(argc, argv, "klineedittest");
   KLineEditDlg dialog( "_text", "_value", 0L );
   if(dialog.exec())
     {
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 409476c20..c9b3485cc 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -120,9 +120,9 @@ int main ( int argc, char **argv)
 {
     KAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     
-    KApplication a;    
+    TDEApplication a;    
     KLineEditTest *t = new KLineEditTest();
     //t->lineEdit()->setTrapReturnKey( true );
     //t->lineEdit()->completionBox()->setTabHandling( false );
diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp
index 6189c76e9..582ae19e9 100644
--- a/tdeui/tests/klistviewtest.cpp
+++ b/tdeui/tests/klistviewtest.cpp
@@ -6,7 +6,7 @@
 
 int main( int argc, char **argv )
 {
-	KApplication app( argc, argv, "klistviewtest" );
+	TDEApplication app( argc, argv, "klistviewtest" );
 	KDialogBase dialog;
 	KListView *view = new KListView( dialog.makeVBoxMainWidget() );
 	view->setSelectionModeExt( KListView::FileManager );
diff --git a/tdeui/tests/kmainwindowrestoretest.cpp b/tdeui/tests/kmainwindowrestoretest.cpp
index 7415085ac..1ef265d92 100644
--- a/tdeui/tests/kmainwindowrestoretest.cpp
+++ b/tdeui/tests/kmainwindowrestoretest.cpp
@@ -14,7 +14,7 @@
 
 int main( int argc, char * argv[] ) {
 
-  KApplication app( argc, argv, "kmainwindowrestoretest" );
+  TDEApplication app( argc, argv, "kmainwindowrestoretest" );
 
   if ( kapp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
diff --git a/tdeui/tests/kmainwindowtest.cpp b/tdeui/tests/kmainwindowtest.cpp
index 5b7afd36f..6606680e9 100644
--- a/tdeui/tests/kmainwindowtest.cpp
+++ b/tdeui/tests/kmainwindowtest.cpp
@@ -24,7 +24,7 @@ void MainWindow::showMessage()
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kmainwindowtest" );
+    TDEApplication app( argc, argv, "kmainwindowtest" );
 
     MainWindow* mw = new MainWindow; // deletes itself when closed
     mw->show();
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 3603edf57..69f28e8c6 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -63,7 +63,7 @@ void showResult(int test, int i)
 int main( int argc, char *argv[] )
 {
     int i, test;
-    new KApplication( argc, argv, "MyApplication" );
+    new TDEApplication( argc, argv, "MyApplication" );
 
     ExampleWidget *w = new ExampleWidget();
     w->show();    
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index fdf8697e9..fad4cd50a 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -16,7 +16,7 @@
 
 #include "knuminputtest.h"
 
-KApplication *a;
+TDEApplication *a;
 
 #include <kdebug.h>
 void TopLevel::slotPrint( int n ) {
@@ -132,7 +132,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
 
 int main( int argc, char ** argv )
 {
-    a = new KApplication ( argc, argv, "KNuminputTest" );
+    a = new TDEApplication ( argc, argv, "KNuminputTest" );
 
     TopLevel *toplevel = new TopLevel(0, "knuminputtest");
 
diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp
index 32b91ff96..8edb97a57 100644
--- a/tdeui/tests/kpalettetest.cpp
+++ b/tdeui/tests/kpalettetest.cpp
@@ -12,7 +12,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication a( argc, argv, "KPalettetest" );
+    TDEApplication a( argc, argv, "KPalettetest" );
 
     TQStringList palettes = KPalette::getPaletteList();
     for(TQStringList::ConstIterator it = palettes.begin(); 
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index 678a1eeb6..1890ff13e 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -57,7 +57,7 @@ void TestWidget::slotSubMenuCalled(int id)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "menutest");
+    TDEApplication *app = new TDEApplication(argc, argv, "menutest");
     
     TestWidget w;
     app->setMainWidget(&w);
diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp
index 41dfd0a57..84cc7ae65 100644
--- a/tdeui/tests/kpixmapregionselectordialogtest.cpp
+++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp
@@ -15,7 +15,7 @@ int main(int argc, char**argv)
 {
   TDECmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0");
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app("test");
+  TDEApplication app("test");
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->count()!=1)
diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/kpopuptest.cpp
index 3db71106b..e5d01c985 100644
--- a/tdeui/tests/kpopuptest.cpp
+++ b/tdeui/tests/kpopuptest.cpp
@@ -30,7 +30,7 @@ public:
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kpopupmenutest");
+    TDEApplication app(argc, argv, "kpopupmenutest");
     DemoWidget w;
     app.setMainWidget(&w);
     w.setFont(TQFont("helvetica", 12, TQFont::Bold), true);
diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp
index 7b7024135..c3665865d 100644
--- a/tdeui/tests/kprogresstest.cpp
+++ b/tdeui/tests/kprogresstest.cpp
@@ -46,7 +46,7 @@ void MyWidget::timerEvent(TQTimerEvent *)
 
 int main(int argc, char *argv[])
 {
-	KApplication app(argc, argv, "KProgressTest");
+	TDEApplication app(argc, argv, "KProgressTest");
 	MyWidget w;
 	
 	app.setMainWidget(&w);
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index 2f16605d9..f227301b9 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -358,10 +358,10 @@ KRulerTest::slotSetYTrans(double d)
 /* --- MAIN -----------------------*/
 int main(int argc, char **argv)
 {
-  KApplication *testapp;
+  TDEApplication *testapp;
   KRulerTest   *window;
 
-  testapp = new KApplication(argc, argv,"krulertest");
+  testapp = new TDEApplication(argc, argv,"krulertest");
   testapp->setFont(TQFont("Helvetica",12),true);
 
   window = new KRulerTest("main");
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/kspelltest.cpp
index 9180ed376..7941ade87 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/kspelltest.cpp
@@ -26,7 +26,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KSpellTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KSpellTest");
 
     // test ASCII
     //TQString text( "I have noo idee of how to wride englisch or englisch" );
diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp
index 62f3c1a76..a0a0e400f 100644
--- a/tdeui/tests/ksqueezedtextlabeltest.cpp
+++ b/tdeui/tests/ksqueezedtextlabeltest.cpp
@@ -3,7 +3,7 @@
 
 int main( int argc, char **argv )
 {
-	KApplication app( argc, argv, "KSqueezedTextLabelTest" );
+	TDEApplication app( argc, argv, "KSqueezedTextLabelTest" );
 
 	KSqueezedTextLabel l( "This is a rather long string", 0);
 	app.setMainWidget( &l );
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 669044c55..742490aae 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -22,7 +22,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     menuBar = new KMenuBar (this);
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
-    fileMenu->insertItem ("&Exit", KApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
@@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name)
 
     setCentralWidget(widget);
 
-    setCaption( KApplication::kApplication()->caption() );
+    setCaption( TDEApplication::kApplication()->caption() );
 
     smenu = new TQPopupMenu;
   
@@ -104,7 +104,7 @@ testWindow::~testWindow ()
 
 int main( int argc, char *argv[] )
 {
-        KApplication *myApp = new KApplication( argc, argv, "KStatusBarTest" );
+        TDEApplication *myApp = new TDEApplication( argc, argv, "KStatusBarTest" );
         testWindow *test = new testWindow;
 
         myApp->setMainWidget(test);
diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp
index dcee78346..07572f8d3 100644
--- a/tdeui/tests/ksystemtraytest.cpp
+++ b/tdeui/tests/ksystemtraytest.cpp
@@ -3,7 +3,7 @@
 
 int main(int argc, char **argv)
 {
-	KApplication app( argc, argv, "ksystemtraytest" );
+	TDEApplication app( argc, argv, "ksystemtraytest" );
 	TQLabel *l = new TQLabel("System Tray Main Window", 0L);
 	KSystemTray *tray = new KSystemTray( l );
     tray->setText("Test");
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index 33e7fc5b7..b864017b0 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -30,7 +30,7 @@
 
 TQFont default_font("Helvetica", 12);
 
-KApplication *a;
+TDEApplication *a;
 
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -90,7 +90,7 @@ void TopLevel::okPressed()
 
 int main( int argc, char ** argv )
 {
-    a = new KApplication ( argc, argv, "KTabCtlTest" );
+    a = new TDEApplication ( argc, argv, "KTabCtlTest" );
 
     a->setFont(default_font);
 
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 0fd72851b..84a35952f 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -355,7 +355,7 @@ void Test::toggleLabels(bool state)
 int main(int argc, char** argv )
 {
     TDECmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0");
-    KApplication app(argc, argv);
+    TDEApplication app(argc, argv);
     Test *t = new Test();
 
     app.setMainWidget( t );
diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp
index d43f77260..6af109d5a 100644
--- a/tdeui/tests/ktextedittest.cpp
+++ b/tdeui/tests/ktextedittest.cpp
@@ -24,7 +24,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "ktextedittest" );
+    TDEApplication app( argc, argv, "ktextedittest" );
     KTextEdit *edit = new KTextEdit();
     edit->setReadOnly( true );
     edit->setCheckSpellingEnabled( true );
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index 324accc7d..fe56c6df7 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -5,7 +5,7 @@
 int main(int argc, char** argv)
 {
   KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KTimeWidgettest");
+  TDEApplication app(argc, argv, "KTimeWidgettest");
   KTimeWidget timeWidget;
   app.setMainWidget(&timeWidget);
   timeWidget.show();
diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp
index 020834605..5c1ffa757 100644
--- a/tdeui/tests/ktoolbarlabelactiontest.cpp
+++ b/tdeui/tests/ktoolbarlabelactiontest.cpp
@@ -84,7 +84,7 @@ public:
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "ktoolbarlabelactiontest" );
+  TDEApplication app( argc, argv, "ktoolbarlabelactiontest" );
 
   KGlobal::instance()->dirs()->addResourceDir("data", ".");
 
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 7f5b2cc78..d9e7448d8 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -166,7 +166,7 @@ void myTopWidget::rebalance()
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KUnbalancedGradientTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KUnbalancedGradientTest");
     myTopWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index 91974263e..f103a114f 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -25,7 +25,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication a(argc,argv,"kwizardtest");
+  TDEApplication a(argc,argv,"kwizardtest");
   KWizard *wiz = new KWizard(0, "kwizardtest", false);
   TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()),
 		   &a, TQT_SLOT(quit()));
diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp
index ad60bd897..bd51800e8 100644
--- a/tdeui/tests/kwordwraptest.cpp
+++ b/tdeui/tests/kwordwraptest.cpp
@@ -23,7 +23,7 @@
 
 int main(int argc, char *argv[])
 {
-	KApplication app(argc, argv, "KWordWrapTest");
+	TDEApplication app(argc, argv, "KWordWrapTest");
 	
 	TQFont font( "helvetica", 12 ); // let's hope we all have the same...
 	TQFontMetrics fm( font );
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index a903aeb3f..dbe688ebf 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -18,7 +18,7 @@ void Client::slotSec()
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kxmlguitest" );
+    TDEApplication app( argc, argv, "kxmlguitest" );
 
     // KXMLGUIClient looks in the "data" resource for the .rc files
     // Let's add $PWD (ideally $srcdir instead...) to it
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index b967987bf..32027bce1 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -55,7 +55,7 @@ setAutoSaveSettings();
     menuBar->insertItem ("&File", fileMenu);
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
-    fileMenu->insertItem ("&Exit", KApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
@@ -148,7 +148,7 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("exit");
-    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(),
+    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
@@ -408,7 +408,7 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("exit");
-     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(),
+     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
                            TQT_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;
@@ -504,7 +504,7 @@ int main( int argc, char *argv[] )
     int i;
     TDECmdLineArgs::init(argc, argv, "KWindowTest", "description", "version");
 
-    KApplication *myApp = new KApplication();
+    TDEApplication *myApp = new TDEApplication();
     testWindow *test = new testWindow;
 
     myApp->setMainWidget(test);