Rename KApplication to TDEApplication to avoid conflicts with KDE4

172 files changed, 412 insertions, 412 deletions

diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index 276bab1e8..f91275f21 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -137,8 +137,8 @@ of <guilabel>Services Preference Order.</guilabel></para></listitem>
 </question>
 <answer>
 <para>They are used by all &tde; applications (since they are implemented in
-<classname>KApplication</classname> and all good &tde; programs create a
-<classname>KApplication</classname> object before they even look at the
+<classname>TDEApplication</classname> and all good &tde; programs create a
+<classname>TDEApplication</classname> object before they even look at the
 command line arguments).</para> <para>A standard line for a &tde;
 application looks like this: <userinput><command>foo</command>
 <option>... %i %m -caption \"%c\"</option></userinput>. Pretty confusing,
diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp
index c83014415..a0aae0347 100644
--- a/drkonqi/crashtest.cpp
+++ b/drkonqi/crashtest.cpp
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app(false, false);
+  TDEApplication app(false, false);
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQCString type = args->count() ? args->arg(0) : "";
   int crashtype = Crash;
diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp
index 5de09ed8b..8e40ea8bb 100644
--- a/drkonqi/main.cpp
+++ b/drkonqi/main.cpp
@@ -80,9 +80,9 @@ int main( int argc, char* argv[] )
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
-  KApplication a;
+  TDEApplication a;
 
   KrashConfig krashconf;
 
diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp
index c5f1f57a3..b28cf01cc 100644
--- a/kappfinder/main.cpp
+++ b/kappfinder/main.cpp
@@ -43,7 +43,7 @@ int main( int argc, char *argv[] )
   TDECmdLineArgs::addCmdLineOptions( options );
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-  KApplication app;
+  TDEApplication app;
 
   TopLevel *dlg = new TopLevel( args->getOption( "dir" ) );
   app.setMainWidget( dlg );
diff --git a/kate/ChangeLog b/kate/ChangeLog
index e6aedc9b6..e97ab3515 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -208,7 +208,7 @@
   * QPopupMenu for filelist
 
 2001-03-20 Christoph Cullmann <[email protected]>
-  * kate is now a normal KApplication
+  * kate is now a normal TDEApplication
 
 2001-03-18 Christoph Cullmann <[email protected]>
   * big location changes of source files
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 2553000a1..dd9d0ba84 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -52,7 +52,7 @@
 #include <sys/types.h>
 
 KateApp::KateApp (TDECmdLineArgs *args)
- : KApplication ()
+ : TDEApplication ()
  , m_args (args)
  , m_shouldExit (false)
 {
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index ffbd56e3e..fb7d30f5b 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -39,7 +39,7 @@ class TDECmdLineArgs;
  * Kate Application
  * This class represents the core kate application object
  */
-class KDE_EXPORT KateApp : public KApplication
+class KDE_EXPORT KateApp : public TDEApplication
 {
   Q_OBJECT
 
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index dd2768b1a..02b00017f 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -591,7 +591,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KGlobal::locale()->insertCatalogue("katepart");
 
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 93eb84a9e..eb40e77c0 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -241,7 +241,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
   app.dcopClient()->registerAs( "kcminit", false );
   KLocale::setMainCatalogue(0);
   KCMInit kcminit( TDECmdLineArgs::parsedArgs());
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index a69c47304..d119ed683 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -357,7 +357,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
     }
 
   // process other events as usual
-  return KApplication::x11EventFilter(event);
+  return TDEApplication::x11EventFilter(event);
 }
 
 
@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
       lay->setSpacing(KDialog::spacingHint());
 
       TQLabel *label1 = new TQLabel( contents);
-      TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
       if (pixmap.isNull())
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index d65d9b038..51d114582 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_isBusyCursor = false;
     m_enableBusyCursor = false;
     m_pDirs = KGlobal::dirs();
-    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
+    m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
     m_pProc = 0L;
     m_Tempfile = 0L;
     m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
 void KBackgroundRenderer::desktopResized()
 {
     m_State = 0;
-    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
+    m_rSize = drawBackgroundPerScreen() ? TDEApplication::desktop()->screenGeometry(screen()).size() : TDEApplication::desktop()->geometry().size();
     if( !m_bPreview )
         m_Size = m_rSize;
 }
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     }
 
     initRenderers();
-    m_size = KApplication::desktop()->geometry().size();
+    m_size = TDEApplication::desktop()->geometry().size();
 }
 
 KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
 
 void KVirtualBGRenderer::desktopResized()
 {
-    m_size = KApplication::desktop()->geometry().size();
+    m_size = TDEApplication::desktop()->geometry().size();
 
     if (m_pPixmap)
     {
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
 
 TQSize KVirtualBGRenderer::renderSize(int screen)
 {
-    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
+    return m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
 }
 
 
@@ -1205,7 +1205,7 @@ void KVirtualBGRenderer::initRenderers()
 
     m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
 
-    m_numRenderers = m_bDrawBackgroundPerScreen ? KApplication::desktop()->numScreens() : 1;
+    m_numRenderers = m_bDrawBackgroundPerScreen ? TDEApplication::desktop()->numScreens() : 1;
 
     m_bFinished.resize(m_numRenderers);
     m_bFinished.fill(false);
@@ -1264,11 +1264,11 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen)
         // There's more than one renderer, so we are drawing each output to our own pixmap
 
         TQRect overallGeometry;
-        for (int i=0; i < KApplication::desktop()->numScreens(); ++i) {
-            overallGeometry |= KApplication::desktop()->screenGeometry(i);
+        for (int i=0; i < TDEApplication::desktop()->numScreens(); ++i) {
+            overallGeometry |= TDEApplication::desktop()->screenGeometry(i);
         }
 
-        TQPoint drawPos = KApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
+        TQPoint drawPos = TDEApplication::desktop()->screenGeometry(screen).topLeft() - overallGeometry.topLeft();
         drawPos.setX( int(drawPos.x() * m_scaleX) );
         drawPos.setY( int(drawPos.y() * m_scaleY) );
 
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 40013c166..4e9f50121 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -120,7 +120,7 @@ int main(int argc, char ** argv)
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if (args->count() == 0)
diff --git a/kcontrol/icons/testicons.cpp b/kcontrol/icons/testicons.cpp
index d47f8af72..64f326ebf 100644
--- a/kcontrol/icons/testicons.cpp
+++ b/kcontrol/icons/testicons.cpp
@@ -5,7 +5,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "testicons");
+    TDEApplication app(argc, argv, "testicons");
     KIconConfig *w = new KIconConfig(0L, "testicons");
     app.setMainWidget(w);
     w->show();
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index bcf7c69bf..6f29c2c8b 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -827,7 +827,7 @@ void MouseSettings::save(KConfig *config)
   }
 #endif
   config->sync();
-  KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_MOUSE);
+  KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_MOUSE);
 }
 
 void MouseConfig::slotScrollPolarityChanged()
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index cd096fa76..0c2c9a68e 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -99,7 +99,7 @@ TopLevel::TopLevel(const char* name)
   searchLayout->setMargin( 6 );
 
   TQPushButton *clearButton = new TQPushButton( mSearchFrame );
