Rename KApplication to TDEApplication to avoid conflicts with KDE4

74 files changed, 353 insertions, 353 deletions

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();