-  clearButton->setIconSet( KApplication::reverseLayout() ?
+  clearButton->setIconSet( TDEApplication::reverseLayout() ?
     SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
   searchLayout->addWidget( clearButton );
   TQToolTip::add( clearButton, i18n("Clear search") );
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index c31aaf85f..9f5a49040 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -130,7 +130,7 @@ void CommandShortcutsModule::initGUI()
 
 void CommandShortcutsModule::launchMenuEditor()
 {
-    if ( KApplication::startServiceByDesktopName( "kmenuedit",
+    if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
                                                   TQString() /*url*/,
                                                   0 /*error*/,
                                                   0 /*dcopservice*/,
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index a854479e8..265f25564 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -81,7 +81,7 @@ void ShortcutsModule::save()
 	m_actionsGeneral.writeActions( "Global Shortcuts", 0, true, true );
 	m_actionsSequence.writeActions( "Global Shortcuts", 0, true, true );
 
-	KIPC::sendMessageAll( KIPC::SettingsChanged, KApplication::SETTINGS_SHORTCUTS );
+	KIPC::sendMessageAll( KIPC::SettingsChanged, TDEApplication::SETTINGS_SHORTCUTS );
 }
 
 void ShortcutsModule::defaults()
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 1ba7822ec..df1bbe746 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -188,7 +188,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
 
 void CKFileFontView::selected(TQListViewItem *item)
 {
-    if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
+    if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
          KGlobalSettings::singleClick())
     {
         const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h
index 70543a8f3..0364e0bbd 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h
@@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow
 
 };
 
-class CFontViewerApp : public KApplication
+class CFontViewerApp : public TDEApplication
 {
     public:
 
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 63adf48d5..8380efbdd 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -289,7 +289,7 @@ void MenuTab::defaults()
 
 void MenuTab::launchMenuEditor()
 {
-    if ( KApplication::startServiceByDesktopName( "kmenuedit",
+    if ( TDEApplication::startServiceByDesktopName( "kmenuedit",
                                                   TQString::null /*url*/,
                                                   0 /*error*/,
                                                   0 /*dcopservice*/,
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index a66597f8d..307a04a6d 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -400,7 +400,7 @@ void DesktopBehavior::save()
        kapp->dcopClient()->attach();
     TQByteArray data;
 
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 07ee4663e..37ab6f71c 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -335,7 +335,7 @@ void KonqFontOptions::save()
     kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     // Tell kdesktop about the new config file
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index e79fbd9ce..e0a0d0780 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -35,7 +35,7 @@
 
 static TQCString configname()
 {
-	int desktop = KApplication::desktop()->primaryScreen();
+	int desktop = TDEApplication::desktop()->primaryScreen();
 	TQCString name;
 	if (desktop == 0)
 		name = "kdesktoprc";
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 4110762cb..589ad0e3a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -251,7 +251,7 @@ void DesktopPathConfig::save()
     if (pathChanged)
     {
         kdDebug() << "DesktopPathConfig::save sending message SettingsChanged" << endl;
-        KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS);
+        KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
     }
 
     // Tell kdesktop about the new config file
@@ -259,7 +259,7 @@ void DesktopPathConfig::save()
        kapp->dcopClient()->attach();
     TQByteArray data;
 
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 681863cb6..c2c411b3e 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -106,9 +106,9 @@ void advancedTabDialog::save()
     else m_pConfig->writeEntry( "MultipleTabConfirm", true );
 
     TQByteArray data;
-    if ( !KApplication::kApplication()->dcopClient()->isAttached() )
+    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-    KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     actionButton(Apply)->setEnabled(false);
 }
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 3b88ec5b2..af817b4f5 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -422,7 +422,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version
 void runRdb( uint flags )
 {
   // Obtain the application palette that is about to be set.
-  TQPalette newPal = KApplication::createApplicationPalette();
+  TQPalette newPal = TDEApplication::createApplicationPalette();
   bool exportColors      = flags & KRdbExportColors;
   bool exportQtColors    = flags & KRdbExportQtColors;
   bool exportQtSettings  = flags & KRdbExportQtSettings;
diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/krandrapp.cpp
index eab459e8e..f5cfbbde1 100644
--- a/kcontrol/randr/krandrapp.cpp
+++ b/kcontrol/randr/krandrapp.cpp
@@ -43,5 +43,5 @@ bool KRandRApp::x11EventFilter(XEvent* e)
 	if (e->type == m_tray->screenChangeNotifyEvent()) {
 		m_eventMergingTimer.start(1000, TRUE);
 	}
-	return KApplication::x11EventFilter( e );
+	return TDEApplication::x11EventFilter( e );
 }
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 89315f75c..2cdcdb636 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -537,7 +537,7 @@ void KRandRSystemTray::slotDisplayConfig()
 
 void KRandRSystemTray::slotSettingsChanged(int category)
 {
-	if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+	if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
 		globalKeys->readSettings();
 		globalKeys->updateConnections();
 	}
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index 39903351b..c1a9e6a41 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	KRandRApp app;
 
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index b1678d2ea..4d4f7b071 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   config = new KConfig("ksmartcardrc", false, false);
 
-  DCOPClient *dc = KApplication::kApplication()->dcopClient();
+  DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
 
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 5ea993964..1a312034d 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -79,11 +79,11 @@ void SMServerConfig::load(bool useDefaults )
   else // "restorePreviousLogout"
       dialog->previousSessionRadio->setChecked(true);
 
-  switch (c->readNumEntry("shutdownType", int(KApplication::ShutdownTypeNone))) {
-  case int(KApplication::ShutdownTypeHalt):
+  switch (c->readNumEntry("shutdownType", int(TDEApplication::ShutdownTypeNone))) {
+  case int(TDEApplication::ShutdownTypeHalt):
     dialog->haltRadio->setChecked(true);
     break;
-  case int(KApplication::ShutdownTypeReboot):
+  case int(TDEApplication::ShutdownTypeReboot):
     dialog->rebootRadio->setChecked(true);
     break;
   default:
@@ -116,10 +116,10 @@ void SMServerConfig::save()
 
   c->writeEntry( "shutdownType",
                  dialog->haltRadio->isChecked() ?
-                   int(KApplication::ShutdownTypeHalt) :
+                   int(TDEApplication::ShutdownTypeHalt) :
                    dialog->rebootRadio->isChecked() ?
-                     int(KApplication::ShutdownTypeReboot) :
-                     int(KApplication::ShutdownTypeNone));
+                     int(TDEApplication::ShutdownTypeReboot) :
+                     int(TDEApplication::ShutdownTypeNone));
   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
   c->setGroup("Logout");
   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f20477246..78126222e 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -648,7 +648,7 @@ void KCMStyle::save()
 
 	if ( m_bToolbarsDirty )
 		// ##### FIXME - Doesn't apply all settings correctly due to bugs in
-		// KApplication/KToolbar
+		// TDEApplication/KToolbar
 		KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
 
 	if (m_bEffectsDirty) {
@@ -866,7 +866,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
 	// for other styles being previewed. (e.g SGI style)
 	w->unsetPalette();
 
-	TQPalette newPalette(KApplication::createApplicationPalette());
+	TQPalette newPalette(TDEApplication::createApplicationPalette());
 	s->polish( newPalette );
 	w->setPalette(newPalette);
 
diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp
index 0db66161f..9ab6d4428 100644
--- a/kdcop/kdcop.cpp
+++ b/kdcop/kdcop.cpp
@@ -27,7 +27,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KDCOPWindow* kdcopwindow = new KDCOPWindow;
   a.setMainWidget( kdcopwindow );
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index c8fc89720..716b77077 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
   void
 DCOPBrowserApplicationItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
   bool isDefault = false;
@@ -175,7 +175,7 @@ DCOPBrowserApplicationItem::populate()
     isDefault = false;
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCString& /*replyType*/, const TQByteArray &replyData)
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
   void
 DCOPBrowserInterfaceItem::populate()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   bool ok = false;
 
@@ -250,7 +250,7 @@ DCOPBrowserInterfaceItem::populate()
     if ((*it) != "QCStringList functions()")
       new DCOPBrowserFunctionItem(this, app_, object_, *it);
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 // ------------------------------------------------------------------------
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
 
 void KDCOPWindow::slotFillApplications()
 {
-  KApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(tqwaitCursor);
 
   QCStringList apps = dcopClient->registeredApplications();
   TQCString appId = dcopClient->appId();
@@ -917,7 +917,7 @@ void KDCOPWindow::slotFillApplications()
     }
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 bool KDCOPWindow::demarshal
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index 278f267d5..aa0aa598d 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
 
     m_pDesktop = desktop;
     if (desktop == 0L)
-        desktop = TQT_TQWIDGET(KApplication::desktop()->screen());
+        desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
 
     m_Renderer.resize( 1 );
     m_Cache.resize( 1 );
@@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
           root_cleared = true;
 	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
-          TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
-          TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+          TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
+          TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
        }
     }
     else
     {
-        TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
-        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
     }
 
      // and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
 
 void KBackgroundManager::clearRoot()
 {
-    TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap());
-    TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+    TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
+    TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
 }
 
 /*
@@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground()
     if (m_pDesktop)
        m_pDesktop->repaint();
     else
-        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
+        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
 }
 
 void KBackgroundManager::desktopResized()
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 0a105a373..42f7f8a7d 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -794,13 +794,13 @@ void KDesktop::configure()
 void KDesktop::slotSettingsChanged(int category)
 {
     //kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl;
-    if (category == KApplication::SETTINGS_PATHS)
+    if (category == TDEApplication::SETTINGS_PATHS)
     {
         kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl;
         if (m_pIconView)
             m_pIconView->recheckDesktopURL();
     }
-    else if (category == KApplication::SETTINGS_SHORTCUTS)
+    else if (category == TDEApplication::SETTINGS_SHORTCUTS)
     {
         kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl;
         keys->readSettings();
@@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url)
 // for dcop interface backward compatibility
 void KDesktop::logout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeNone );
+    logout( TDEApplication::ShutdownConfirmDefault,
+            TDEApplication::ShutdownTypeNone );
 }
 
-void KDesktop::logout( KApplication::ShutdownConfirm confirm,
-                       KApplication::ShutdownType sdtype )
+void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
+                       TDEApplication::ShutdownType sdtype )
 {
     if( !kapp->requestShutDown( confirm, sdtype ) )
         // this i18n string is also in kicker/applets/run/runapplet
@@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm,
 
 void KDesktop::slotLogout()
 {
-    logout( KApplication::ShutdownConfirmDefault,
-            KApplication::ShutdownTypeDefault );
+    logout( TDEApplication::ShutdownConfirmDefault,
+            TDEApplication::ShutdownTypeDefault );
 }
 
 void KDesktop::slotLogoutNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeNone );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeNone );
 }
 
 void KDesktop::slotHaltNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeHalt );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeHalt );
 }
 
 void KDesktop::slotRebootNoCnf()
 {
-    logout( KApplication::ShutdownConfirmNo,
-            KApplication::ShutdownTypeReboot );
+    logout( TDEApplication::ShutdownConfirmNo,
+            TDEApplication::ShutdownTypeReboot );
 }
 
 void KDesktop::setVRoot( bool enable )
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index cad822fc2..a681dc9a5 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -94,7 +94,7 @@ public:
 
   virtual void desktopIconsAreaChanged(const TQRect &area, int screen);
 
-  void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
+  void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype );
 
   KWinModule* twinModule() const { return m_pKwinmodule; }
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 1590443d8..387195a4f 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -780,7 +780,7 @@ void KDIconView::saveMediaListView()
 
     // Reload kdesktop configuration to apply changes
     TQByteArray data;
-    int konq_screen_number = KApplication::desktop()->primaryScreen();
+    int konq_screen_number = TDEApplication::desktop()->primaryScreen();
     TQCString appname;
     if (konq_screen_number == 0)
         appname = "kdesktop";
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 90b4ebd66..283d46cb3 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -523,7 +523,7 @@ void KRootWm::slotToggleAutoAlign( bool b )
     KDesktopSettings::writeConfig();
 
     // Also save it globally...
-    int desktop = KApplication::desktop()->primaryScreen();
+    int desktop = TDEApplication::desktop()->primaryScreen();
     TQCString cfilename;
     if (desktop == 0)
         cfilename = "kdesktoprc";
@@ -627,7 +627,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 void KRootWm::slotWindowList() {
 //  kdDebug() << "KRootWm::slotWindowList" << endl;
 // Popup at the center of the screen, this is from keyboard shortcut.
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -647,7 +647,7 @@ void KRootWm::slotSwitchUser() {
 //  kdDebug() << "KRootWm::slotSwitchUser" << endl;
   if (!sessionsMenu)
     return;
-  TQDesktopWidget* desktop = KApplication::desktop();
+  TQDesktopWidget* desktop = TDEApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
       r = desktop->geometry();
@@ -830,7 +830,7 @@ void KRootWm::slotSave() {
 
 
 void KRootWm::slotLogout() {
-    m_pDesktop->logout(KApplication::ShutdownConfirmDefault, KApplication::ShutdownTypeDefault);
+    m_pDesktop->logout(TDEApplication::ShutdownConfirmDefault, TDEApplication::ShutdownTypeDefault);
 }
 
 void KRootWm::slotPopulateSessions()
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 111af852d..2c8650f85 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
 
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() != 3 && args->count() != 4 )
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 68d1c1943..61f3cfd4f 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -94,7 +94,7 @@ int main( int argc, char **argv)
 	TDECmdLineArgs::addCmdLineOptions( options );
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	KApplication app;
+	TDEApplication app;
 	app.disableSessionManagement();
 
 	if (args->isSet( "xdgname" ) == true) {
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 5db594306..cd8f38da1 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -776,7 +776,7 @@ void LockProcess::startSecureDialog()
 	}
 	if (ret == 3) {
 		trinity_desktop_lock_closing_windows = 1;
-		DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive);
+		DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
 		kapp->quit();
 	}
 	// FIXME
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 88c28d11b..89e29a5c0 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
         }
     }
 #endif
-    return KApplication::x11EventFilter( ev );
+    return TDEApplication::x11EventFilter( ev );
 }
 
 
@@ -213,7 +213,7 @@ int main( int argc, char **argv )
 
     putenv(strdup("SESSION_MANAGER="));
 
-    KApplication::disableAutoDcopRegistration(); // not needed
+    TDEApplication::disableAutoDcopRegistration(); // not needed
 
     XSetErrorHandler(trapXErrors);
 
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index 23797e4b0..12db9ebca 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -24,10 +24,10 @@
 
 #include <time.h>
 
-class MyApp : public KApplication {
+class MyApp : public TDEApplication {
     Q_OBJECT
 public:
-    MyApp() : KApplication(), lastTick( 0 ) {}
+    MyApp() : TDEApplication(), lastTick( 0 ) {}
 protected:
     bool x11EventFilter( XEvent * );
 signals:
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 51520b9e7..89b4bc69f 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -650,7 +650,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 9f7b70ebd..e15564eb4 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -311,9 +311,9 @@ static int directCommand(TDECmdLineArgs *args)
 	    int w, h;
 	    int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	    if ( (m & XNegative) )
-		x = KApplication::desktop()->width()  + x - w;
+		x = TDEApplication::desktop()->width()  + x - w;
 	    if ( (m & YNegative) )
-		y = KApplication::desktop()->height() + y - h;
+		y = TDEApplication::desktop()->height() + y - h;
 	    popup->setAnchor( TQPoint(x, y) );
 	}
 #endif
@@ -691,7 +691,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index d663d1bc3..536ffadce 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -47,9 +47,9 @@ void Widgets::handleXGeometry(TQWidget * dlg)
 	int w, h;
 	int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	if ( (m & XNegative) )
-	    x = KApplication::desktop()->width()  + x - w;
+	    x = TDEApplication::desktop()->width()  + x - w;
 	if ( (m & YNegative) )
-	    y = KApplication::desktop()->height() + y - h;
+	    y = TDEApplication::desktop()->height() + y - h;
 	dlg->setGeometry(x, y, w, h);
 	// kdDebug() << "x: " << x << "  y: " << y << "  w: " << w << "  h: " << h << endl;
     }
diff --git a/kfind/main.cpp b/kfind/main.cpp
index 448f98218..b57177cb0 100644
--- a/kfind/main.cpp
+++ b/kfind/main.cpp
@@ -45,7 +45,7 @@ int main( int argc, char ** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs();
 
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 89a664d1c..506a6eda5 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -76,7 +76,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
   KHC::Application app;
 
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 96e4ce500..5c08592bd 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -113,7 +113,7 @@ void DocEntry::setIdentifier( const TQString &identifier )
 
 TQString DocEntry::identifier() const
 {
-  if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 );
+  if ( mIdentifier.isEmpty() ) mIdentifier = TDEApplication::randomString( 15 );
   return mIdentifier;
 }
 
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index 77bf2d62d..eb73d11cd 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::addCmdLineOptions( options );
 
   KGlobal::locale()->setMainCatalogue("htmlsearch");
-  KApplication app;
+  TDEApplication app;
   HTMLSearch search;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index ca12b5b91..03a076651 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -183,7 +183,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 17f76cdcd..c2179e702 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -100,7 +100,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
     searchLayout->setMargin( 6 );
 
     TQPushButton *clearButton = new TQPushButton( mSearchFrame );
-    clearButton->setIconSet( KApplication::reverseLayout() ?
+    clearButton->setIconSet( TDEApplication::reverseLayout() ?
       SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
     searchLayout->addWidget( clearButton );
     connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index 13b0e1800..e5d204461 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -91,7 +91,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   kdDebug() << "Scanning Meta Info" << endl;
 
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 84b0458b9..bd3a055ca 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -133,7 +133,7 @@ void Module::save()
         if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
             {
             kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-            KApplication::tdeinitExec( "khotkeys" );
+            TDEApplication::tdeinitExec( "khotkeys" );
             }
         else
             {
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 3880fc093..2d0d23b13 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -194,7 +194,7 @@ void khotkeys_send_reread_config()
     if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-        KApplication::tdeinitExec( "khotkeys" );
+        TDEApplication::tdeinitExec( "khotkeys" );
         }
     else
         {
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 5387382fa..00649d854 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
 	"KHotKeys update utility", "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
+    TDEApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString id = args->getOption( "id" );
     TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 330a2122e..ced1fb363 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
     connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
 
-    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
-    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
+    settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Digital
     digitalPage = new DigitalWidget(0, "DigitalClock");
     settings->widgetStack->addWidget(digitalPage, 1);
-    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Analog
     analogPage = new AnalogWidget(0, "AnalogClock");
     settings->widgetStack->addWidget(analogPage, 2);
-    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     // Fuzzy
     fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
     settings->widgetStack->addWidget(fuzzyPage, 3);
-    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
     connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
             TQT_SLOT(dateToggled()));
@@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
         p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
     }
     else if (_prefs->digitalBackgroundColor() !=
-             KApplication::palette().active().background())
+             TDEApplication::palette().active().background())
     {
         p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
     }
@@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
 
         paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
     }
-    else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
+    else if (_prefs->analogBackgroundColor() != TDEApplication::palette().active().background())
     {
         _spPx->fill(_prefs->analogBackgroundColor());
     }
@@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
 
 void ClockApplet::updateFollowBackground()
 {
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = TDEApplication::palette().active().background();
     TQColor bgColor;
     
     switch (_prefs->type())
@@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
 
 void ClockApplet::setBackground()
 {
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = TDEApplication::palette().active().background();
     TQColor fgColor, bgColor;
     
     if (!_clock)
@@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
     if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
         return;
     
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = TDEApplication::palette().active().background();
     
     if (m_dateFollowBackgroundSetting)
         _prefs->setDateBackgroundColor(globalBgroundColor);
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index 04beba322..e5b461e1c 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -20,11 +20,11 @@
   <group name="Date">
     <entry name="DateForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">TDEApplication::palette().active().text()</default>
     </entry>
     <entry name="DateBackgroundColor" type="Color" key="Background_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">TDEApplication::palette().active().background()</default>
     </entry>
     <entry name="DateFont" type="Font" key="Font">
       <label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
     </entry>
     <entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">TDEApplication::palette().active().text()</default>
     </entry>
     <entry name="PlainBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">TDEApplication::palette().active().background()</default>
     </entry>
   </group>
   <group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
     </entry>
     <entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">TDEApplication::palette().active().text()</default>
     </entry>
     <entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">TDEApplication::palette().active().background()</default>
     </entry>
     <entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::palette().active().mid()</default>
+      <default code="true">TDEApplication::palette().active().mid()</default>
     </entry>
     <entry name="DigitalBlink" type="Bool" key="Blink">
       <label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
     </entry>
     <entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">TDEApplication::palette().active().text()</default>
     </entry>
     <entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">TDEApplication::palette().active().background()</default>
     </entry>
     <entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::palette().active().mid()</default>
+      <default code="true">TDEApplication::palette().active().mid()</default>
     </entry>
     <entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
       <label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
     </entry>
     <entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">TDEApplication::palette().active().text()</default>
     </entry>
     <entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">TDEApplication::palette().active().background()</default>
     </entry>
     <entry name="Fuzzyness" type="Int">
       <label>Fuzzyness</label>
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 30b125726..3f46b6b11 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -129,7 +129,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     DEBUGSTR << "    QuickLauncher::QuickLauncher(" << configFile << 
                 ",...) END" << endl << flush;
 
-    DCOPClient *dcopClient = KApplication::dcopClient();
+    DCOPClient *dcopClient = TDEApplication::dcopClient();
     dcopClient->connectDCOPSignal(0, "appLauncher", 
         "serviceStartedByStorageId(TQString,TQString)",
         "QuickLauncherApplet",
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 0a899bd1d..8cbb33868 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -510,7 +510,7 @@
 2003-08-07 Thursday 19:51  lunakl
 
 	* Rewrite handling of _NET_WM_ICON_NAME. This together with the
-	  recent KApplication change should hopefully make taskbar again
+	  recent TDEApplication change should hopefully make taskbar again
 	  display what it's supposed to display. Please yell if something
 	  is still wrong.
 
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 34341cbfe..169fe5b52 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -78,7 +78,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
   TDECmdLineArgs::addCmdLineOptions( options );
   KGlobal::locale()->setMainCatalogue( "kasbarextension" );
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   kdDebug(1345) << "Kasbar starting..." << endl;
@@ -116,7 +116,7 @@ int main( int argc, char **argv )
   KWin::setOnAllDesktops( kasbar->winId(), true );
   kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
 
-  KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+  TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
 
   app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
 
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index c0a55753a..3a3a023fb 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
       detached_( false )
 {
     kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
-//    KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+//    TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
 
 //    setBackgroundMode( NoBackground );
     kasbar = new KasTasker( orientation(), this, name );
diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp
index a07a06cfc..5cec2ae22 100644
--- a/kicker/kicker/buttons/kbutton.cpp
+++ b/kicker/kicker/buttons/kbutton.cpp
@@ -66,7 +66,7 @@ KButton::~KButton()
 
 void KButton::properties()
 {
-    KApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
+    TDEApplication::startServiceByDesktopName("kmenuedit", TQStringList(),
                                             0, 0, 0, "", true);
 }
 
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index a61b5d775..3b70fe9c2 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -146,7 +146,7 @@ void URLButton::dropEvent(TQDropEvent *ev)
         KURL url( fileItem->url() );
         if(!execList.isEmpty())  {
              if (KDesktopFile::isDesktopFile(url.path())){
-                KApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
+                TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
                                                         0, 0, 0, "", true);
              }
              else // attempt to interpret path as directory
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 7410d4877..e965d3761 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -188,7 +188,7 @@ bool Kicker::desktopShowing()
 
 void Kicker::slotSettingsChanged(int category)
 {
-    if (category == (int)KApplication::SETTINGS_SHORTCUTS)
+    if (category == (int)TDEApplication::SETTINGS_SHORTCUTS)
     {
         keys->readSettings();
         keys->updateConnections();
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 4dc4c9864..82f82502c 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -139,7 +139,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     if (signal(SIGHUP, sighandler) == SIG_IGN)
 	signal(SIGHUP, SIG_IGN);
 
-    // send it even before KApplication ctor, because ksmserver will launch another app as soon
+    // send it even before TDEApplication ctor, because ksmserver will launch another app as soon
     // as TQApplication registers with it
     DCOPClient* cl = new DCOPClient;
     cl->attach();
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 763b6cbc1..fd51c9f82 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -150,7 +150,7 @@ void MenuManager::kmenuAccelActivated()
         // no button to use, make it behave like a desktop menu
         TQPoint p;
         // Popup the K-menu at the center of the screen.
-        TQDesktopWidget* desktop = KApplication::desktop();
+        TQDesktopWidget* desktop = TDEApplication::desktop();
         TQRect r;
         if (desktop->numScreens() < 2)
             r = desktop->geometry();
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index 110e1692f..d3fd5f755 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
 {
     // We must disguise as Kicker in order to obtain the correct reverseLayout setting.
     TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
-    KApplication app(false, false);
+    TDEApplication app(false, false);
 
     TQStringList stretchableApplets;
     stretchableApplets << "taskbarapplet.desktop";
diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
index 3cad77ca4..223074a8d 100644
--- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
+++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp
@@ -132,7 +132,7 @@ void KickoffBeaglePlugin::query(TQString term, bool _genericTitle)
 	kdDebug () << "Previous client w/id " << current_beagle_client->id << " still running ... ignoring it." << endl;
 	current_beagle_client->stopClient ();
     }
-    current_beagle_client_id = KApplication::random ();
+    current_beagle_client_id = TDEApplication::random ();
     kdDebug () << "Creating client with id:" << current_beagle_client_id << endl;
 
     BeagleClient *beagle_client = beagle_client_new (NULL);
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 25263e872..cd023eb8a 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -44,7 +44,7 @@ HideButton::HideButton(TQWidget *parent, const char *name)
     kapp->addKipcEventMask(KIPC::SettingsChanged);
     kapp->addKipcEventMask(KIPC::IconChanged);
 
-    slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+    slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
 }
 
 void HideButton::drawButton(TQPainter *p)
@@ -148,7 +148,7 @@ void HideButton::generateIcons()
 
 void HideButton::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 702c92173..48ef522fd 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -87,7 +87,7 @@ PanelKMenu::PanelKMenu()
     setCaption(i18n("TDE Menu"));
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
-    DCOPClient *dcopClient = KApplication::dcopClient();
+    DCOPClient *dcopClient = TDEApplication::dcopClient();
     dcopClient->connectDCOPSignal(0, "appLauncher",
         "serviceStartedByStorageId(TQString,TQString)",
         dcopObjId,
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index e8a51fe28..eb7fc8114 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2554,7 +2554,7 @@ void KMenu::slotStartService(KService::Ptr ptr)
     accept();
 
     addToHistory();
-    KApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
                                             TQStringList(), 0, 0, 0, "", true);
     updateRecentlyUsedApps(ptr);
 }
@@ -2587,12 +2587,12 @@ void KMenu::slotStartURL(const TQString& u)
         kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
 #else
         DCOPRef mediamanager("ksmserver", "ksmserver");
-        DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault );
+        DCOPReply reply = mediamanager.call( "logoutTimed", (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeDefault );
 	if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
                                                                                           i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeNone,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeNone,
+                                   TDEApplication::ShutdownModeDefault );
 
 #endif
     }
@@ -2610,9 +2610,9 @@ void KMenu::slotStartURL(const TQString& u)
 #else
         if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
                                                                       i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeHalt,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeHalt,
+                                   TDEApplication::ShutdownModeDefault );
 #endif
     }
     else if ( u == "kicker:/restart" ) {
@@ -2625,9 +2625,9 @@ void KMenu::slotStartURL(const TQString& u)
 #else
         if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"),
                                                                       i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeReboot,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeReboot,
+                                   TDEApplication::ShutdownModeDefault );
 #endif
     }
 #ifdef KDELIBS_SUSE
@@ -3197,7 +3197,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index 473b0cdf2..6e3802fe0 100644
--- a/kicker/kicker/ui/recentapps.cpp
+++ b/kicker/kicker/ui/recentapps.cpp
@@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
     stream << launchDCOPSignalSource() << strApp;
-    KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 
     for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 6cb184c72..8a483f086 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -554,7 +554,7 @@ void PanelServiceMenu::slotExec(int id)
     kapp->propagateSessionManager();
 
     KService::Ptr service = static_cast<KService *>(e);
-    KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 
     updateRecentlyUsedApps(service);
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e6a698153..c862b09c5 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -86,7 +86,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     m_textColor = KGlobalSettings::textColor();
 
-    updateSettings(KApplication::SETTINGS_MOUSE);
+    updateSettings(TDEApplication::SETTINGS_MOUSE);
 
     kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
 
@@ -219,7 +219,7 @@ void PanelButton::updateIcon(int group)
 
 void PanelButton::updateSettings(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 7fd2cca6d..3a455a58f 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -352,14 +352,14 @@ protected:
 
 protected slots:
     /**
-     * Called from KApplication when global icon settings have changed.
+     * Called from TDEApplication when global icon settings have changed.
      * @param group the new group
      */
     void updateIcon(int group);
 
     /**
-     * Called from KApplication when global settings have changed.
-     * @param category the settings category, see KApplication::SettingsCategory
+     * Called from TDEApplication when global settings have changed.
+     * @param category the settings category, see TDEApplication::SettingsCategory
      */
     void updateSettings(int category);
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index d4ca8faac..178277c25 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -55,7 +55,7 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
 
-    slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+    slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
 
 void SimpleButton::setPixmap(const TQPixmap &pix)
@@ -165,7 +165,7 @@ void SimpleButton::generateIcons()
 
 void SimpleButton::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index 24020e0c2..a3138102b 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -77,7 +77,7 @@ void FindMenu::slotExec( int pos )
   }
   else
   {
-    KApplication::startServiceByDesktopPath( app );
+    TDEApplication::startServiceByDesktopPath( app );
   }
 }
 
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 7eab40c34..093b4fc5e 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
         args << "-r";
         args << screenList[id - sessionList.count()];
     }
-    KApplication::tdeinitExec("konsole", args);
+    TDEApplication::tdeinitExec("konsole", args);
     return;
 }
 
@@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
     {
         args << "-T" << title;
         args << "--workdir" << url.path();
-        KApplication::tdeinitExec("konsole", args);
+        TDEApplication::tdeinitExec("konsole", args);
         return;
     }
     else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
             args << "-l" << url.user().latin1();
         }
         args << host.latin1();
-        KApplication::tdeinitExec("konsole", args);
+        TDEApplication::tdeinitExec("konsole", args);
         return;
     }
     /*
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 93a948dee..ee2a5268d 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -331,7 +331,7 @@ void PrefMenu::slotExec(int id)
     kapp->propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
-    KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
                                             TQStringList(), 0, 0, 0, "", true);
     m_dragStartPos = TQPoint(-1,-1);
 }
@@ -378,7 +378,7 @@ void PrefMenu::aboutToClose()
 
 void PrefMenu::launchControlCenter()
 {
-    KApplication::startServiceByDesktopName("kcontrol", TQStringList(),
+    TDEApplication::startServiceByDesktopName("kcontrol", TQStringList(),
                                             0, 0, 0, "", true);
 }
 
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index cdedfc73d..8e41497b6 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -827,7 +827,7 @@ void TOM::runTask(int id)
     if (!m_tasks.contains(id)) return;
 
     kapp->propagateSessionManager();
-    KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 }
 
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 04e81612e..328cec09c 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -78,10 +78,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "[email protected]");
     aboutData.addAuthor("Matthias Ettrich",0, "[email protected]");
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
-    KApplication a;
+    TDEApplication a;
     a.disableSessionManagement();
 
     KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index 4fa1d8332..0910294b1 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -82,10 +82,10 @@ int main( int argc, char ** argv )
     TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "[email protected]");
     aboutData.addAuthor("Matthias Ettrich",0, "[email protected]");
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
-    KApplication a;
+    TDEApplication a;
     a.disableSessionManagement();
 
     KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index eab6f4bb4..a5345dfcf 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -64,10 +64,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "[email protected]");
     aboutData.addAuthor("Matthias Ettrich",0, "[email protected]");
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
-    KApplication a;
+    TDEApplication a;
     a.disableSessionManagement();
 
     KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index fdb7e0ebf..131a1d79d 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -1176,7 +1176,7 @@ void TaskBar::slotActivatePreviousTask()
 
 void TaskBar::slotSettingsChanged( int category )
 {
-    if( category == (int) KApplication::SETTINGS_SHORTCUTS )
+    if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
     {
         keys->readSettings();
         keys->updateConnections();
diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp
index eb9acd15a..3f307f6fd 100644
--- a/kioslave/home/kio_home.cpp
+++ b/kioslave/home/kio_home.cpp
@@ -40,11 +40,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
 	int KDE_EXPORT kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app( false, false );
+		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
 		app.dcopClient()->attach();
 
diff --git a/kioslave/home/testhome.cpp b/kioslave/home/testhome.cpp
index e35b443c7..66b2df126 100644
--- a/kioslave/home/testhome.cpp
+++ b/kioslave/home/testhome.cpp
@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestHome test;
     test.setup();
diff --git a/kioslave/man/kio_man_test.cpp b/kioslave/man/kio_man_test.cpp
index 44623cb9f..03a7ee12e 100644
--- a/kioslave/man/kio_man_test.cpp
+++ b/kioslave/man/kio_man_test.cpp
@@ -27,7 +27,7 @@ protected:
 
 int main(int argc, char **argv)
 {
-  KApplication a( argc, argv , "p2");
+  TDEApplication a( argc, argv , "p2");
 
   MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out");
   testproto.showIndex("3");
diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp
index dc9542cd1..113d1b311 100644
--- a/kioslave/media/kio_media.cpp
+++ b/kioslave/media/kio_media.cpp
@@ -42,11 +42,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
 	int KDE_EXPORT kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app( false, false );
+		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
 		app.dcopClient()->attach();
 
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 6289a85fc..23a207fab 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url)
 	}
 }
 
-MountHelper::MountHelper() : KApplication()
+MountHelper::MountHelper() : TDEApplication()
 {
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
@@ -269,10 +269,10 @@ int main(int argc, char **argv)
 
 	TDECmdLineArgs::addCmdLineOptions( options );
 	KGlobal::locale()->setMainCatalogue("kio_media");
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 
 	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
-	KApplication *app = new  MountHelper();
+	TDEApplication *app = new  MountHelper();
 
 	KStartupInfo::appStarted();
 	app->dcopClient()->attach();
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index 4779c75ec..ffb5d1dba 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -30,7 +30,7 @@
 
 class Dialog;
 
-class MountHelper : public KApplication
+class MountHelper : public TDEApplication
 {
         Q_OBJECT
 public:
diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp
index 9bc8ac071..eb0871f6f 100644
--- a/kioslave/media/testmedia.cpp
+++ b/kioslave/media/testmedia.cpp
@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestMedia test;
     test.setup();
diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp
index 985593bb0..f4b71086d 100644
--- a/kioslave/remote/kio_remote.cpp
+++ b/kioslave/remote/kio_remote.cpp
@@ -40,11 +40,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
 	int KDE_EXPORT kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app( false, false );
+		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
 		app.dcopClient()->attach();
 
diff --git a/kioslave/remote/testremote.cpp b/kioslave/remote/testremote.cpp
index f493da2f4..d091c5bc4 100644
--- a/kioslave/remote/testremote.cpp
+++ b/kioslave/remote/testremote.cpp
@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestRemote test;
     test.setup();
diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp
index c9815ff7b..c64706d8d 100644
--- a/kioslave/system/kio_system.cpp
+++ b/kioslave/system/kio_system.cpp
@@ -41,11 +41,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
 	KDE_EXPORT int kdemain( int argc, char **argv )
 	{
-		// KApplication is necessary to use other ioslaves
+		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
 		TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
-		KApplication app( false, false );
+		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
 		app.dcopClient()->attach();
 
diff --git a/kioslave/system/testsystem.cpp b/kioslave/system/testsystem.cpp
index c3cc84c6e..7be993ff8 100644
--- a/kioslave/system/testsystem.cpp
+++ b/kioslave/system/testsystem.cpp
@@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestSystem test;
     test.setup();
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 6e81b61d3..b73528610 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -53,7 +53,7 @@
 #include "thumbnail.h"
 #include <kio/thumbcreator.h>
 
-// Use correctly KInstance instead of KApplication (but then no TQPixmap)
+// Use correctly KInstance instead of TDEApplication (but then no TQPixmap)
 #undef USE_KINSTANCE
 // Fix thumbnail: protocol
 #define THUMBNAIL_HACK (1)
@@ -98,16 +98,16 @@ int kdemain(int argc, char **argv)
 #ifdef USE_KINSTANCE
     KInstance instance("kio_thumbnail");
 #else
-    // creating KApplication in a slave in not a very good idea,
+    // creating TDEApplication in a slave in not a very good idea,
     // as dispatchLoop() doesn't allow it to process its messages,
     // so it for example wouldn't reply to ksmserver - on the other
     // hand, this slave uses QPixmaps for some reason, and they
     // need QApplication
-    // and HTML previews need even KApplication :(
+    // and HTML previews need even TDEApplication :(
     putenv(strdup("SESSION_MANAGER="));
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
 
-    KApplication app(argc, argv, "kio_thumbnail", false, true);
+    TDEApplication app(argc, argv, "kio_thumbnail", false, true);
 #endif
 
     if (argc != 4)
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index e8bd00792..edd0c372e 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -53,12 +53,12 @@ extern "C" {
     int KDE_EXPORT kdemain( int argc, char **argv )
     {
         //KInstance instance( "kio_trash" );
-        // KApplication is necessary to use kio_file
+        // TDEApplication is necessary to use kio_file
         putenv(strdup("SESSION_MANAGER="));
-        KApplication::disableAutoDcopRegistration();
+        TDEApplication::disableAutoDcopRegistration();
         TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
         TDECmdLineArgs::addCmdLineOptions( options );
-        KApplication app( false, false );
+        TDEApplication app( false, false );
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index 41980b060..630b8e314 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -37,14 +37,14 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init( argc, argv, "ktrash",
                         I18N_NOOP( "ktrash" ),
                         I18N_NOOP( "Helper program to handle the TDE trash can\n"
 				   "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ),
                         TDE_VERSION_STRING );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if ( args->isSet( "empty" ) ) {
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index 4819d8d55..d1efdf2cd 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -82,9 +82,9 @@ int main(int argc, char *argv[])
     setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true );
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication app;
 
     TestTrash test;
     test.setup();
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index f6d2fa933..8e5e0df08 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -527,7 +527,7 @@ void KlipperWidget::saveSession()
 
 void KlipperWidget::slotSettingsChanged( int category )
 {
-    if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+    if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
         globalKeys->readSettings();
         globalKeys->updateConnections();
         toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
@@ -1034,7 +1034,7 @@ bool KlipperWidget::ignoreClipboardChanges() const
 // which could possibly lead to TQClipboard reporting empty clipboard.
 // Therefore, tqt_x_time needs to be updated to current X server timestamp.
 
-// Call KApplication::updateUserTime() only from functions that are
+// Call TDEApplication::updateUserTime() only from functions that are
 // called from outside (DCOP), or from TQTimer timeout !
 
 static Time next_x_time;
diff --git a/knetattach/main.cpp b/knetattach/main.cpp
index 6d3f65b9d..ba9acb637 100644
--- a/knetattach/main.cpp
+++ b/knetattach/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
 	about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "[email protected]");
 
 	TDECmdLineArgs::init(argc, argv, &about);
-	KApplication a;
+	TDEApplication a;
 
 	KNetAttach na;
 	a.setMainWidget(&na);
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 1cd107d16..d9e62d28a 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
         TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) );
         TQString executable = args[ 0 ];
         args.remove( args.begin() );
-        KApplication::tdeinitExec( executable, args );
+        TDEApplication::tdeinitExec( executable, args );
         return;
     }
 
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index dd7e385e3..30f5b9c6a 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
  The URL is safe, if the view used to view it is listed in the allowed KPart's.
  In order to find out the part, mimetype is needed, and KTrader is needed.
  If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
- URLs, but oh well). Since this function may be running without a KApplication
+ URLs, but oh well). Since this function may be running without a TDEApplication
  instance, I'm actually quite surprised it works, and it may sooner or later break.
  Nice, isn't it?
 
@@ -234,7 +234,7 @@ static int currentScreen()
 {
     if( tqt_xdisplay() != NULL )
         return tqt_xscreen();
-    // case when there's no KApplication instance
+    // case when there's no TDEApplication instance
     const char* env = getenv( "DISPLAY" );
     if( env == NULL )
         return 0;
@@ -271,7 +271,7 @@ static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, co
     TQByteArray data;
     TQDataStream str( data, IO_WriteOnly );
     str << currentScreen();
-    if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
+    if( !TDEApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface",
              "processCanBeReused( int )", data, ret, appObj, false, 3000 ) )
         return "";
     return ret;
@@ -337,7 +337,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
         TQCString foundApp, foundObj;
         TQByteArray data;
         TQDataStream str( data, IO_WriteOnly );
-        if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
+        if( TDEApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*",
             "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) )
         {
             DCOPRef ref( foundApp, foundObj );
@@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
     {
         TQString error;
         /* Well, we can't pass a mimetype through startServiceByDesktopPath !
-        if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+        if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
                                                       url.url(), &error ) > 0 )
         {
             kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -391,7 +391,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
   if( appId.isEmpty())
   {
     TQString error;
-    if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
+    if ( TDEApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
         TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
     {
       kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
@@ -460,10 +460,10 @@ bool clientApp::doIt()
   if ( command == "openURL" || command == "newTab" )
   {
     KInstance inst(appName);
-    if( !KApplication::dcopClient()->attach())
+    if( !TDEApplication::dcopClient()->attach())
     {
-	KApplication::startKdeinit();
-	KApplication::dcopClient()->attach();
+	TDEApplication::startKdeinit();
+	TDEApplication::dcopClient()->attach();
     }
     checkArgumentCount(argc, 1, 3);
     bool tempFile = TDECmdLineArgs::isTempFileSet();
@@ -485,10 +485,10 @@ bool clientApp::doIt()
   else if ( command == "openProfile" )
   {
     KInstance inst(appName);
-    if( !KApplication::dcopClient()->attach())
+    if( !TDEApplication::dcopClient()->attach())
     {
-	KApplication::startKdeinit();
-	KApplication::dcopClient()->attach();
+	TDEApplication::startKdeinit();
+	TDEApplication::dcopClient()->attach();
     }
     checkArgumentCount(argc, 2, 3);
     TQString url;
@@ -497,7 +497,7 @@ bool clientApp::doIt()
     return openProfile( TQString::fromLocal8Bit(args->arg(1)), url );
   }
 
-  // the following commands need KApplication
+  // the following commands need TDEApplication
   clientApp app;
 
   if ( command == "openProperties" )
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index dea4ee883..01f5f16b4 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <krun.h>
 
-class clientApp : public KApplication
+class clientApp : public TDEApplication
 {
   Q_OBJECT
 public:
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index bea3c0e26..b5dfe553f 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -70,9 +70,9 @@ int main( int argc, char**argv )
 	TDECmdLineArgs::addCmdLineOptions( cmdLineOptions );
 
 	if ( !kdeRunning ) {
-		KApplication::disableAutoDcopRegistration();
+		TDEApplication::disableAutoDcopRegistration();
 	}
-	KApplication app( false, false );
+	TDEApplication app( false, false );
 	app.disableSessionManagement();
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index b99313159..50b7d2046 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -83,7 +83,7 @@ static void continueInWindow(TQString _wname) {
 }
 
 // TODO - make this register() or something like that and move dialog into main
-static int askUser(KApplication &app, TQString filename, bool &readonly) {
+static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     TQCString requestedName("keditbookmarks");
 
     if (!filename.isEmpty())
@@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
     aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "[email protected]");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions(options);
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -133,8 +133,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
 
     bool browser = args->isSet("browser");
 
-    KApplication::disableAutoDcopRegistration(); 
-    KApplication app(isGui, isGui);
+    TDEApplication::disableAutoDcopRegistration(); 
+    TDEApplication app(isGui, isGui);
 
     bool gotArg = (args->count() == 1);
 
diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop
index aeed1da6c..7407c5953 100644
--- a/konqueror/kfmclient.desktop
+++ b/konqueror/kfmclient.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-# This desktop file is the one used by KApplication::invokeBrowser
+# This desktop file is the one used by TDEApplication::invokeBrowser
 Type=Application
 Exec=kfmclient openURL %u
 Icon=konqueror
diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h
index 92dbdd3b2..21f09f212 100644
--- a/konqueror/konq_main.h
+++ b/konqueror/konq_main.h
@@ -6,16 +6,16 @@
 // This is used to know if we are being closed by session management
 // or by the user. See KonqMainWindow::~KonqMainWindow.
 // Credits to Matthias Ettrich for the idea.
-class KonquerorApplication : public KApplication
+class KonquerorApplication : public TDEApplication
 {
 public:
-  KonquerorApplication() : KApplication(),
+  KonquerorApplication() : TDEApplication(),
       closed_by_sm( false ) {}
 
   bool closedByUser() const { return !closed_by_sm; }
   void commitData(TQSessionManager& sm) {
     closed_by_sm = true;
-    KApplication::commitData( sm );
+    TDEApplication::commitData( sm );
     closed_by_sm = false;
   }
  
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 767b13817..b1597eccd 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1145,7 +1145,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
       req.newTabInFront = KonqSettings::newTabsInFront();
       req.openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
 
-      if (KApplication::keyboardMouseState() & TQt::ShiftButton)
+      if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
         req.newTabInFront = !req.newTabInFront;
       req.args = args;
       openURL( 0L, url, TQString::null, req );
@@ -2016,7 +2016,7 @@ void KonqMainWindow::slotConfigure()
 
 void KonqMainWindow::slotConfigureSpellChecking()
 {
-    KApplication::startServiceByDesktopName("spellchecking");
+    TDEApplication::startServiceByDesktopName("spellchecking");
 }
 
 void KonqMainWindow::slotConfigureToolbars()
@@ -2739,7 +2739,7 @@ void KonqMainWindow::slotPopupNewTab()
     bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
     bool newTabsInFront = KonqSettings::newTabsInFront();
 
-    if (KApplication::keyboardMouseState() & TQt::ShiftButton)
+    if (TDEApplication::keyboardMouseState() & TQt::ShiftButton)
       newTabsInFront = !newTabsInFront;
 
     popupNewTab(newTabsInFront, openAfterCurrentPage);
@@ -2749,7 +2749,7 @@ void KonqMainWindow::slotPopupNewTabRight()
 {
     bool newTabsInFront = KonqSettings::newTabsInFront();
 
-    if (KApplication::keyboardMouseState() & ShiftButton)
+    if (TDEApplication::keyboardMouseState() & ShiftButton)
       newTabsInFront = !newTabsInFront;
 
     popupNewTab(newTabsInFront, false);
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 52fdd0b20..58ed78b38 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -77,7 +77,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
   m_pPart = 0L;
   m_dcopObject = 0L;
 
-  m_randID = KApplication::random();
+  m_randID = TDEApplication::random();
 
   m_service = service;
   m_partServiceOffers = partServiceOffers;
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index cd7d2bc68..883bfe2bb 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -20,7 +20,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="FileNameColumnWidth" type="Int">
-      <default code="true">25 * KApplication::kApplication()->fontMetrics().width( "m" )</default>
+      <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
       <whatsthis></whatsthis>
     </entry>
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 87ad18e20..3d5ad49cb 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -316,7 +316,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 
   if (isRestored) {
     n_tabbar = wanted_tabbar;
-    KConfig *c = KApplication::kApplication()->sessionConfig();
+    KConfig *c = TDEApplication::kApplication()->sessionConfig();
 //    c->setDesktopGroup();      // Reads from wrong group
     b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false);
   }
@@ -2073,7 +2073,7 @@ void Konsole::slotConfigure()
 {
   TQStringList args;
   args << "kcmkonsole";
-  KApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "kcmshell", args );
 }
 
 void Konsole::reparseConfiguration()
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index d82942ee7..f8859da75 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -247,12 +247,12 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
   if( qtargs->isSet("font") )
       kdWarning() << "The Qt option -fn, --font has no effect." << endl;
 
-  KApplication* a = NULL;
+  TDEApplication* a = NULL;
 #ifdef COMPOSITE
-  a = new KApplication(KApplication::openX11RGBADisplay());
+  a = new TDEApplication(TDEApplication::openX11RGBADisplay());
   argb_visual = a->isX11CompositionAvailable();
 #else
-  a = new KApplication;
+  a = new TDEApplication;
 #endif
 
   TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 8d85329eb..fc31980a2 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -356,7 +356,7 @@ bool ColorSchema::rereadSchemaFile()
           continue;
         if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
         if (random_hue == -1)
-          random_hue = (KApplication::random()%32) * 11;
+          random_hue = (TDEApplication::random()%32) * 11;
         ch = random_hue;
         if (!(0 <= cs && cs <= 255         )) continue;
         if (!(0 <= cv && cv <= 255         )) continue;
diff --git a/kpager/main.cpp b/kpager/main.cpp
index 685e1375b..c7b385969 100644
--- a/kpager/main.cpp
+++ b/kpager/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
     }
 
 
-    KApplication * app = new KPagerApplication;
+    TDEApplication * app = new KPagerApplication;
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KPagerMainWindow *kpager = new KPagerMainWindow(0,"KPager");
diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp
index 41df7d3c2..4342e5c8f 100644
--- a/kpersonalizer/main.cpp
+++ b/kpersonalizer/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 
 	KLocale::setMainCatalogue("kpersonalizer");
 
-	KApplication a;
+	TDEApplication a;
 	if ( !kapp->dcopClient()->isAttached() )
 		kapp->dcopClient()->attach();
 
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index fe8574a93..9296a3f1e 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -52,7 +52,7 @@ public:
 
 
 KRootBacking::KRootBacking()
-    : TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
+    : TQObject(TDEApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
 {
     enableExports();
 
@@ -146,7 +146,7 @@ void KRootBacking::repaint()
 
 void KRootBacking::repaint(bool force)
 {
-    TQWidget* desktopWidget = KApplication::desktop();
+    TQWidget* desktopWidget = TDEApplication::desktop();
     TQPoint p1 = desktopWidget->mapToGlobal(desktopWidget->rect().topLeft());
     TQPoint p2 = desktopWidget->mapToGlobal(desktopWidget->rect().bottomRight());
     if (!force && (m_Rect == TQRect(p1, p2)))
diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp
index 1b6f82011..c1a36f54e 100644
--- a/krootbacking/main.cpp
+++ b/krootbacking/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
 	
-	KApplication app;
+	TDEApplication app;
 
 	// no session.. just start up normally
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp
index 13749dafd..dd8390226 100644
--- a/kscreensaver/random.cpp
+++ b/kscreensaver/random.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 
 	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
 	Window windowId = 0;
 
diff --git a/ksmserver/README b/ksmserver/README
index 452bf75f4..29202255b 100644
--- a/ksmserver/README
+++ b/ksmserver/README
@@ -123,7 +123,7 @@ bogus value.
 
 In addition, ksmserver propagates both its network address and its
 process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A
-utility function KApplication::propagateSessionManager() reads this
+utility function TDEApplication::propagateSessionManager() reads this
 setting and sets SESSION_MANAGER accordingly, so that child processes
 can pick it up.  The function is called by clients that are started
 outside the session ( i.e. before ksmserver is started), but want to
@@ -146,7 +146,7 @@ Requesting a shutdown
 
 If an application wants to request a shutdown (i.e. a logout), it does
 this via an SmcRequestSaveYourself message to the server. In TDE, a
-utility function KApplication::requestShutDown() does exactly
+utility function TDEApplication::requestShutDown() does exactly
 this. It's for example called by TDE's panel or by the context menu of
 the desktop.
 
diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp
index 1dbe2e245..c47877543 100644
--- a/ksmserver/client.cpp
+++ b/ksmserver/client.cpp
@@ -99,7 +99,7 @@ static char * safeSmsGenerateClientID( SmsConn /*c*/ )
               (1 would be IP, 2 would be DEC-NET format) */
            char hostname[ 256 ];
            if( gethostname( hostname, 255 ) != 0 )
-               my_addr->sprintf("0%.8x", KApplication::random());
+               my_addr->sprintf("0%.8x", TDEApplication::random());
            else {
                // create some kind of hash for the hostname
                int addr[ 4 ] = { 0, 0, 0, 0 };
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 65c43253a..443a978e2 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -190,7 +190,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
     TDECmdLineArgs::addCmdLineOptions( options );
 
     putenv((char*)"SESSION_MANAGER=");
-    KApplication a(KApplication::openX11RGBADisplay(), false); // Disable styles until we need them.
+    TDEApplication a(TDEApplication::openX11RGBADisplay(), false); // Disable styles until we need them.
     fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1);
 
 
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 2b6c406a0..cdf3f98c5 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -195,10 +195,10 @@ void KSMSaveYourselfRequestProc (
 {
     if ( shutdown ) {
         the_server->shutdown( fast ?
-                              KApplication::ShutdownConfirmNo :
-                              KApplication::ShutdownConfirmDefault,
-                              KApplication::ShutdownTypeDefault,
-                              KApplication::ShutdownModeDefault );
+                              TDEApplication::ShutdownConfirmNo :
+                              TDEApplication::ShutdownConfirmDefault,
+                              TDEApplication::ShutdownTypeDefault,
+                              TDEApplication::ShutdownModeDefault );
     } else if ( !global ) {
         SmsSaveYourself( smsConn, saveType, false, interactStyle, fast );
         SmsSaveComplete( smsConn );
@@ -586,7 +586,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     wm = windowManager;
     wmAddArgs = windowManagerAddArgs;
 
-    shutdownType = KApplication::ShutdownTypeNone;
+    shutdownType = TDEApplication::ShutdownTypeNone;
 
     state = Idle;
     dialogActive = false;
@@ -609,7 +609,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     only_local = false;
 #endif
 
-    launcher = KApplication::launcher();
+    launcher = TDEApplication::launcher();
 
     char        errormsg[256];
     if (!SmsInitialize ( (char*) KSMVendorString, (char*) KSMReleaseString,
diff --git a/ksmserver/server.h b/ksmserver/server.h
index ca73c3a86..79c1629bd 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -86,17 +86,17 @@ public:
     void restoreSession( TQString sessionName );
     void startDefaultSession();
 
-    void shutdown( KApplication::ShutdownConfirm confirm,
-                   KApplication::ShutdownType sdtype,
-                   KApplication::ShutdownMode sdmode );
+    void shutdown( TDEApplication::ShutdownConfirm confirm,
+                   TDEApplication::ShutdownType sdtype,
+                   TDEApplication::ShutdownMode sdmode );
 
     virtual void suspendStartup( TQCString app );
     virtual void resumeStartup( TQCString app );
 
     bool checkStatus( bool &logoutConfirmed, bool &maysd, 
-		      KApplication::ShutdownConfirm confirm,
-		      KApplication::ShutdownType sdtype,
-		      KApplication::ShutdownMode sdmode );
+		      TDEApplication::ShutdownConfirm confirm,
+		      TDEApplication::ShutdownType sdtype,
+		      TDEApplication::ShutdownMode sdmode );
 
 public slots:
     void cleanUp();
@@ -150,9 +150,9 @@ private:
     bool defaultSession() const; // empty session
     void setupXIOErrorHandler();
 
-    void shutdownInternal( KApplication::ShutdownConfirm confirm,
-			   KApplication::ShutdownType sdtype,
-			   KApplication::ShutdownMode sdmode,
+    void shutdownInternal( TDEApplication::ShutdownConfirm confirm,
+			   TDEApplication::ShutdownType sdtype,
+			   TDEApplication::ShutdownMode sdmode,
 			   TQString bootOption = TQString::null );
 
     void performLegacySessionSave();
@@ -196,8 +196,8 @@ private:
     int saveType;
     TQMap< TQCString, int > startupSuspendCount;
 
-    KApplication::ShutdownType shutdownType;
-    KApplication::ShutdownMode shutdownMode;
+    TDEApplication::ShutdownType shutdownType;
+    TDEApplication::ShutdownMode shutdownMode;
     TQString bootOption;
 
     bool clean;
@@ -216,9 +216,9 @@ private:
     bool waitAutoStart2;
     bool waitKcmInit2;
     TQTimer pendingShutdown;
-    KApplication::ShutdownConfirm pendingShutdown_confirm;
-    KApplication::ShutdownType pendingShutdown_sdtype;
-    KApplication::ShutdownMode pendingShutdown_sdmode;
+    TDEApplication::ShutdownConfirm pendingShutdown_confirm;
+    TDEApplication::ShutdownType pendingShutdown_sdtype;
+    TDEApplication::ShutdownMode pendingShutdown_sdmode;
 
     // ksplash interface
     void upAndRunning( const TQString& msg );
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index fc55c5d7a..d7440e92c 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -97,15 +97,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 void KSMServer::logout( int confirm, int sdtype, int sdmode )
 {
-    shutdown( (KApplication::ShutdownConfirm)confirm,
-              (KApplication::ShutdownType)sdtype,
-              (KApplication::ShutdownMode)sdmode );
+    shutdown( (TDEApplication::ShutdownConfirm)confirm,
+              (TDEApplication::ShutdownType)sdtype,
+              (TDEApplication::ShutdownMode)sdmode );
 }
 
 bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
-                             KApplication::ShutdownConfirm confirm,
-                             KApplication::ShutdownType sdtype,
-                             KApplication::ShutdownMode sdmode )
+                             TDEApplication::ShutdownConfirm confirm,
+                             TDEApplication::ShutdownType sdtype,
+                             TDEApplication::ShutdownMode sdmode )
 {
     pendingShutdown.stop();
     if( dialogActive )
@@ -130,15 +130,15 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
 
     config->setGroup("General" );
     logoutConfirmed =
-        (confirm == KApplication::ShutdownConfirmYes) ? false :
-        (confirm == KApplication::ShutdownConfirmNo) ? true :
+        (confirm == TDEApplication::ShutdownConfirmYes) ? false :
+        (confirm == TDEApplication::ShutdownConfirmNo) ? true :
         !config->readBoolEntry( "confirmLogout", true );
     maysd = false;
     if (config->readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
         maysd = true;
     if (!maysd) {
-        if (sdtype != KApplication::ShutdownTypeNone &&
-            sdtype != KApplication::ShutdownTypeDefault &&
+        if (sdtype != TDEApplication::ShutdownTypeNone &&
+            sdtype != TDEApplication::ShutdownTypeDefault &&
             logoutConfirmed)
             return false; /* unsupported fast shutdown */
     }
@@ -146,9 +146,9 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
     return true;
 }
 
-void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
-                                  KApplication::ShutdownType sdtype,
-                                  KApplication::ShutdownMode sdmode,
+void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
+                                  TDEApplication::ShutdownType sdtype,
+                                  TDEApplication::ShutdownMode sdmode,
                                   TQString bopt )
 {
     bool maysd = false;
@@ -160,12 +160,12 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
 
     config->setGroup("General" );
     if (!maysd) {
-        sdtype = KApplication::ShutdownTypeNone;
-    } else if (sdtype == KApplication::ShutdownTypeDefault)
-        sdtype = (KApplication::ShutdownType)
-                 config->readNumEntry( "shutdownType", (int)KApplication::ShutdownTypeNone );
-    if (sdmode == KApplication::ShutdownModeDefault)
-        sdmode = KApplication::ShutdownModeInteractive;
+        sdtype = TDEApplication::ShutdownTypeNone;
+    } else if (sdtype == TDEApplication::ShutdownTypeDefault)
+        sdtype = (TDEApplication::ShutdownType)
+                 config->readNumEntry( "shutdownType", (int)TDEApplication::ShutdownTypeNone );
+    if (sdmode == TDEApplication::ShutdownModeDefault)
+        sdmode = TDEApplication::ShutdownModeInteractive;
 
     // shall we show a logout status dialog box?
     bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
@@ -282,8 +282,8 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
     dialogActive = false;
 }
 
-void KSMServer::shutdown( KApplication::ShutdownConfirm confirm,
-    KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode )
+void KSMServer::shutdown( TDEApplication::ShutdownConfirm confirm,
+    TDEApplication::ShutdownType sdtype, TDEApplication::ShutdownMode sdmode )
 {
     shutdownInternal( confirm, sdtype, sdmode );
 }
@@ -297,9 +297,9 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
     KConfig* config = KGlobal::config();
     config->setGroup( "General" );
 
-    if ( sdtype == KApplication::ShutdownTypeHalt )
+    if ( sdtype == TDEApplication::ShutdownTypeHalt )
         confirmDelay = config->readNumEntry( "confirmShutdownDelay", 31 );
-    else if ( sdtype == KApplication::ShutdownTypeReboot )
+    else if ( sdtype == TDEApplication::ShutdownTypeReboot )
         confirmDelay = config->readNumEntry( "confirmRebootDelay", 31 );
     else
         confirmDelay = config->readNumEntry( "confirmLogoutDelay", 31 );
@@ -307,14 +307,14 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
     bool result = true;
     if (confirmDelay) {
         KSMShutdownFeedback::start(); // make the screen gray
-        result = KSMDelayedMessageBox::showTicker( (KApplication::ShutdownType)sdtype, bootOption, confirmDelay );
+        result = KSMDelayedMessageBox::showTicker( (TDEApplication::ShutdownType)sdtype, bootOption, confirmDelay );
         KSMShutdownFeedback::stop(); // make the screen become normal again
     }
 
     if ( result )
-        shutdownInternal( KApplication::ShutdownConfirmNo,
-                          (KApplication::ShutdownType)sdtype,
-                          (KApplication::ShutdownMode)sdmode,
+        shutdownInternal( TDEApplication::ShutdownConfirmNo,
+                          (TDEApplication::ShutdownType)sdtype,
+                          (TDEApplication::ShutdownMode)sdmode,
                            bootOption );
 }
 
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 5be3f70a2..bd705675b 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -674,7 +674,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 //////
 
 KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
-								bool maysd, KApplication::ShutdownType sdtype, int* selection )
+								bool maysd, TDEApplication::ShutdownType sdtype, int* selection )
   : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection)
 	// this is a WType_Popup on purpose. Do not change that! Not
 	// having a popup here has severe side effects.
@@ -903,7 +903,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 			hbuttonbox2->addWidget ( btnReboot);
 			connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
-			if ( sdtype == KApplication::ShutdownTypeReboot )
+			if ( sdtype == TDEApplication::ShutdownTypeReboot )
 				btnReboot->setFocus();
 
 			// BAD CARMA .. this code is copied line by line from standard konqy dialog
@@ -938,7 +938,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 			hbuttonbox2->addWidget ( btnHalt );
 			connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
-				if ( sdtype == KApplication::ShutdownTypeHalt )
+				if ( sdtype == TDEApplication::ShutdownTypeHalt )
 					btnHalt->setFocus();
 
 			// cancel buttonbox
@@ -959,7 +959,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			btnHalt->setFont( btnFont );
 			buttonlay->addWidget( btnHalt );
 			connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
-		if ( sdtype == KApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") )
+		if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") )
 				btnHalt->setFocus();
 
 			// Reboot
@@ -969,7 +969,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			buttonlay->addWidget( btnReboot );
 
 			connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
-			if ( sdtype == KApplication::ShutdownTypeReboot )
+			if ( sdtype == TDEApplication::ShutdownTypeReboot )
 				btnReboot->setFocus();
 
 			// this section is copied as-is into ubuntulogout as well
@@ -1078,7 +1078,7 @@ KSMShutdownDlg::~KSMShutdownDlg()
 
 void KSMShutdownDlg::slotLogout()
 {
-	m_shutdownType = KApplication::ShutdownTypeNone;
+	m_shutdownType = TDEApplication::ShutdownTypeNone;
 	accept();
 }
 
@@ -1087,7 +1087,7 @@ void KSMShutdownDlg::slotReboot()
 {
 	// no boot option selected -> current
 	m_bootOption = TQString::null;
-	m_shutdownType = KApplication::ShutdownTypeReboot;
+	m_shutdownType = TDEApplication::ShutdownTypeReboot;
 	accept();
 }
 
@@ -1095,7 +1095,7 @@ void KSMShutdownDlg::slotReboot(int opt)
 {
 	if (int(rebootOptions.size()) > opt)
 		m_bootOption = rebootOptions[opt];
-	m_shutdownType = KApplication::ShutdownTypeReboot;
+	m_shutdownType = TDEApplication::ShutdownTypeReboot;
 	accept();
 }
 
@@ -1103,7 +1103,7 @@ void KSMShutdownDlg::slotReboot(int opt)
 void KSMShutdownDlg::slotHalt()
 {
 	m_bootOption = TQString::null;
-	m_shutdownType = KApplication::ShutdownTypeHalt;
+	m_shutdownType = TDEApplication::ShutdownTypeHalt;
 	accept();
 }
 
@@ -1160,7 +1160,7 @@ void KSMShutdownDlg::slotHibernate()
 	reject(); // continue on resume
 }
 
-bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
+bool KSMShutdownDlg::confirmShutdown( bool maysd, TDEApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
 {
 	kapp->enableStyles();
 	KSMShutdownDlg* l = new KSMShutdownDlg( 0,
@@ -1245,16 +1245,16 @@ void KSMDelayedPushButton::slotTimeout()
   setDown(false);
 }
 
-KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
+KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
 	: TimedLogoutDlg( 0, 0, true, (WFlags)WType_Popup ), m_remaining(confirmDelay)
 {
-	if ( sdtype == KApplication::ShutdownTypeHalt )
+	if ( sdtype == TDEApplication::ShutdownTypeHalt )
 	{
 		m_title->setText( i18n( "Would you like to turn off your computer?" ) );
 		m_template = i18n( "This computer will turn off automatically\n"
 						   "after %1 seconds." );
 		m_logo->setPixmap( BarIcon( "exit", 48 ) );
-	} else if ( sdtype == KApplication::ShutdownTypeReboot )
+	} else if ( sdtype == TDEApplication::ShutdownTypeReboot )
 	{
 		if (bootOption.isEmpty())
 			m_title->setText( i18n( "Would you like to reboot your computer?" ) );
@@ -1294,7 +1294,7 @@ void KSMDelayedMessageBox::updateText()
 	m_text->setText( m_template.arg( m_remaining ) );
 }
 
-bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
+bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
 {
 	kapp->enableStyles();
 	KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index eab4570e1..bf636c16d 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -129,7 +129,7 @@ class KSMShutdownDlg : public TQDialog
 	Q_OBJECT
 
 public:
-	static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
+	static bool confirmShutdown( bool maysd, TDEApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
 
 public slots:
 	void slotLogout();
@@ -143,8 +143,8 @@ protected:
 	~KSMShutdownDlg();
 
 private:
-	KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype, int* selection=0 );
-	KApplication::ShutdownType m_shutdownType;
+	KSMShutdownDlg( TQWidget* parent, bool maysd, TDEApplication::ShutdownType sdtype, int* selection=0 );
+	TDEApplication::ShutdownType m_shutdownType;
 	TQString m_bootOption;
 	TQPopupMenu *targets;
 	TQStringList rebootOptions;
@@ -248,8 +248,8 @@ class  KSMDelayedMessageBox : public TimedLogoutDlg
 	Q_OBJECT
 
 public:
-	KSMDelayedMessageBox( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
-	static bool showTicker( KApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
+	KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
+	static bool showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
 
 protected slots:
 	void updateText();
diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp
index 5a5e114c4..5ccb4243a 100644
--- a/ksmserver/test.cpp
+++ b/ksmserver/test.cpp
@@ -10,14 +10,14 @@ main(int argc, char *argv[])
    KAboutData about("kapptest", "kapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
 
-   KApplication a;
+   TDEApplication a;
    a.iconLoader()->addAppDir("ksmserver");
    KSMShutdownFeedback::start();
 
    // ShutdownTypeNone == Logout == 0
    // ShutdownTypeReboot == 1
    // ShutdownTypeHalt == 2
-   KApplication::ShutdownType sdtype = KApplication::ShutdownTypeNone;
+   TDEApplication::ShutdownType sdtype = TDEApplication::ShutdownTypeNone;
    TQString bopt;
    KSMDelayedMessageBox::showTicker( sdtype );
    /*
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index daa07bd1a..e4f28855f 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -55,11 +55,11 @@ int main( int argc, char **argv )
   TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs();
 
   if ( !( arg->isSet( "dcop" ) ) )
-    KApplication::disableAutoDcopRegistration();
-  else if ( KApplication::dcopClient()->attach() )
-    KApplication::dcopClient()->registerAs( "ksplash", false );
+    TDEApplication::disableAutoDcopRegistration();
+  else if ( TDEApplication::dcopClient()->attach() )
+    TDEApplication::dcopClient()->registerAs( "ksplash", false );
 
-  KApplication app;
+  TDEApplication app;
 
   KSplash wndMain("ksplash");
   if ( arg->isSet( "steps" ) )
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index 5a4bf2225..b56f7bd91 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -302,7 +302,7 @@ int main( int argc, char *argv[] )
 
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index 4e2bba034..69445b91e 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -40,7 +40,7 @@ class TQComboBox;
 class KPushButton;
 class KListViewSearchLineWidget;
 
-extern KApplication* Kapp;
+extern TDEApplication* Kapp;
 
 /**
  * This widget implements a process list page. Besides the process
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 8a137d9b4..2dbe1bb5e 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -571,9 +571,9 @@ int main( int argc, char** argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   // initialize KDE application
-  KApplication *app = new KApplication;
+  TDEApplication *app = new TDEApplication;
 
   KSGRD::SensorMgr = new KSGRD::SensorManager();
   KSGRD::Style = new KSGRD::StyleEngine();
diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp
index 588cf25b1..792b7599f 100644
--- a/ksystraycmd/main.cpp
+++ b/ksystraycmd/main.cpp
@@ -58,7 +58,7 @@ int main( int argc, char *argv[] )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app;
+  TDEApplication app;
 
   //
   // Setup the tray icon from the arguments.
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index d564241d4..572cb6852 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -274,7 +274,7 @@ void KXKBApp::menuActivated(int id)
 	}
 	else if (id == KxkbLabelController::HELP_MENU_ID)
 	{
-		KApplication::kApplication()->invokeHelp(0, "kxkb");
+		TDEApplication::kApplication()->invokeHelp(0, "kxkb");
 	}
 	else
 	{
@@ -321,7 +321,7 @@ void KXKBApp::windowChanged(WId winId)
 
 void KXKBApp::slotSettingsChanged(int category)
 {
-    if ( category != KApplication::SETTINGS_SHORTCUTS)
+    if ( category != TDEApplication::SETTINGS_SHORTCUTS)
 		return;
 
     KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 63a11af44..afed003dc 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -437,7 +437,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
             {
                 stringList.append((*it).url());
             }
-            if ( KApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 )
+            if ( TDEApplication::startServiceByDesktopPath( m_destURL.path(), stringList, &error ) > 0 )
                 KMessageBox::error( 0L, error );
         }
         else
@@ -645,7 +645,7 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
         KConfigGroupSaver cgs( globalConfig, "Paths" );
         globalConfig->writePathEntry("Desktop" , newurl.path(), true, true );
         globalConfig->sync();
-        KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS);
+        KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
     }
 }
 
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 6b51047b5..129542952 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -588,7 +588,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( sDeleting ) {
                 if ( !isLocal )
                     addDel = true;
-                else if (KApplication::keyboardMouseState() & TQt::ShiftButton) {
+                else if (TDEApplication::keyboardMouseState() & TQt::ShiftButton) {
                     addTrash = false;
                     addDel = true;
                 }
diff --git a/libkonq/tests/konqdragtest.cpp b/libkonq/tests/konqdragtest.cpp
index 347bee3ae..35932e850 100644
--- a/libkonq/tests/konqdragtest.cpp
+++ b/libkonq/tests/konqdragtest.cpp
@@ -53,9 +53,9 @@ void testKonqIconDrag2()
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
-  KApplication app; // GUI needed for QPixmaps
+  TDEApplication app; // GUI needed for QPixmaps
 
   testKonqIconDrag2();
   return 0;
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index d5cd54347..7b3bddabd 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -116,7 +116,7 @@ extern "C"
 
         if ( scan || firstTime )
         {
-            KApplication::tdeinitExec("nspluginscan");
+            TDEApplication::tdeinitExec("nspluginscan");
         }
 
         if (firstTime) {
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 5f3db42f4..e6891ba97 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -539,7 +539,7 @@ int main( int argc, char **argv )
       printf("10\n"); fflush(stdout);
     }
 
-    KApplication app(false, false);
+    TDEApplication app(false, false);
 
     // Set up SIGCHLD handler
     struct sigaction act;
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 93ebaccde..986595816 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
    setvbuf( stderr, NULL, _IONBF, 0 );
    TDECmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1");
 
-   KApplication app("nsplugin");
+   TDEApplication app("nsplugin");
 
    app.dcopClient()->attach();
    app.dcopClient()->registerAs(app.name());
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index b8992b171..9147285dc 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -314,7 +314,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
         const TQCString& rAppName, bool allowStyles, bool GUIenabled,
         XrmOptionDescRec *options, int num_options,
         char** resources)
-  : KApplication(argc, argv, rAppName, allowStyles, GUIenabled)
+  : TDEApplication(argc, argv, rAppName, allowStyles, GUIenabled)
 {
     my_xt = TRUE;
 
@@ -335,7 +335,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
 */
 KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv,
         const TQCString& rAppName, bool allowStyles, bool GUIenabled)
-   : KApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
+   : TDEApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
 {
     my_xt = FALSE;
     init();
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index d7c46a594..f4791f114 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -53,7 +53,7 @@
 #include <tqwidget.h>
 #include <X11/Intrinsic.h>
 
-class KXtApplication : public KApplication {
+class KXtApplication : public TDEApplication {
     Q_OBJECT
     void init();
 
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index f8e3a37f8..af9e72d32 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1254,7 +1254,7 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
    : DCOPObject(dcopId), TQObject( parent, name ) 
 {
     _classes.setAutoDelete( true );
-    connect(KApplication::dcopClient(),
+    connect(TDEApplication::dcopClient(),
             TQT_SIGNAL(applicationRemoved(const TQCString&)),
             this,
             TQT_SLOT(appUnregistered(const TQCString&)));
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index a02db4c52..654ba68e6 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -248,8 +248,8 @@ int main(int argc, char** argv)
    parseCommandLine(argc, argv);
    KLocale::setMainCatalogue("nsplugin");
 
-   kdDebug(1430) << "4 - create KApplication" << endl;
-   KApplication app( argc,  argv, "nspluginviewer" );
+   kdDebug(1430) << "4 - create TDEApplication" << endl;
+   TDEApplication app( argc,  argv, "nspluginviewer" );
    GlibEvents glibevents;
 #endif
 
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
index b09608afb..9f0086ef5 100644
--- a/tdeinit/displayconfig.cpp
+++ b/tdeinit/displayconfig.cpp
@@ -57,8 +57,8 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	KApplication::disableAutoDcopRegistration();
-	KApplication app;
+	TDEApplication::disableAutoDcopRegistration();
+	TDEApplication app;
 
 #ifdef WITH_XRANDR
 	// Load up user specific display settings
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 7eb8add78..6b4479c6c 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -53,8 +53,8 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	KApplication::disableAutoDcopRegistration();
-	KApplication app;
+	TDEApplication::disableAutoDcopRegistration();
+	TDEApplication app;
 
 	KConfig config("twinrc", true);
 	config.setGroup( "ThirdPartyWM" );
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index 8a36512c9..7381f53b9 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -46,7 +46,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 {
 	TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1");
 	TDECmdLineArgs::addCmdLineOptions(options);
-	KApplication	app;
+	TDEApplication	app;
 	PrintWrapper	*wrap = new PrintWrapper;
 	app.setMainWidget(wrap);
 	TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint()));
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index d337b11a6..74142c994 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -148,7 +148,7 @@ int kdemain(int argc, char **argv)
 	KAboutData about( "kio_print", "kio_print", "fake_version", 
 			"TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
 	TDECmdLineArgs::init( &about );
-	KApplication app;
+	TDEApplication app;
 
 	KIO_Print	 slave(argv[2], argv[3]);
 	slave.dispatchLoop();
diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp
index 0732505b4..219321907 100644
--- a/tdeprint/tdeprintfax/main.cpp
+++ b/tdeprint/tdeprintfax/main.cpp
@@ -53,9 +53,9 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Michael Goffioul",0, "[email protected]");
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 
-  KApplication a;
+  TDEApplication a;
   TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 
   KdeprintFax	*w = new KdeprintFax;
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 97fb0fbfa..682b39646 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -108,11 +108,11 @@ int main(int argc, char *argv[])
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     // tdesu doesn't process SM events, so don't even connect to ksmserver
     TQCString session_manager = getenv( "SESSION_MANAGER" );
     unsetenv( "SESSION_MANAGER" );
-    KApplication app;
+    TDEApplication app;
     // but propagate it to the started app
     if (session_manager.data())
     {
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 707cdd372..f6a5a0b15 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -94,12 +94,12 @@ GreeterApp::GreeterApp()
 	init();
 }
 
-GreeterApp::GreeterApp(Display *dpy) : KApplication(dpy)
+GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy)
 {
 	init();
 }
 
-GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : KApplication(dpy, visual, colormap)
+GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
 {
 	init();
 }
@@ -199,7 +199,7 @@ kg_main( const char *argv0 )
 
 	kdDebug() << timestamp() << "start" << endl;
 	kde_have_kipc = false;
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 	KCrash::setSafer( true );
 
 	KProcess *tsak = 0;
diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h
index 41a1dcabd..ed799672d 100644
--- a/tdm/kfrontend/kgapp.h
+++ b/tdm/kfrontend/kgapp.h
@@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kapplication.h>
 #include <tdehardwaredevices.h>
 
-class GreeterApp : public KApplication {
+class GreeterApp : public TDEApplication {
 	Q_OBJECT
-	typedef KApplication inherited;
+	typedef TDEApplication inherited;
 
   public:
 	GreeterApp();
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 69faf2d7c..baf3b3699 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -48,7 +48,7 @@ static Atom prop_root;
 static bool properties_inited = false;
 
 MyApplication::MyApplication( const char *conf )
-	: KApplication(),
+	: TDEApplication(),
 	  renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
 {
 	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
@@ -115,7 +115,7 @@ MyApplication::slotTimeout()
 int
 main( int argc, char *argv[] )
 {
-	KApplication::disableAutoDcopRegistration();
+	TDEApplication::disableAutoDcopRegistration();
 
 	KLocale::setMainCatalogue( "kdesktop" );
 	TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version );
diff --git a/tdm/kfrontend/krootimage.h b/tdm/kfrontend/krootimage.h
index e46190116..e71ae3b4c 100644
--- a/tdm/kfrontend/krootimage.h
+++ b/tdm/kfrontend/krootimage.h
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
 #include <bgrender.h>
 
 
-class MyApplication : public KApplication
+class MyApplication : public TDEApplication
 {
 	Q_OBJECT
 
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 41a5cb206..bdcc51cf5 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -184,11 +184,11 @@ DM::canShutdown()
 }
 
 void
-DM::shutdown( KApplication::ShutdownType shutdownType,
-              KApplication::ShutdownMode shutdownMode, /* NOT Default */
+DM::shutdown( TDEApplication::ShutdownType shutdownType,
+              TDEApplication::ShutdownMode shutdownMode, /* NOT Default */
               const TQString &bootOption )
 {
-	if (shutdownType == KApplication::ShutdownTypeNone)
+	if (shutdownType == TDEApplication::ShutdownTypeNone)
 		return;
 
 	bool cap_ask;
@@ -200,26 +200,26 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
 			return;
 		cap_ask = false;
 	}
-	if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive)
-		shutdownMode = KApplication::ShutdownModeForceNow;
+	if (!cap_ask && shutdownMode == TDEApplication::ShutdownModeInteractive)
+		shutdownMode = TDEApplication::ShutdownModeForceNow;
 
 	TQCString cmd;
 	if (DMType == GDM) {
-		cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ?
+		cmd.append( shutdownMode == TDEApplication::ShutdownModeForceNow ?
 		            "SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
-		cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
+		cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
 		            "REBOOT\n" : "HALT\n" );
 	} else {
 		cmd.append( "shutdown\t" );
-		cmd.append( shutdownType == KApplication::ShutdownTypeReboot ?
+		cmd.append( shutdownType == TDEApplication::ShutdownTypeReboot ?
 		            "reboot\t" : "halt\t" );
 		if (!bootOption.isEmpty())
 			cmd.append( "=" ).append( bootOption.local8Bit() ).append( "\t" );
-		cmd.append( shutdownMode == KApplication::ShutdownModeInteractive ?
+		cmd.append( shutdownMode == TDEApplication::ShutdownModeInteractive ?
 		            "ask\n" :
-		            shutdownMode == KApplication::ShutdownModeForceNow ?
+		            shutdownMode == TDEApplication::ShutdownModeForceNow ?
 		            "forcenow\n" :
-		            shutdownMode == KApplication::ShutdownModeTryNow ?
+		            shutdownMode == TDEApplication::ShutdownModeTryNow ?
 		            "trynow\n" : "schedule\n" );
 	}
 	exec( cmd.data() );
diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h
index da5aa2b0b..71363f9f4 100644
--- a/tdmlib/dmctl.h
+++ b/tdmlib/dmctl.h
@@ -40,8 +40,8 @@ public:
 	~DM();
 
 	bool canShutdown();
-	void shutdown( KApplication::ShutdownType shutdownType,
-	               KApplication::ShutdownMode shutdownMode,
+	void shutdown( TDEApplication::ShutdownType shutdownType,
+	               TDEApplication::ShutdownMode shutdownMode,
 	               const TQString &bootOption = TQString::null );
 
 	void setLock( bool on );
@@ -72,8 +72,8 @@ public:
 	DM() {}
 
 	bool canShutdown() { return false; }
-	void shutdown( KApplication::ShutdownType shutdownType,
-	               KApplication::ShutdownMode shutdownMode,
+	void shutdown( TDEApplication::ShutdownType shutdownType,
+	               TDEApplication::ShutdownMode shutdownMode,
 	               const TQString &bootOption = TQString::null ) {}
 
 	void setLock( bool ) {}
diff --git a/tqt3integration/libqtkde/qtkde.cpp b/tqt3integration/libqtkde/qtkde.cpp
index a2f93b48f..96ad72429 100644
--- a/tqt3integration/libqtkde/qtkde.cpp
+++ b/tqt3integration/libqtkde/qtkde.cpp
@@ -87,7 +87,7 @@ static DCOPClient* dcopClient()
         assert( tqApp != NULL ); // TODO
         prepared = true;
         dcop->bindToApp();
-        if( !tqApp->inherits( "KApplication" )) // KApp takes care of input blocking
+        if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
             {
             static qtkde_EventLoop* loop = new qtkde_EventLoop;
             TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
diff --git a/twin/README b/twin/README
index 3e4e49219..652fa83ae 100644
--- a/twin/README
+++ b/twin/README
@@ -189,10 +189,10 @@ from Konsole as 'dcop kdesktop KDesktopIface popupExecuteCommand" will lead
 to showing the minicli, but the last user activity timestamp gained from events
 sent by X server will be older than user activity timestamp of Konsole, and
 would normally result in minicli not being active. Therefore, before showing
-the minicli, kdesktop needs to call KApplication::updateUserTimestamp().
+the minicli, kdesktop needs to call TDEApplication::updateUserTimestamp().
 
  However, this shouldn't be done with all DCOP calls. If a DCOP call is not
-a result of direct user action, calling KApplication::updateUserTimestamp()
+a result of direct user action, calling TDEApplication::updateUserTimestamp()
 would lead to focus stealing. For example, let's assume for a moment
 that KMail would use this DCOP call in case it detects the modem is not
 connected, allowing to you to start KPPP or whatever tool you use. If KMail
@@ -201,6 +201,6 @@ possibly suddenly showing up at every check. Basically, doing the above change
 to kdesktop's minicli means that the popupExecuteCommand() DCOP call is only
 for user scripting. (TODO write about focus transferring?)
 
- Simply said, KApplication::updateUserTimestamp() should be called only
+ Simply said, TDEApplication::updateUserTimestamp() should be called only
 as a result of user action. Unfortunately, I'm not aware of any universal
 way how to handle this, so every case will have to be considered separately.
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index c9bb6133c..41f5dd7ca 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 {
     TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1");
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app(argc, argv);
+    TDEApplication app(argc, argv);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if(!args->count()){
         kdWarning() << "You need to specify the path to a theme config file!" << endl;
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 4215ec38f..9e99bb749 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -42,7 +42,7 @@ namespace KWinInternal
 void Workspace::desktopResized()
     {
     //printf("Workspace::desktopResized()\n\r");
-    TQRect geom = KApplication::desktop()->geometry();
+    TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
     desktop_geometry.width = geom.width();
     desktop_geometry.height = geom.height();
@@ -58,7 +58,7 @@ void Workspace::desktopResized()
 void Workspace::kDestopResized()
     {
     //printf("Workspace::kDesktopResized()\n\r");
-    TQRect geom = KApplication::desktop()->geometry();
+    TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
     desktop_geometry.width = geom.width();
     desktop_geometry.height = geom.height();
@@ -82,7 +82,7 @@ void Workspace::kDestopResized()
 
 void Workspace::updateClientArea( bool force )
     {
-    TQDesktopWidget *desktopwidget = KApplication::desktop();
+    TQDesktopWidget *desktopwidget = TDEApplication::desktop();
     int nscreens = desktopwidget -> numScreens ();
 //    kdDebug () << "screens: " << nscreens << endl;
     TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ];
@@ -295,7 +295,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co
 
 TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int desktop ) const
     {
-    TQDesktopWidget *desktopwidget = KApplication::desktop();
+    TQDesktopWidget *desktopwidget = TDEApplication::desktop();
     int screen = desktopwidget->screenNumber( p );
     if( screen < 0 )
         screen = desktopwidget->primaryScreen();
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index c29dacdaa..b97db201a 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -279,7 +279,7 @@ KDE_EXPORT int kdemain( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     bool id_ok = false;
     Window id = args->getOption( "wid" ).toULong( &id_ok );
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index 46969da7f..87f4c8b50 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -49,7 +49,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString hostname = args->getOption( "hostname" );
     bool pid_ok = false;
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 95e297bc2..a08d5a209 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -803,7 +803,7 @@ void KCommonDecoration::updateWindowShape()
 
     bool tl=true,tr=true,bl=true,br=true; // is there a transparent rounded corner in top-left? etc
 
-    TQDesktopWidget *desktop=KApplication::desktop();
+    TQDesktopWidget *desktop=TDEApplication::desktop();
     // no transparent rounded corners if this window corner lines up with a screen corner
     for(int screen=0; screen < desktop->numScreens(); ++screen)
     {
diff --git a/twin/main.cpp b/twin/main.cpp
index df2470c3e..d53578caf 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -82,7 +82,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
     }
 
 Application::Application( )
-: KApplication( ), owner( screen_number )
+: TDEApplication( ), owner( screen_number )
     {
 #ifdef USE_QT4
     // I'm special...
@@ -216,7 +216,7 @@ bool Application::x11EventFilter( XEvent *e )
     {
     if ( Workspace::self()->workspaceEvent( e ) )
              return TRUE;
-    return KApplication::x11EventFilter( e );
+    return TDEApplication::x11EventFilter( e );
     }
     
 static void sighandler(int) 
@@ -327,7 +327,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
         signal(SIGHUP, SIG_IGN);
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     KWinInternal::Application a;
     KWinInternal::SessionManaged weAreIndeed;
     KWinInternal::SessionSaveDoneHelper helper;
diff --git a/twin/main.h b/twin/main.h
index 5ac38a61a..92823d74a 100644
--- a/twin/main.h
+++ b/twin/main.h
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWinInternal
 {
 
-class Application : public  KApplication
+class Application : public  TDEApplication
     {
     Q_OBJECT
     public:
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index 0b9c199cd..96c94288d 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -48,7 +48,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString hostname = args->getOption( "hostname" );
     bool pid_ok = false;
diff --git a/twin/rules.cpp b/twin/rules.cpp
index f3479f48f..6d2d66906 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
     args << "--wid" << TQString::number( c->window());
     if( whole_app )
         args << "--whole-app";
-    KApplication::tdeinitExec( "twin_rules_dialog", args );
+    TDEApplication::tdeinitExec( "twin_rules_dialog", args );
     }
 
 void Workspace::loadWindowRules()
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 2537d9f6b..4734da33c 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -100,7 +100,7 @@ void DecoBenchApplication::executeTest()
 int main(int argc, char** argv)
 {
 	TQString style = "keramik";
-	// KApplication app(argc, argv);
+	// TDEApplication app(argc, argv);
 	KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/twin/tools/decobenchmark/main.h b/twin/tools/decobenchmark/main.h
index 65c0c78ae..e556c1350 100644
--- a/twin/tools/decobenchmark/main.h
+++ b/twin/tools/decobenchmark/main.h
@@ -29,7 +29,7 @@ enum Tests {
 	RecreationTest
 };
 
-class DecoBenchApplication : public KApplication
+class DecoBenchApplication : public TDEApplication
 {
 	Q_OBJECT
 public:
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index cc109918c..16f722634 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -999,7 +999,7 @@ void Workspace::reconfigure()
 void Workspace::slotSettingsChanged(int category)
     {
     kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
-    if( category == (int) KApplication::SETTINGS_SHORTCUTS )
+    if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
         readShortcuts();
     }
 
@@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-    KApplication::tdeinitExec( "kcmshell", configModules(false) );
+    TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
     }
 
 /*!