Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

302 files changed, 1056 insertions, 1056 deletions

diff --git a/doc/khelpcenter/userguide/index.docbook b/doc/khelpcenter/userguide/index.docbook
index 691706676..7891c18c6 100644
--- a/doc/khelpcenter/userguide/index.docbook
+++ b/doc/khelpcenter/userguide/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
   <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "<replaceable>KApp</replaceable>">
+  <!ENTITY kappname "<replaceable>TDEApp</replaceable>">
   <!ENTITY % addindex "INCLUDE">
   <!ENTITY % imageobjectco.module "INCLUDE">
   <!ENTITY getting-help SYSTEM "getting-help.docbook">
diff --git a/doc/khelpcenter/userguide/programs-and-documents.docbook b/doc/khelpcenter/userguide/programs-and-documents.docbook
index b56f486b4..c5eb9091f 100644
--- a/doc/khelpcenter/userguide/programs-and-documents.docbook
+++ b/doc/khelpcenter/userguide/programs-and-documents.docbook
@@ -251,7 +251,7 @@ the <guilabel>Preview and Metafiles</guilabel> tab and change the
 
 <title>Configuring Programs</title>
 
-<sect2 id="configure-kapp">
+<sect2 id="configure-tdeApp">
 <title>Application Configuration</title>
 <!-- FIXME: Make a more friendly title -->
 <indexterm><primary>Configuration</primary></indexterm>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index 08ca89534..b348c6286 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -606,13 +606,13 @@ or before it starts loading plugins, &etc;, invoke &ksplash; as
 follows:</para>
 
 <programlisting>
-DCOPClient *c = kapp-&gt;dcopClient();
+DCOPClient *c = tdeApp-&gt;dcopClient();
 TQString error;
 QCString KSplashName;
 int pid = 0;
 QStringList args;
 args &lt;&lt; "--theme=MyCoolTheme" &lt;&lt; "--managed";
-if (kapp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
+if (tdeApp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
 &amp;KSplashName, &amp;pid))
 {
   KMessageBox::sorry(0, error, "Unable to invoke KSplash");
diff --git a/doc/tdeprint/index.docbook b/doc/tdeprint/index.docbook
index 225469889..a1633fcec 100644
--- a/doc/tdeprint/index.docbook
+++ b/doc/tdeprint/index.docbook
@@ -20,7 +20,7 @@
   <!ENTITY external-command-doc SYSTEM "external-command.docbook">
   <!ENTITY extensions-doc SYSTEM "extensions.docbook">
   <!ENTITY final-word-doc SYSTEM "final-word.docbook">
-  <!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
+  <!ENTITY kappname "&tdeprint;"><!-- replace tdeApp here -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 ]>
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index 1c49c8ec5..fc5c48bee 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -92,8 +92,8 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
   connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept()));
   connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&)));
 
-  if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() )
-    kapp->dcopClient()->registerAs( kapp->name() );
+  if ( !m_krashconf->safeMode() && tdeApp->dcopClient()->attach() )
+    tdeApp->dcopClient()->registerAs( tdeApp->name() );
 }
 
 Toplevel :: ~Toplevel()
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index a5290e531..00d3c5ae5 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -88,12 +88,12 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   bbox->addStretch( 5 );
   mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) );
   mApplyButton->setEnabled( false );
-  bbox->addButton( KStdGuiItem::close(), kapp, TQ_SLOT( quit() ) );
+  bbox->addButton( KStdGuiItem::close(), tdeApp, TQ_SLOT( quit() ) );
   bbox->layout();
 
   layout->addWidget( bbox );
 
-	connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) );
+	connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) );
 
   mAppCache.setAutoDelete( true );
 
@@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   TDEStartupInfo::appStarted();
 
   TQAccel *accel = new TQAccel( this );
-  accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQ_SLOT( quit() ) );
+  accel->connectItem( accel->insertItem( Key_Q + CTRL ), tdeApp, TQ_SLOT( quit() ) );
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 479d0c77c..d7b3dd4c8 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -113,7 +113,7 @@ KateApp::~KateApp ()
 
 KateApp *KateApp::self ()
 {
-  return (KateApp *) kapp;
+  return (KateApp *) tdeApp;
 }
 
 Kate::Application *KateApp::application ()
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 1a1ce3103..de749a60a 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -741,7 +741,7 @@ void KFLConfigPage::apply()
 void KFLConfigPage::reload()
 {
   // read in from config file
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Filelist" );
   cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
   kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index a9c9d2c16..c68b8e031 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -230,7 +230,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
   cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) );
   cmbPath->setURLs( config->readPathListEntry( "dir history" ) );
   // if we restore history
-  if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) {
+  if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) {
     TQString loc( config->readPathEntry( "location" ) );
     if ( ! loc.isEmpty() ) {
 //       waitingDir = loc;
@@ -245,7 +245,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
   filter->setHistoryItems( config->readListEntry("filter history"), true );
   lastFilter = config->readEntry( "last filter" );
   TQString flt("");
-  if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() )
+  if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() )
     flt = config->readEntry("current filter");
   filter->lineEdit()->setText( flt );
   slotFilterChange( flt );
@@ -629,7 +629,7 @@ void KFSConfigPage::apply()
 
   m_changed = false;
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l;
@@ -671,7 +671,7 @@ void KFSConfigPage::reload()
 }
 void KFSConfigPage::init()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l = config->readListEntry( "toolbar actions", ',' );
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index b6779043d..1d5db5c0f 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -321,7 +321,7 @@ void GrepTool::processOutput()
       lbResult->insertItem(item);
     buf = buf.mid(pos+1);
   }
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void GrepTool::slotSearch()
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 15b4e62d1..679be8a30 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -149,7 +149,7 @@ GUIClient::GUIClient ( MainWindow *mw )
   m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) );
 
   // read shortcuts
-  actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
+  actionCollection()->readShortcutSettings( "Shortcuts", tdeApp->config() );
 }
 
 GUIClient::~GUIClient()
@@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
 
   // try to read the action shortcut
   TDEShortcut sc;
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   TQString _grp = cfg->group();
   cfg->setGroup("Shortcuts");
   sc = TDEShortcut( cfg->readEntry( aname, "" ) );
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 44899a82c..2b0c2ddfb 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -81,7 +81,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
     {
       KMessageBox::error(this, i18n("A TDE text-editor component could not be found;\n"
                                     "please check your TDE installation."));
-      kapp->exit(1);
+      tdeApp->exit(1);
     }
 
     docList.append(doc);
@@ -134,7 +134,7 @@ KWrite::~KWrite()
     delete m_view->document();
   }
 
-  kapp->config()->sync ();
+  tdeApp->config()->sync ();
 }
 
 void KWrite::setupActions()
@@ -297,7 +297,7 @@ void KWrite::editKeys()
 
 void KWrite::editToolbars()
 {
-  saveMainWindowSettings( kapp->config(), "MainWindow" );
+  saveMainWindowSettings( tdeApp->config(), "MainWindow" );
   KEditToolbar *dlg = new KEditToolbar(guiFactory());
   connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
   dlg->exec();
@@ -306,7 +306,7 @@ void KWrite::editToolbars()
 
 void KWrite::slotNewToolbarConfig()
 {
-  applyMainWindowSettings( kapp->config(), "MainWindow" );
+  applyMainWindowSettings( tdeApp->config(), "MainWindow" );
 }
 
 
@@ -431,13 +431,13 @@ void KWrite::writeConfig(TDEConfig *config)
 //config file
 void KWrite::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   readConfig(config);
 }
 
 void KWrite::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   writeConfig(config);
 }
 
@@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(TDEConfig *config) //save documents
 //restore session
 void KWrite::restore()
 {
-  TDEConfig *config = kapp->sessionConfig();
+  TDEConfig *config = tdeApp->sessionConfig();
 
   if (!config)
     return;
@@ -595,7 +595,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 
   TDEGlobal::locale()->insertCatalogue("katepart");
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isRegistered())
   {
     client->attach();
@@ -604,7 +604,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-  if (kapp->isRestored())
+  if (tdeApp->isRestored())
   {
     KWrite::restore();
   }
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 47dc60fe6..3a2d7c362 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -180,8 +180,8 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
 
   }
 
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
 
   // This key has no GUI apparently
   TDEConfig config("kcmdisplayrc", true );
@@ -194,13 +194,13 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
   TQByteArray params;
   TQDataStream stream(params, IO_WriteOnly);
   stream << name << value;
-  kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
+  tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
   setenv( name, value, 1 ); // apply effect also to itself
 
   if( startup )
   {
      runModules( 0 );
-     kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
+     tdeApp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
      sendReady();
      TQTimer::singleShot( 300 * 1000, tqApp, TQ_SLOT( quit())); // just in case
      tqApp->exec(); // wait for runPhase1() and runPhase2()
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 4d989149b..874df3b67 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
       lay->setSpacing(KDialog::spacingHint());
 
       TQLabel *label1 = new TQLabel( contents);
-      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
+      TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
       if (pixmap.isNull())
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
@@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event)
               +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
 
         KWin::setState( dialog->winId(), NET::KeepAbove );
-        kapp->updateUserTimestamp();
+        tdeApp->updateUserTimestamp();
         dialog->show();
      }
   }
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index e8c41accc..7346dd398 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -717,7 +717,7 @@ void KAccessConfig::save()
   // When turning things off, it needs to be done by kaccess,
   // so don't actually kill it *shrug*.
   if ( true /*needToRunKAccessDaemon( config )*/ )
-      kapp->startServiceByDesktopName("kaccess");
+      tdeApp->startServiceByDesktopName("kaccess");
 
   else // don't need it -> kill it
   {
@@ -814,7 +814,7 @@ extern "C"
 
     delete config;
     if (run)
-      kapp->startServiceByDesktopName("kaccess");
+      tdeApp->startServiceByDesktopName("kaccess");
   }
 }
 
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 1aad88a23..27c024df0 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -74,7 +74,7 @@ static bool startArts()
 	delete config;
 
 	if (startServer)
-		kapp->tdeinitExec(startRealtime?"artswrapper":"artsd",
+		tdeApp->tdeinitExec(startRealtime?"artswrapper":"artsd",
 		                  TQStringList::split(" ",args));
 	return startServer;
 }
@@ -600,7 +600,7 @@ void KArtsModule::restartServer()
 	}
 
 	// Restart knotify
-	kapp->startServiceByDesktopName("knotify");
+	tdeApp->startServiceByDesktopName("knotify");
 }
 
 bool KArtsModule::artsdIsRunning()
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 478cc4c45..fe74e00ef 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -402,7 +402,7 @@ wp_load:
 	// HACK: Use KFileMetaInfo only when we're attached to DCOP.
 	// KFileMetaInfo needs tdesycoca and so on, but this code is
 	// used also in krootimage (which in turn is used by tdm).
-	if( kapp->dcopClient()->isAttached()) {
+	if( tdeApp->dcopClient()->isAttached()) {
 	    KFileMetaInfo metaInfo(file);
 	    if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
 		switch (metaInfo.item("Orientation").string().toInt()) {
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 278a250c9..87d9479de 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings()
 
     // tell kdesktop to get it's butt in gear and pick up the new settings
     TQByteArray data;
-    kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
+    tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
 }
 
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index e27aa50ac..23478b5e1 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -100,7 +100,7 @@ void KBackground::save()
     m_base->save();
 
     // reconfigure kdesktop. kdesktop will notify all clients
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
 
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 0b956523b..b2ff888b4 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -50,7 +50,7 @@ extern "C"
     XKeyboardState kbd;
     XKeyboardControl kbdc;
 
-    XGetKeyboardControl(kapp->getDisplay(), &kbd);
+    XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
     TDEConfig config("kcmbellrc", true, false);
     config.setGroup("General");
@@ -58,7 +58,7 @@ extern "C"
     kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
     kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch);
     kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration);
-    XChangeKeyboardControl(kapp->getDisplay(),
+    XChangeKeyboardControl(tdeApp->getDisplay(),
                            KBBellPercent | KBBellPitch | KBBellDuration,
                            &kbdc);
   }
@@ -154,7 +154,7 @@ void KBellConfig::load()
 void KBellConfig::load( bool useDefaults )
 {
   XKeyboardState kbd;
-  XGetKeyboardControl(kapp->getDisplay(), &kbd);
+  XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
   m_volume->setValue(kbd.bell_percent);
   m_pitch->setValue(kbd.bell_pitch);
@@ -179,7 +179,7 @@ void KBellConfig::save()
   kbd.bell_percent = bellVolume;
   kbd.bell_pitch = bellPitch;
   kbd.bell_duration = bellDuration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 
@@ -216,7 +216,7 @@ void KBellConfig::ringBell()
 
   // store the old state
   XKeyboardState old_state;
-  XGetKeyboardControl(kapp->getDisplay(), &old_state);
+  XGetKeyboardControl(tdeApp->getDisplay(), &old_state);
 
   // switch to the test state
   XKeyboardControl kbd;
@@ -226,17 +226,17 @@ void KBellConfig::ringBell()
     kbd.bell_duration = m_duration->value();
   else
     kbd.bell_duration = 0;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
   // ring bell
-  XBell(kapp->getDisplay(),0);
+  XBell(tdeApp->getDisplay(),0);
 
   // restore old state
   kbd.bell_percent = old_state.bell_percent;
   kbd.bell_pitch = old_state.bell_pitch;
   kbd.bell_duration = old_state.bell_duration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 }
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 7d791b9f7..e7dcf872f 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -89,7 +89,7 @@ void KclockModule::save()
 #endif
 
   // Tell the clock applet about the change so that it can update its timezone
-  kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
+  tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
 }
 
 void KclockModule::load()
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 81399b438..addf82baa 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -433,7 +433,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Menu bar
 
     //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-    kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
+    tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
 			TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
 
     paint.setFont( menuFont );
@@ -441,7 +441,7 @@ void WidgetCanvas::drawSampleWidgets()
 	TQString file = i18n("File");
     textLen = paint.fontMetrics().width( file );
     //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-	kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
+	tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
 			TQRect(30, 59, textLen + 10, 21), cg);
     paint.drawText( 35, 74, file );
 
@@ -526,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets()
     cg2.setColor(TQColorGroup::Button, button);
     cg2.setColor(TQColorGroup::Background, window);
     //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
-	kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
+	tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
 			TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
     paint.setPen(buttonTxt);
     paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 2eec97caa..d858dac40 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *)
 	if (!cfgName.isEmpty())
 		::chmod(TQFile::encodeName(cfgName), 0600);
 
-	kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
+	tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
 
 	emit changed(false);
 }
@@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
 	delete config;
 
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
-	kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
+	tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
 
 	emit changed(false);
 }
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index d22c90e3e..9bae3214d 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -193,7 +193,7 @@ void CSSConfig::save()
     {
       CSSTemplate css(templ);
 
-      dest = kapp->dirs()->saveLocation("data", "kcmcss");
+      dest = tdeApp->dirs()->saveLocation("data", "kcmcss");
       dest += "/override.css";
 
       css.expand(dest, cssDict());
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index ee0688a4f..f634e6bc2 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -122,7 +122,7 @@ void KCMDnssd::load()
 	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
 	avahiStatus.start();
 	while (avahiStatus.isRunning()) {
-	  kapp->processEvents();
+	  tdeApp->processEvents();
 	}
 	int exitStatus = avahiStatus.exitStatus();
 	if (exitStatus == 0) { // disabled
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 507af5993..3013dfc8f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -223,7 +223,7 @@ void FilterOptions::save()
   // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl;
 
   int changedProviderCount = 0;
-  TQString path = kapp->dirs()->saveLocation("services", "searchproviders/");
+  TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/");
 
   m_favoriteEngines.clear();
 
@@ -291,7 +291,7 @@ void FilterOptions::save()
   for (TQStringList::ConstIterator it = m_deletedProviders.begin();
       it != m_deletedProviders.end(); ++it)
   {
-      TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
+      TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
 
       // Shouldn't happen
       if (!matches.count())
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index ae86c5836..8d327dc0d 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig()
   // contains the sycoca based search provider configuration (malte).
   // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
   {
-    KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
+    KSimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc");
     oldConfig.setGroup("General");
 
     if (oldConfig.hasKey("SearchEngines"))
@@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig()
           delete provider;
         }
 
-        KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
+        KSimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
         desktop.setGroup("Desktop Entry");
         desktop.writeEntry("Type", "Service");
         desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index b6029cf36..bf295462f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -43,7 +43,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
 
     enableButtonSeparator(true);
 
-    m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40);
+    m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40);
 
     connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
     connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index cae4c5abb..598cee24e 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -379,7 +379,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setRef(ref);
     u.setQuery(query);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it's a file will get
       // an access denied error later on.
@@ -514,7 +514,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setPath(path);
     u.setRef(ref);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it exists and will get
       // an access denied error later on.
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index d6ec1ae62..489d479b7 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -757,7 +757,7 @@ void TDEFonts::save()
 
   KIPC::sendMessageAll(KIPC::FontChanged);
 
-  kapp->processEvents(); // Process font change ourselves
+  tdeApp->processEvents(); // Process font change ourselves
 
   bool aaSave = false;
   // Don't overwrite global settings unless explicitly asked for - e.g. the system
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 22c647db0..7bfd54264 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -166,7 +166,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+	connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	doDiskNotifications(true);
@@ -760,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point,
 }
 
 void HwDeviceSystemTray::slotHelpContents() {
-	kapp->invokeHelp(TQString::null, "hwdevicetray");
+	tdeApp->invokeHelp(TQString::null, "hwdevicetray");
 }
 
 #include "hwdevicetray.moc"
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 57fe2669f..ce8968198 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -477,8 +477,8 @@ void TDEIconConfig::save()
     g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
     g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
 
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
-    kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
+    tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
 
     mpConfig->sync();
     mpSystrayConfig->sync();
@@ -497,10 +497,10 @@ void TDEIconConfig::save()
     }
 
     // Signal kicker to reload icon configuration
-    kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
 
     // Signal system tray to reload icon configuration
-    kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
 }
 
 void TDEIconConfig::defaults()
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 86d782a1b..4d54fae0d 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -214,7 +214,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
 
   KTar archive(archiveName);
   archive.open(IO_ReadOnly);
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   const KArchiveDirectory* rootDir = archive.directory();
 
@@ -225,7 +225,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
     progressDiag.setLabel(
         i18n("<qt>Installing <strong>%1</strong> theme</qt>")
         .arg(*it));
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if (progressDiag.wasCancelled())
       break;
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 523696761..aa7008f56 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -161,7 +161,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
 
     unsigned char map[20];
-    int buttonCount = XGetPointerMapping(kapp->getDisplay(), map, 20);
+    int buttonCount = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
 
     // Only allow setting reversing scroll polarity if we have scroll buttons
     tab1->cbScrollPolarity->setEnabled(buttonCount >= 5);
@@ -624,7 +624,7 @@ void MouseConfig::save()
   themetab->save();
 
   // restart kaccess
-  kapp->startServiceByDesktopName("kaccess");
+  tdeApp->startServiceByDesktopName("kaccess");
 
   TDECModule::changed(false);
 
@@ -686,14 +686,14 @@ void MouseSettings::load(TDEConfig *config)
 {
   int accel_num, accel_den, threshold;
   double accel;
-  XGetPointerControl( kapp->getDisplay(),
+  XGetPointerControl( tdeApp->getDisplay(),
               &accel_num, &accel_den, &threshold );
   accel = float(accel_num) / float(accel_den);
 
   // get settings from X server
   int h = RIGHT_HANDED;
   unsigned char map[20];
-  num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20);
+  num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
 
   handedEnabled = true;
 
@@ -781,14 +781,14 @@ void MouseConfig::slotWheelScrollLinesChanged(int value)
 
 void MouseSettings::apply(bool force)
 {
-  XChangePointerControl( kapp->getDisplay(),
+  XChangePointerControl( tdeApp->getDisplay(),
                          true, true, int(tqRound(accelRate*10)), 10, thresholdMove);
 
   // 256 might seems extreme, but X has already been known to return 32,
   // and we don't want to truncate things. Xlib limits the table to 256 bytes,
   // so it's a good uper bound..
   unsigned char map[256];
-  num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256);
+  num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 256);
 
   int remap=(num_buttons>=1);
   if (handedEnabled && (m_handedNeedsApply || force)) {
@@ -857,7 +857,7 @@ void MouseSettings::apply(bool force)
       }
       int retval;
       if (remap)
-          while ((retval=XSetPointerMapping(kapp->getDisplay(), map,
+          while ((retval=XSetPointerMapping(tdeApp->getDisplay(), map,
                                             num_buttons)) == MappingBusy)
               /* keep trying until the pointer is free */
           { };
diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp
index c7e0a445c..d81371e51 100644
--- a/kcontrol/input/tdesyndaemon.cpp
+++ b/kcontrol/input/tdesyndaemon.cpp
@@ -90,7 +90,7 @@ TDESynDaemon::~TDESynDaemon()
 
 void TDESynDaemon::stop()
 {
-    kapp->quit();
+    tdeApp->quit();
 }
 
 void TDESynDaemon::poll()
diff --git a/kcontrol/input/touchpad_settings.cpp b/kcontrol/input/touchpad_settings.cpp
index ff15e4c21..ba910c607 100644
--- a/kcontrol/input/touchpad_settings.cpp
+++ b/kcontrol/input/touchpad_settings.cpp
@@ -345,7 +345,7 @@ void TouchpadSettings::apply(bool force)
 
         if (offWhileTyping)
         {
-            kapp->tdeinitExec("tdesyndaemon");
+            tdeApp->tdeinitExec("tdesyndaemon");
         }
     }
 
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 485f11442..ff02be68c 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -112,7 +112,7 @@ void AboutWidget::updatePixmap()
     TQString res = t.read();
 
     res = res.arg(  locate(  "data", "tdeui/about/kde_infopage.css" ) );
-    if (  kapp->reverseLayout() )
+    if (  tdeApp->reverseLayout() )
         res = res.arg(  "@import \"%1\";" ).arg(  locate(  "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
         res = res.arg(  "" );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 67584a74d..f59b95624 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -95,7 +95,7 @@ void ModuleTitle::clear()
 {
   m_icon->setPixmap( TQPixmap() );
   m_name->setText( TQString::null );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
@@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n"
     }
 
   raiseWidget( _busyw );
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   deleteModule();
   if (!module) return true;
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 82c400822..af20e8870 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url)
     }
 
     if ( textUrl.find('@') > -1 ) {
-        kapp->invokeMailer(textUrl);
+        tdeApp->invokeMailer(textUrl);
         return true;
     }
 
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index d8e89a192..b96b92bd6 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -101,7 +101,7 @@ void ConfigModule::deleteClient()
   _embedStack = 0;
   delete _embedFrame;
   _embedFrame = 0;
-  kapp->syncX();
+  tdeApp->syncX();
 
   if(_module)
     _module->close(true);
@@ -282,7 +282,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
      if (p->isType(KST_KService))
      {
         KService *s = static_cast<KService*>(p);
-        if (!kapp->authorizeControlModule(s->menuId()))
+        if (!tdeApp->authorizeControlModule(s->menuId()))
            continue;
 
         ConfigModule *module = new ConfigModule(s);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 05040b3dd..159f93a01 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 	 TQCString replyType;
 	 TQByteArray replyData;
 	 
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQPalette") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 			 setPalette(pal);
 		 }
 /* // Doesn't work ...
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQString") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 			 setStyle(style);
 		 }
 */	 
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQFont") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -273,7 +273,7 @@ void ProxyWidget::handbookClicked()
   if (getuid()!=0)
 	  emit handbookRequest();
   else
-     kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
+     tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
 }
 
 void ProxyWidget::helpClicked()
@@ -281,7 +281,7 @@ void ProxyWidget::helpClicked()
   if (getuid()!=0)
          emit helpRequest();
   else
-     kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
+     tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
 }
 
 void ProxyWidget::defaultClicked()
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index bbae08ad6..e7fe16170 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus()
 	TQByteArray replyData;
 
 
-	if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
+	if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
 				replyType, replyData ) ) {
 
 		_lvLoD->setEnabled( false );
@@ -310,7 +310,7 @@ void KDEDConfig::slotStartService()
 	TQCString replyType;
 	TQDataStream arg( data, IO_WriteOnly );
 	arg << service;
-	if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
+	if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
 		TQDataStream reply(replyData, IO_ReadOnly);
 		if ( replyType == "bool" )
 		{
@@ -337,7 +337,7 @@ void KDEDConfig::slotStopService()
 	TQDataStream arg( data, IO_WriteOnly );
 
 	arg << service;
-	if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
+	if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
 		slotServiceRunningToggled();
 	}
 	else {
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 90fa59f82..b0eaf1305 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -206,12 +206,12 @@ void KKeyModule::load()
   kc->commitChanges();
   actions.writeActions( KeySet, 0, true, true );
   if ( KeyType == "global" ) {
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
     // TODO: create a reconfigureKeys() method.
-    kapp->dcopClient()->send("twin", "", "reconfigure()", "");
-    kapp->dcopClient()->send("kdesktop", "", "configure()", "");
-    kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
+    tdeApp->dcopClient()->send("twin", "", "reconfigure()", "");
+    tdeApp->dcopClient()->send("kdesktop", "", "configure()", "");
+    tdeApp->dcopClient()->send("kicker", "Panel", "configure()", "");
   }
 }*/
 
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index bc182f944..f8c887c45 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -116,7 +116,7 @@ void ModifiersModule::save()
 		if( bMacSwap )
 			setupMacModifierKeys();
 		else
-			kapp->tdeinitExec("kxkb");
+			tdeApp->tdeinitExec("kxkb");
 		m_bMacSwapOrig = bMacSwap;
 		updateWidgets();
 	}
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index db7d5339f..291b47071 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -63,10 +63,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
 
     init();
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)",
                       "jumpToPanel(TQString)", false);
-    kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
 
     connect(this, TQ_SIGNAL(hidingPanelChanged(int)),
             this, TQ_SLOT(setCurrentPanelIndex(int)));
@@ -135,13 +135,13 @@ void KickerConfig::init()
 void KickerConfig::restartKicker()
 {
     // Tell kicker to restart
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
     TQCString appname;
     appname = "kicker";
-    kapp->dcopClient()->send(appname, appname, "restart", TQString(""));
+    tdeApp->dcopClient()->send(appname, appname, "restart", TQString(""));
 }
 
 void KickerConfig::notifyKicker()
@@ -151,9 +151,9 @@ void KickerConfig::notifyKicker()
     emit aboutToNotifyKicker();
 
     // Tell kicker about the new config file.
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     TQByteArray data;
@@ -168,7 +168,7 @@ void KickerConfig::notifyKicker()
         appname.sprintf("kicker-screen-%d", m_screenNumber);
     }
 
-    kapp->dcopClient()->send(appname, appname, "configure()", data);
+    tdeApp->dcopClient()->send(appname, appname, "configure()", data);
 }
 
 void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index b8a2d7ea9..ee44badaa 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
     /*
      * set the tooltips on the buttons properly for RTL langs
      */
-    if (kapp->reverseLayout())
+    if (tdeApp->reverseLayout())
     {
         TQToolTip::add(locationTopRight,     i18n("Top left"));
         TQToolTip::add(locationTop,          i18n("Top center"));
@@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
         m_panelPos = PosTop;
     }
     else if (pushed == locationTop)
@@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
         m_panelPos = PosTop;
     }
     else if (pushed == locationLeftTop)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignLeft;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationLeft)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignCenter;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationLeftBottom)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignRight;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationBottomLeft)
     {
@@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
         m_panelPos = PosBottom;
     }
     else if (pushed == locationBottom)
@@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
         m_panelPos = PosBottom;
     }
     else if (pushed == locationRightTop)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignLeft;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
     else if (pushed == locationRight)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignCenter;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
     else if (pushed == locationRightBottom)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignRight;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
 
     lengthenPanel(-1);
@@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() {
     if (m_panelPos == PosTop)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationTopRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationTopRight->setOn(true) :
                                     locationTopLeft->setOn(true);
         else if (m_panelAlign == AlignCenter)
             locationTop->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationTopLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationTopLeft->setOn(true) :
                                     locationTopRight->setOn(true);
     }
     else if (m_panelPos == PosRight)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationLeftTop->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeftTop->setOn(true) :
                                     locationRightTop->setOn(true);
         else if (m_panelAlign == AlignCenter)
-            kapp->reverseLayout() ? locationLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeft->setOn(true) :
                                     locationRight->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationLeftBottom->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) :
                                     locationRightBottom->setOn(true);
     }
     else if (m_panelPos == PosBottom)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationBottomRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationBottomRight->setOn(true) :
                                     locationBottomLeft->setOn(true);
         else if (m_panelAlign == AlignCenter)
             locationBottom->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationBottomLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) :
                                     locationBottomRight->setOn(true);
     }
     else // if (m_panelPos == PosLeft
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationRightTop->setOn(true) :
+            tdeApp->reverseLayout() ? locationRightTop->setOn(true) :
                                     locationLeftTop->setOn(true);
         else if (m_panelAlign == AlignCenter)
-            kapp->reverseLayout() ? locationRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationRight->setOn(true) :
                                     locationLeft->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationRightBottom->setOn(true) :
+            tdeApp->reverseLayout() ? locationRightBottom->setOn(true) :
                                     locationLeftBottom->setOn(true);
     }
 
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 6e198659a..5565a05d8 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply()
     save();
     dataChanged = false;
     enableButton(Apply, false);
-    kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
+    tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
 
     KDialogBase::slotApply();
 }
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 55eb642fe..0c002b5fa 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -285,7 +285,7 @@ void KBehaviourOptions::save()
     config.sync();
 
     // Tell the running server
-    if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+    if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
       UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
       uiserver.setListMode( cbListProgress->isChecked() );
@@ -293,10 +293,10 @@ void KBehaviourOptions::save()
 
     // Send signal to konqueror
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
-    kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
 }
 
 TQString KBehaviourOptions::handbookSection() const
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 6ea6178db..65212f68f 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -221,11 +221,11 @@ void KDesktopConfig::save()
   delete config;
 
   // Tell kdesktop about the new config file
-  if ( !kapp->dcopClient()->isAttached() )
-     kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+     tdeApp->dcopClient()->attach();
   TQByteArray data;
 
-  kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+  tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 
   emit changed(false);
 }
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 3d149ef39..16f8688d7 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -418,8 +418,8 @@ void DesktopBehavior::save()
     g_pConfig->sync();
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -428,11 +428,11 @@ void DesktopBehavior::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
     // for the standalone menubar setting
-    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
-    kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
-    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+    tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
+    tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 void DesktopBehavior::enableChanged()
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index e8a99297d..ae03a0534 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -330,9 +330,9 @@ void KonqFontOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     // Tell kdesktop about the new config file
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -341,7 +341,7 @@ void KonqFontOptions::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 TQString KonqFontOptions::handbookSection() const
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 309651dbb..2e85ab609 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -206,9 +206,9 @@ void KPreviewOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 TQString KPreviewOptions::handbookSection() const
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index be73dcb7a..f83d68fe3 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -512,8 +512,8 @@ void DesktopPathConfig::save()
     }
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -524,7 +524,7 @@ void DesktopPathConfig::save()
     else {
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
     }
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type )
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 6e92d8ffe..d06ef054f 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -408,9 +408,9 @@ void KAppearanceOptions::save()
     m_pConfig->sync();
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
   emit changed(false);
 }
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 14cf39a36..5b5af6555 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -362,9 +362,9 @@ void KMiscHTMLOptions::save()
     kdeglobals.sync();
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     emit changed(false);
 }
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index 3f407fa23..8ee037a8d 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -149,9 +149,9 @@ void KJSParts::save()
   // Send signal to konqueror
   // Warning. In case something is added/changed here, keep kfmclient in sync
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 9bb43849f..b80aab5f4 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -230,9 +230,9 @@ void KPluginOptions::save()
     			// instantly
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
 /*****************************************************************************/
 
diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp
index 26eac0f60..f61f16488 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.cpp
+++ b/kcontrol/konqhtml/userInterOpts_impl.cpp
@@ -104,9 +104,9 @@ void userInterOpts::save()
     else m_pConfig->writeEntry( "MultipleTabConfirm", true );
 
     TQByteArray data;
-    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     if ( m_pPermanentCloseButton->isChecked() )
       m_pHoverCloseButton->setEnabled(false);
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 87487fbe0..28cec6825 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -165,7 +165,7 @@ void KCMKonsole::save()
 
     emit changed(false);
 
-    DCOPClient *dcc = kapp->dcopClient();
+    DCOPClient *dcc = tdeApp->dcopClient();
     dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
     dcc->send("kdesktop", "default", "configure()", TQByteArray());
     dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 801880b8b..8f56905f3 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -77,7 +77,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
 
     connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool)));
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
     TQByteArray data;
@@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().text();
+		color[fi] = tdeApp->palette().active().text();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 1;
@@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().base();
+		color[fi] = tdeApp->palette().active().base();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 2;
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 09dc7955f..5ea6bdab2 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version)
    TQByteArray params;
    TQDataStream stream(params, IO_WriteOnly);
    stream << name << value;
-   kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
+   tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
 }
 
 // -----------------------------------------------------------------------------
@@ -168,9 +168,9 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
 
   TQMap <TQString, bool> pathDb;
     // OK, this isn't fun at all.
-    // KApp adds paths ending with /, QApp those without slash, and if
+    // TDEApp adds paths ending with /, QApp those without slash, and if
     // one gives it something that is other way around, it will complain and scare
-    // users. So we need to know whether a path being added is from KApp, and in this case
+    // users. So we need to know whether a path being added is from TDEApp, and in this case
     // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
 
   TQString qversion = tqVersion();
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 1068eb325..f4b471a52 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -436,7 +436,7 @@ void KTheme::apply()
 
     desktopConf.sync();         // TODO sync and signal only if <desktop> elem present
     // reconfigure kdesktop. kdesktop will notify all clients
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if ( !client->isAttached() ) {
         client->attach();
     }
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 06c41eaba..db3461714 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -212,11 +212,11 @@ LaunchConfig::save()
 
   emit changed( false );
 
-  if (!kapp->dcopClient()->isAttached())
-     kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+     tdeApp->dcopClient()->attach();
   TQByteArray data;
-  kapp->dcopClient()->send( "kicker", "Panel", "restart()", data );
-  kapp->dcopClient()->send( "kdesktop", "", "configure()", data );
+  tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", data );
+  tdeApp->dcopClient()->send( "kdesktop", "", "configure()", data );
 }
 
   void
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 288e3074c..3e4d18d1c 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -36,8 +36,8 @@
 
 KPrivacyManager::KPrivacyManager()
 {
-  if (!kapp->dcopClient()->isAttached())
-    kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+    tdeApp->dcopClient()->attach();
 
   m_error = false;
 }
@@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
 
 bool KPrivacyManager::clearRunCommandHistory() const
 {
-  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearAllCookies() const
 {
-  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
+  return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
 }
 
 bool KPrivacyManager::clearSavedClipboardContents()
@@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
     return true;
   }
 
-  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearFormCompletion() const
@@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
 
 bool KPrivacyManager::clearQuickStartMenu() const
 {
-  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
+  return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
 }
 
 bool KPrivacyManager::clearWebHistory()
@@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory()
   if(!isApplicationRegistered("konqueror"))
   {
     kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
-    kapp->tdeinitExec("konqueror", args, 0,0);
+    tdeApp->tdeinitExec("konqueror", args, 0,0);
   }
 
-  return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+  return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
                                    "notifyClear(TQCString)", TQString("") );
 }
 
@@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData()
 bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
 {
 
-  QCStringList regApps = kapp->dcopClient()->registeredApplications();
+  QCStringList regApps = tdeApp->dcopClient()->registeredApplications();
 
   for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
     if((*it).find(appName.latin1()) != -1) return true;
diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index b0e78087c..8dad337b7 100644
--- a/kcontrol/randr/tderandrpassivepopup.cpp
+++ b/kcontrol/randr/tderandrpassivepopup.cpp
@@ -88,7 +88,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 	    }
 	}
     if( x11_events )
-	kapp->installX11EventFilter( this );
+	tdeApp->installX11EventFilter( this );
     }
     	
 bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index c9be62354..0283a294b 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+	connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-//	connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQ_SLOT( desktopResized()));
+//	connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized()));
 #endif
 
 	randr_display = XOpenDisplay(NULL);
@@ -924,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
 
 void KRandRSystemTray::slotHelpContents()
 {
-  kapp->invokeHelp(TQString::null, "tderandrtray");
+  tdeApp->invokeHelp(TQString::null, "tderandrtray");
 }
 
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 2b78e26ff..d98787da6 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -497,7 +497,7 @@ void KScreenSaver::save()
     // TODO (GJ): When you changed anything, these two lines will give a segfault
     // on exit. I don't know why yet.
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     client->send("kdesktop", "KScreensaverIface", "configure()", TQString(""));
 
     mChanged = false;
@@ -842,7 +842,7 @@ void KScreenSaver::slotSetup()
         }
 
         mSetupBt->setEnabled( false );
-        kapp->flushX();
+        tdeApp->flushX();
 
         mSetupProc->start();
     }
@@ -886,8 +886,8 @@ void KScreenSaver::slotTest()
         {
             mTestWin = new TestWin();
             mTestWin->setBackgroundMode(TQWidget::NoBackground);
-            mTestWin->setGeometry(0, 0, kapp->desktop()->width(),
-                                    kapp->desktop()->height());
+            mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(),
+                                    tdeApp->desktop()->height());
         }
 
         mTestWin->show();
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index 8c58b1e8f..8425d9124 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 TDEConfig("ksmartcardrc", false, false);
 
-  DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
+  DCOPClient *dc = tdeApp->dcopClient();
 
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
@@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 
     //  New view items
     TDEListViewItem * temp;
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
 
     (void) new TDEListViewItem(base->_readerHostsListView,
@@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
    TQDataStream argATR(dataATR,IO_WriteOnly);
    argATR << *_slot;
 
-   kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
+   tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
 			   dataATR, rettype, retval);
 
 
@@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults )
   }
 
   // We call kardsvc to retrieve the current readers
-  kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
+  tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
 			   data, rettype, retval);
   TQStringList readers;
   readers.clear();
@@ -337,17 +337,17 @@ if (_ok) {
   // Start or stop the server as needed
   if (base->enableSupport->isChecked()) {
 
-    kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			     data, rettype, retval);
     config->sync();
 
-    kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
+    tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
 			     data, rettype, retval);
   } else {
 
 
 
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
   }
 
@@ -389,7 +389,7 @@ extern "C"
 	TQDataStream arg(data, IO_WriteOnly);
 	TQCString modName = "kardsvc";
 	arg << modName;
-	kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+	tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			         data, rettype, retval);
     }
   }
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 3d165a577..c5e0ad784 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -135,7 +135,7 @@ void SMServerConfig::save()
 
   // update the k menu if necessary
   TQByteArray data;
-  kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
+  tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
 }
 
 void SMServerConfig::defaults()
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index 0b9611575..5b08f56cf 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -56,9 +56,9 @@ void KSpellCheckingConfig::save()
 {
     spellConfig->writeGlobalSettings();
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 void KSpellCheckingConfig::defaults()
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index c03157c40..d9efc8807 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -95,7 +95,7 @@ extern "C"
         TQByteArray properties;
         TQDataStream d(properties, IO_WriteOnly);
         d.setVersion( 3 );      // Qt2 apps need this.
-        d << kapp->palette() << TDEGlobalSettings::generalFont();
+        d << tdeApp->palette() << TDEGlobalSettings::generalFont();
         Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
 
         // do it for all root windows - multihead support
@@ -668,12 +668,12 @@ void KCMStyle::save()
 
 	if (m_bEffectsDirty) {
 		KIPC::sendMessageAll(KIPC::SettingsChanged);
-		kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+		tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	}
         //update kicker to re-used tooltips kicker parameter otherwise, it overwritted
         //by style tooltips parameters.
         TQByteArray data;
-        kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
+        tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
 
 	// Clean up
 	m_bEffectsDirty  = false;
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 2eb7cf376..ab584c629 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig()
 
 void TaskbarConfig::slotEditGlobalConfiguration() {
     TQByteArray data;
-    kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+    tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
 }
 
 void TaskbarConfig::processLockouts()
@@ -445,7 +445,7 @@ void TaskbarConfig::load()
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
 
     int iconSize = m_settingsObject->iconSize();
-    if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
+    if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
     {
         m_widget->smallIcons->setChecked(false);
     }
@@ -457,11 +457,11 @@ void TaskbarConfig::save()
 
     if(m_widget->smallIcons->isChecked())
     {
-        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
+        m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small));
     }
     else
     {
-        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
+        m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel));
     }
 
     m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
@@ -474,7 +474,7 @@ void TaskbarConfig::save()
     m_settingsObject->writeConfig();
 
     TQByteArray data;
-    kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
+    tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
 }
 
 void TaskbarConfig::defaults()
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index ff2eaae77..7b5a7a5bf 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     {
         if(!itsCurrentUrl.isEmpty())
         {
-            paint.setPen(kapp->palette().active().text());
+            paint.setPen(tdeApp->palette().active().text());
             paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
         }
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index d5ca2eba5..057b54831 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -50,7 +50,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
     if(factory)
     {
         KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
-        KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+        KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
         itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
 
@@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
             itsPreview->openURL(openURL);
 
         TQSize             defSize(450, 380);
-        TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+        TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
 
-        resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
+        resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
         show();
     }
     else
@@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
 CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
 {
-    TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
-    kapp->config()->writeEntry(CFG_SIZE_KEY, size());
-    kapp->config()->sync();
+    TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
+    tdeApp->config()->writeEntry(CFG_SIZE_KEY, size());
+    tdeApp->config()->sync();
 }
 
 void CFontViewerAppMainWindow::fileOpen()
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index 8ac02dcfd..40dbf24dd 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -194,7 +194,7 @@ void KSocksConfig::libSelection()
 
 void KSocksConfig::load()
 {
-  TDEConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(tdeApp->config(), "Socks");
   base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false));
   int id = config.readNumEntry("SOCKS_method", 1);
   base->bg->setButton(id);
@@ -228,7 +228,7 @@ void KSocksConfig::load()
 
 void KSocksConfig::save()
 {
-  TDEConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(tdeApp->config(), "Socks");
   config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true);
   config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true);
   config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true);
@@ -241,7 +241,7 @@ void KSocksConfig::save()
   }
   config.writePathEntry("SOCKS_lib_path", libs, ',', true, true);
 
-  kapp->config()->sync();
+  tdeApp->config()->sync();
 
   emit changed(false);
 }
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 4456a6d84..32380a591 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -175,9 +175,9 @@ void KCMXinerama::save() {
 		config->writeEntry("Unmanaged", item == _displays ? -3 : item);
 		config->sync();
 
-		if (!kapp->dcopClient()->isAttached())
-			kapp->dcopClient()->attach();
-		kapp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
+		if (!tdeApp->dcopClient()->isAttached())
+			tdeApp->dcopClient()->attach();
+		tdeApp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
 
 		ksplashrc->setGroup("Xinerama");
 		ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */);
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 0870432fc..53af22ee8 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -133,7 +133,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 	TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
 
 	TQByteArray data;
-	int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+	int callId=tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 
 	if(!callId)
 	{
@@ -142,7 +142,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << TQCString( "MainWindow" );
 
-		kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
+		tdeApp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
 	}
 }
 
@@ -163,7 +163,7 @@ DCOPBrowserApplicationItem::populate()
   bool ok = false;
   bool isDefault = false;
 
-  QCStringList objs = kapp->dcopClient()->remoteObjects(app_, &ok);
+  QCStringList objs = tdeApp->dcopClient()->remoteObjects(app_, &ok);
 
   for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it)
   {
@@ -191,7 +191,7 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri
 		if(!mainWindowName.isEmpty())
 		{
 			TQByteArray data;
-			kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
+			tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
 				this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 		}
 	}
@@ -245,7 +245,7 @@ DCOPBrowserInterfaceItem::populate()
 
   bool ok = false;
 
-  QCStringList funcs = kapp->dcopClient()->remoteFunctions(app_, object_, &ok);
+  QCStringList funcs = tdeApp->dcopClient()->remoteFunctions(app_, object_, &ok);
 
   for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it)
     if ((*it) != "QCStringList functions()")
@@ -283,7 +283,7 @@ DCOPBrowserFunctionItem::setOpen(bool o)
 KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
   : TDEMainWindow(parent, name)
 {
-  dcopClient = kapp->dcopClient();
+  dcopClient = tdeApp->dcopClient();
   resize( 377, 480 );
   statusBar()->message(i18n("Welcome to the TDE DCOP browser"));
   setIcon(TDEGlobal::iconLoader()->loadIcon("enhanced_browsing", TDEIcon::NoGroup, TDEIcon::SizeSmall));
@@ -797,7 +797,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
     }
   }
 
-  DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", kapp->userTimestamp());
+  DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", tdeApp->userTimestamp());
 
   // Now do the DCOP call
 
diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp
index a7078f12e..49cff2c16 100644
--- a/kdesktop/bgmanager.cpp
+++ b/kdesktop/bgmanager.cpp
@@ -102,7 +102,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
     }
 
 #ifdef COMPOSITE
-    m_tPixmap = new KPixmap(kapp->desktop()->size());
+    m_tPixmap = new KPixmap(tdeApp->desktop()->size());
     m_tPixmap->fill(TQColor(0, 0x0));
     connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
             TQ_SLOT(slotCmBackgroundChanged( bool )));
@@ -130,7 +130,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
 
 
 #if (TQT_VERSION-0 >= 0x030200)
-    connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
+    connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -1026,13 +1026,13 @@ void KBackgroundManager::desktopResized()
 #ifdef COMPOSITE
     if (m_tPixmap)
 	delete m_tPixmap;
-    m_tPixmap = new KPixmap(kapp->desktop()->size());
+    m_tPixmap = new KPixmap(tdeApp->desktop()->size());
     m_tPixmap->fill(TQColor(0, 0x0));
 #endif
     
     m_Hash = 0;
     if( m_pDesktop ) {
-        m_pDesktop->resize( kapp->desktop()->geometry().size());
+        m_pDesktop->resize( tdeApp->desktop()->geometry().size());
         if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
             m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
         }
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index fa3426023..ede2fadbc 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -71,8 +71,8 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
 
 KRootWidget::KRootWidget() : TQObject()
 {
-     kapp->desktop()->installEventFilter(this);
-     kapp->desktop()->setAcceptDrops( true );
+     tdeApp->desktop()->installEventFilter(this);
+     tdeApp->desktop()->setAcceptDrops( true );
 }
 
 bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
@@ -157,8 +157,8 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setAcceptDrops(true); // WStyle_Customize seems to disable that
   m_pKwinmodule = new KWinModule( this );
 
-  kapp->dcopClient()->setNotifications(true);
-  kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
+  tdeApp->dcopClient()->setNotifications(true);
+  tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
                                         "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
 
   // Dont repaint on configuration changes during construction
@@ -184,15 +184,15 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setGeometry( TQApplication::desktop()->geometry() );
   lower();
 
-  connect( kapp, TQ_SIGNAL( shutDown() ),
+  connect( tdeApp, TQ_SIGNAL( shutDown() ),
            this, TQ_SLOT( slotShutdown() ) );
 
-  connect(kapp, TQ_SIGNAL(settingsChanged(int)),
+  connect(tdeApp, TQ_SIGNAL(settingsChanged(int)),
           this, TQ_SLOT(slotSettingsChanged(int)));
-  kapp->addKipcEventMask(KIPC::SettingsChanged);
+  tdeApp->addKipcEventMask(KIPC::SettingsChanged);
 
-  kapp->addKipcEventMask(KIPC::IconChanged);
-  connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
+  tdeApp->addKipcEventMask(KIPC::IconChanged);
+  connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
 
   connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
           this, TQ_SLOT(slotDatabaseChanged()));
@@ -205,7 +205,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-  connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
+  connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 }
 
@@ -301,7 +301,7 @@ KDesktop::initRoot()
         TQCString replyType;
         TQRect area;
 
-        if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+        if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
                                        data, replyType, result, false, 2000) )
         {
           TQDataStream res(result, IO_ReadOnly);
@@ -364,7 +364,7 @@ KDesktop::backgroundInitDone()
           m_pIconView->setErasePixmap( *bg );
 
        show();
-       kapp->sendPostedEvents();
+       tdeApp->sendPostedEvents();
     }
 
     DCOPRef r( "ksmserver", "ksmserver" );
@@ -404,7 +404,7 @@ KDesktop::slotStart()
   keys->readSettings();
   keys->updateConnections();
 
-  connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
+  connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
 
   TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
 }
@@ -504,7 +504,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
   if (m_bInit)
       return;
 
-  if (!kapp->authorize("run_command"))
+  if (!tdeApp->authorize("run_command"))
       return;
 
   // Created on demand
@@ -839,7 +839,7 @@ void KDesktop::refresh()
   m_bNeedRepaint |= 1;
   updateWorkArea();
 #endif
-  kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
+  tdeApp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
   refreshIcons();
 }
 
@@ -907,7 +907,7 @@ void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
     if (screen <= -2)
        screen = kdesktop_screen_number;
     else if (screen == -1)
-       screen = kapp->desktop()->primaryScreen();
+       screen = tdeApp->desktop()->primaryScreen();
 
     // This is pretty broken, mixes Xinerama and non-Xinerama multihead
     // and generally doesn't seem to be required anyway => ignore screen.
@@ -1032,7 +1032,7 @@ void KDesktop::logout()
 void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
                        TDEApplication::ShutdownType sdtype )
 {
-    if( !kapp->requestShutDown( confirm, sdtype ) )
+    if( !tdeApp->requestShutDown( confirm, sdtype ) )
         // this i18n string is also in kicker/applets/run/runapplet
         KMessageBox::error( this, i18n("Could not log out properly.\nThe session manager cannot "
                                         "be contacted. You can try to force a shutdown by pressing "
@@ -1124,7 +1124,7 @@ void KDesktop::setIconsEnabled( bool enable )
 
 void KDesktop::desktopResized()
 {
-    resize(kapp->desktop()->size());
+    resize(tdeApp->desktop()->size());
 
     if ( m_pIconView )
     {
@@ -1132,7 +1132,7 @@ void KDesktop::desktopResized()
         // remove all icons, resize desktop, tell kdiconview new iconsArea size
         // tell kdiconview to reget all icons
         m_pIconView->slotClear();
-        m_pIconView->resize(kapp->desktop()->size());
+        m_pIconView->resize(tdeApp->desktop()->size());
 
         // get new desktopIconsArea from kicker
         TQByteArray data, result;
@@ -1141,7 +1141,7 @@ void KDesktop::desktopResized()
         TQCString replyType;
         TQRect area;
 
-        if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+        if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
                                        data, replyType, result, false, 2000) )
         {
             TQDataStream res(result, IO_ReadOnly);
diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp
index 90211e8a5..f881d614f 100644
--- a/kdesktop/init.cpp
+++ b/kdesktop/init.cpp
@@ -134,7 +134,7 @@ static TQString realDesktopPath()
  */
 static void copyDesktopLinks()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("General");
     if (!config->readBoolEntry("CopyDesktopLinks", true))
        return;
diff --git a/kdesktop/kcustommenu.cpp b/kdesktop/kcustommenu.cpp
index cd1287d3d..f3d3cf817 100644
--- a/kdesktop/kcustommenu.cpp
+++ b/kdesktop/kcustommenu.cpp
@@ -71,7 +71,7 @@ KCustomMenu::slotActivated(int id)
   KService::Ptr s = d->entryMap[id];
   if (!s)
      return;
-  kapp->startServiceByDesktopPath(s->desktopEntryPath());
+  tdeApp->startServiceByDesktopPath(s->desktopEntryPath());
 }
 
 // The following is copied from kicker's PanelServiceMenu
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 5f4fb24cd..a4f46e717 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -14,7 +14,7 @@
 	keys->insert( "Program:kdesktop", i18n("Desktop") );
 
 #ifndef NOSLOTS
-	if (kapp->authorize("run_command"))
+	if (tdeApp->authorize("run_command"))
 	{
 #endif
 		DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
@@ -25,20 +25,20 @@
 	DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
 	DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
 #ifndef NOSLOTS
-	if (kapp->authorize("lock_screen"))
+	if (tdeApp->authorize("lock_screen"))
 	{
 #endif
 		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
 		DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
 #ifndef NOSLOTS
 	}
-	if (kapp->authorize("start_screensaver"))
+	if (tdeApp->authorize("start_screensaver"))
 	{
 #endif
 		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
 #ifndef NOSLOTS
 	}
-	if (kapp->authorize("logout"))
+	if (tdeApp->authorize("logout"))
 	{
 #endif
 		DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 7d79d12cf..62319e1fd 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -138,7 +138,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
       m_bNeedSave( false ),
       m_autoAlign( false ),
       m_hasExistingPos( false ),
-      m_bEditableDesktopIcons( kapp->authorize("editable_desktop_icons") ),
+      m_bEditableDesktopIcons( tdeApp->authorize("editable_desktop_icons") ),
       m_bShowDot( false ),
       m_bVertAlign( true ),
       m_dirLister( 0L ),
@@ -379,7 +379,7 @@ void KDIconView::start()
 
     // Start the directory lister !
     m_dirLister->setShowingDotFiles( m_bShowDot );
-    kapp->allowURLAction("list", KURL(), url());
+    tdeApp->allowURLAction("list", KURL(), url());
     startDirLister();
     createActions();
 }
@@ -566,7 +566,7 @@ void KDIconView::startDirLister()
         u.setPath( *it );
         m_mergeDirs.append( u );
         // And start listing this dir right now
-        kapp->allowURLAction("list", KURL(), u);
+        tdeApp->allowURLAction("list", KURL(), u);
         m_dirLister->openURL( u, true );
     }
     configureMedia();
@@ -749,7 +749,7 @@ void KDIconView::slotReturnPressed( TQIconViewItem *item )
 
 void KDIconView::slotExecuted( TQIconViewItem *item )
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
     if (item) {
         visualActivate(item);
@@ -839,7 +839,7 @@ void KDIconView::saveMediaListView()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
     delete g_pConfig;
 }
 
@@ -947,7 +947,7 @@ void KDIconView::slotDelete()
 // Not to be confused with the global popup-menu, KRootWm, when doing RMB on the desktop
 void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items )
 {
-    if (!kapp->authorize("action/kdesktop_rmb")) return;
+    if (!tdeApp->authorize("action/kdesktop_rmb")) return;
     if (!m_dirLister) return;
     if ( _items.count() == 1 )
         m_popupURL = _items.getFirst()->url();
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index 00685c3d9..28d1dbd98 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -86,7 +86,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   // Creates the new menu
   menuBar = 0; // no menubar yet
   menuNew = 0;
-  if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+  if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
   {
      menuNew = new KNewMenu( m_actionCollection, "new_menu" );
      connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
@@ -95,7 +95,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
               m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
   }
 
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
      bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
      // The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
@@ -132,7 +132,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   }
 #endif
 
-  if (kapp->authorize("run_command"))
+  if (tdeApp->authorize("run_command"))
   {
      new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
      new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
@@ -153,7 +153,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
               m_actionCollection, "cascade" );
 
   // arrange menu actions
-  if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+  if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
   {
      new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
                  m_actionCollection, "sort_ncs");
@@ -189,22 +189,22 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
                  m_actionCollection, "refresh" );
   }
   // Icons in sync with kicker
-  if (kapp->authorize("lock_screen"))
+  if (tdeApp->authorize("lock_screen"))
   {
       new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
                   m_actionCollection, "lock" );
   }
-  if (kapp->authorize("logout"))
+  if (tdeApp->authorize("logout"))
   {
       new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
                   this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
   }
 
-  if (kapp->authorize("start_new_session") && DM().isSwitchable())
+  if (tdeApp->authorize("start_new_session") && DM().isSwitchable())
   {
       new TDEAction(i18n("Start New Session"), "fork", 0, this,
                   TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
-      if (kapp->authorize("lock_screen"))
+      if (tdeApp->authorize("lock_screen"))
       {
           new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
                       TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
@@ -249,7 +249,7 @@ void KRootWm::initConfig()
   // Read configuration for icons alignment
   if ( m_bDesktopEnabled ) {
     m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
-    if ( kapp->authorize( "editable_desktop_icons" ) ) {
+    if ( tdeApp->authorize( "editable_desktop_icons" ) ) {
         m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
         TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
         if (aLockIcons)
@@ -464,7 +464,7 @@ void KRootWm::buildMenus()
     }
     int lastSep = desktopMenu->insertSeparator();
 
-    if (sessionsMenu && kapp->authorize("switch_user"))
+    if (sessionsMenu && tdeApp->authorize("switch_user"))
     {
         desktopMenu->insertItem(SmallIconSet("switchuser" ), i18n("Switch User"), sessionsMenu);
         needSeparator = true;
@@ -618,7 +618,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
         activateMenu( middleButtonChoice, _global );
         break;
     case TQt::RightButton:
-        if (!kapp->authorize("action/kdesktop_rmb")) return;
+        if (!tdeApp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;
     default:
@@ -791,7 +791,7 @@ void KRootWm::slotConfigureDesktop() {
     TQStringList modules = configModules();
     for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
     {
-      if (kapp->authorizeControlModule(*it))
+      if (tdeApp->authorizeControlModule(*it))
       {
           m_configDialog->addModule(*it);
       }
@@ -815,22 +815,22 @@ void KRootWm::slotToggleDesktopMenu()
     KDesktopSettings::writeConfig();
 
     TQByteArray data;
-    kapp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
+    tdeApp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
     // for the standalone menubar setting
-    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
-    kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
-    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+    tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    tdeApp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
+    tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 
 void KRootWm::slotUnclutterWindows()
 {
-    kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
 }
 
 
 void KRootWm::slotCascadeWindows() {
-    kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
 }
 
 
@@ -840,7 +840,7 @@ void KRootWm::slotLock() {
 
 
 void KRootWm::slotSave() {
-    kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
+    tdeApp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
 }
 
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 67a55192f..37358f758 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -79,7 +79,7 @@ void KWebDesktopRun::slotFinished( TDEIO::Job * job )
     if (job->error())
     {
         kdDebug() << job->errorString() << endl;
-        kapp->exit(1);
+        tdeApp->exit(1);
     }
 }
 
@@ -141,7 +141,7 @@ void KWebDesktop::slotCompleted()
     TQPixmap snapshot = TQPixmap::grabWidget( m_part->widget() );
     snapshot.save( m_imageFile, "PNG" );
     // And terminate the app.
-    kapp->quit();
+    tdeApp->quit();
 }
 
 KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index c8d82e8d9..d26830e3a 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -244,7 +244,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
 	connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
 
-	if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
+	if (!DM().isSwitchable() || !tdeApp->authorize("switch_user")) {
 		mNewSessButton->hide();
 	}
 
@@ -939,7 +939,7 @@ void PasswordDlg::slotSwitchUser()
 		vbox2->addStretch( 2 );
 	}
 
-	if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
+	if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
 		btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
 		connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
 		connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index 163d76fe6..47db882ef 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -247,7 +247,7 @@ LockProcess::LockProcess()
 	kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
 	kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
 
-	kapp->installX11EventFilter(this);
+	tdeApp->installX11EventFilter(this);
 
 	mForceContinualLockDisplayTimer = new TQTimer( this );
 	mHackDelayStartupTimer = new TQTimer( this );
@@ -413,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
 #endif
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-	connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
+	connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
 	if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -622,7 +622,7 @@ void LockProcess::quitSaver()
 		return;
 	}
 	stopSaver();
-	kapp->quit();
+	tdeApp->quit();
 }
 
 //---------------------------------------------------------------------------
@@ -650,7 +650,7 @@ void LockProcess::startSecureDialog()
 	mInSecureDialog = false;
 	if (ret == 0) {
 		mClosingWindows = 1;
-		kapp->quit();
+		tdeApp->quit();
 	}
 	if (ret == 1) {
 		// In case of a forced lock we don't react to events during
@@ -699,12 +699,12 @@ void LockProcess::startSecureDialog()
 		if (system("ksysguard &") == -1) {
                     // Error handler to shut up gcc warnings
                 }
-		kapp->quit();
+		tdeApp->quit();
 	}
 	if (ret == 3) {
 		mClosingWindows = 1;
 		DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
-		kapp->quit();
+		tdeApp->quit();
 	}
 	// FIXME
 	// Handle remaining case (switch user)
@@ -798,8 +798,8 @@ void LockProcess::readSaver()
 	if (!mSaver.isEmpty()) {
 		TQString file = locate("scrsav", mSaver);
 
-		bool opengl = kapp->authorize("opengl_screensavers");
-		bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
+		bool opengl = tdeApp->authorize("opengl_screensavers");
+		bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers");
 		KDesktopFile config(file, true);
 		if (config.readEntry("X-TDE-Type").utf8() != 0) {
 			TQString saverType = config.readEntry("X-TDE-Type").utf8();
@@ -1799,7 +1799,7 @@ void LockProcess::displayLockDialogIfNeeded()
 					if (checkPass()) {
 						mClosingWindows = true;
 						stopSaver();
-						kapp->quit();
+						tdeApp->quit();
 					}
 				}
 				mBusy = false;
@@ -2207,7 +2207,7 @@ bool LockProcess::x11Event(XEvent *event)
 				}
 				if ((!mLocked) && (!mInSecureDialog)) {
 					stopSaver();
-					kapp->quit();
+					tdeApp->quit();
 				}
 				if (mAutoLogout) {
 					// we need to restart the auto logout countdown
@@ -2219,7 +2219,7 @@ bool LockProcess::x11Event(XEvent *event)
 				if (!mLocked || checkPass()) {
 					mClosingWindows = true;
 					stopSaver();
-					kapp->quit();
+					tdeApp->quit();
 				}
 				else if (mAutoLogout) {
 					// we need to restart the auto logout countdown
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index e121daaa1..57a33bf53 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -333,7 +333,7 @@ void SaverEngine::lockScreen(bool DCOP)
 		if( ok && mState != Saving )
 		{
 			if (DCOP) {
-				DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
+				DCOPClientTransaction* trans = tdeApp->dcopClient()->beginTransaction();
 				if (trans) {
 					mLockTransactions.append( trans );
 				}
@@ -354,7 +354,7 @@ void SaverEngine::processLockTransactions()
 	{
 		TQCString replyType = "void";
 		TQByteArray arr;
-		kapp->dcopClient()->endTransaction( *it, replyType, arr );
+		tdeApp->dcopClient()->endTransaction( *it, replyType, arr );
 	}
 	mLockTransactions.clear();
 }
@@ -447,7 +447,7 @@ void SaverEngine::enableExports()
 {
 #ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
-	DCOPClient *client = kapp->dcopClient();
+	DCOPClient *client = tdeApp->dcopClient();
 	if (!client->isAttached()) {
 		client->attach();
 	}
@@ -675,7 +675,7 @@ void SaverEngine::recoverFromHackingAttempt()
 		TQByteArray data;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << (int)0 << (int)0 << (int)2;
-		if (!kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
+		if (!tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
 			// Someone got to DCOP before we did
 			// Try an emergency system logout
 			system("logout");
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index 1fe29230e..f3e61e2f2 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -94,8 +94,8 @@ static void signalHandler(int sigId)
     // try to cleanup all windows
     signal(SIGTERM, SIG_DFL); // next one kills
     signal(SIGHUP,  SIG_DFL); // next one kills
-    if (kapp)
-        kapp->quit(); // turn catchable signals into clean shutdown
+    if (tdeApp)
+        tdeApp->quit(); // turn catchable signals into clean shutdown
 }
 
 void KDesktop::slotUpAndRunning()
@@ -273,7 +273,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
 
     // Mark kdeskop as immutable if all of its config modules have been disabled
     if (!myApp->config()->isImmutable() &&
-        kapp->authorizeControlModules(KRootWm::configModules()).isEmpty())
+        tdeApp->authorizeControlModules(KRootWm::configModules()).isEmpty())
     {
        myApp->config()->setReadOnly(true);
        myApp->config()->reparseConfiguration();
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index fe4bd2063..15abec3f5 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -101,7 +101,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   // Cancel button...
   m_dlg->pbCancel->setGuiItem ( KStdGuiItem::cancel() );
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
     m_dlg->pbOptions->hide();
 
   m_dlg->pbRun->setEnabled(!m_dlg->cbCommand->currentText().isEmpty());
@@ -317,8 +317,8 @@ void Minicli::accept()
 
   if ( logout )
   {
-     kapp->propagateSessionManager();
-     kapp->requestShutDown();
+     tdeApp->propagateSessionManager();
+     tdeApp->requestShutDown();
   }
   if ( lock )
   {
@@ -326,7 +326,7 @@ void Minicli::accept()
      int kicker_screen_number = tqt_xscreen();
      if ( kicker_screen_number )
          appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+     tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
   }
 }
 
@@ -437,7 +437,7 @@ int Minicli::runCommand()
 
   kdDebug (1207) << "Use terminal ? " << useTerminal << endl;
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
     useTerminal = false;
 
   if( needsTDEsu() )
@@ -585,7 +585,7 @@ int Minicli::runCommand()
         // fall-through to shell case
         case KURIFilterData::SHELL:
         {
-          if (kapp->authorize("shell_access"))
+          if (tdeApp->authorize("shell_access"))
           {
             exec = cmd;
 
@@ -651,7 +651,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
diff --git a/kdesktop/pixmapserver.cpp b/kdesktop/pixmapserver.cpp
index 56224f37a..b60942277 100644
--- a/kdesktop/pixmapserver.cpp
+++ b/kdesktop/pixmapserver.cpp
@@ -39,7 +39,7 @@
 KPixmapServer::KPixmapServer()
     : TQWidget(0L, "shpixmap comm window")
 {
-    kapp->installX11EventFilter(this);
+    tdeApp->installX11EventFilter(this);
     pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
 }
 
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 7d448c089..2aeac904a 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -54,7 +54,7 @@ StartupId::StartupId( TQWidget* parent, const char* name )
         XWindowAttributes attrs;
         XGetWindowAttributes( tqt_xdisplay(), tqt_xrootwin(), &attrs);
         XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
-        kapp->installX11EventFilter( this );
+        tdeApp->installX11EventFilter( this );
         }
     connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
     connect( &startup_info,
@@ -140,7 +140,7 @@ bool StartupId::x11Event( XEvent* e )
 void StartupId::finishKDEStartup()
     {
     kde_startup_status = StartupDone;
-    kapp->removeX11EventFilter( this );
+    tdeApp->removeX11EventFilter( this );
     if( startups.count() == 0 )
         stop_startupid();
     }
diff --git a/kdesktop/xautolock.cpp b/kdesktop/xautolock.cpp
index 3c7e62670..95de8f3d6 100644
--- a/kdesktop/xautolock.cpp
+++ b/kdesktop/xautolock.cpp
@@ -71,7 +71,7 @@ XAutoLock::XAutoLock()
 #endif
     if( !xautolock_useXidle && !xautolock_useMit )
     {
-        kapp->installX11EventFilter( this );
+        tdeApp->installX11EventFilter( this );
         int (*oldHandler)(Display *, XErrorEvent *);
         oldHandler = XSetErrorHandler(catchFalseAlarms);
         XSync(tqt_xdisplay(), False );
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 8b311e482..348314800 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -313,15 +313,15 @@ static int directCommand(TDECmdLineArgs *args)
 						       0, // name
 						       duration );
 	TQTimer *timer = new TQTimer();
-	TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) );
-	TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
+	TQObject::connect( timer, TQ_SIGNAL( timeout() ), tdeApp, TQ_SLOT( quit() ) );
+	TQObject::connect( popup, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
 	timer->start( duration, TRUE );
 
 #ifdef TQ_WS_X11
-	if ( ! kapp->geometryArgument().isEmpty()) {
+	if ( ! tdeApp->geometryArgument().isEmpty()) {
 	    int x, y;
 	    int w, h;
-	    int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
+	    int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	    if ( (m & XNegative) )
 		x = TDEApplication::desktop()->width()  + x - w;
 	    if ( (m & YNegative) )
@@ -329,7 +329,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    popup->setAnchor( TQPoint(x, y) );
 	}
 #endif
-	kapp->exec();
+	tdeApp->exec();
 	return 0;
       }
 
@@ -469,7 +469,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setMode(KFile::File | KFile::LocalOnly);
 	}
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Open") : title);
 	dlg.exec();
 
@@ -510,7 +510,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setSelection( startDir );
 	dlg.setOperationMode( KFileDialog::Saving );
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Save As") : title);
 	dlg.exec();
 
@@ -545,7 +545,7 @@ static int directCommand(TDECmdLineArgs *args)
 	KDirSelectDialog myDialog( startDir, true, 0,
 				   "kdirselect dialog", true );
 
-	kapp->setTopWidget( &myDialog );
+	tdeApp->setTopWidget( &myDialog );
 
 	Widgets::handleXGeometry(&myDialog);
 	if ( !title.isNull() )
@@ -581,7 +581,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setMode(KFile::File);
 	}
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Open") : title);
 	dlg.exec();
 
@@ -649,7 +649,7 @@ static int directCommand(TDECmdLineArgs *args)
             context = TDEIcon::StatusIcon;
 
 	TDEIconDialog dlg(0, "icon dialog");
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setup( group, context);
 	if (!title.isNull())
 	    dlg.setCaption(title);
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index 126eeec22..c0f3921f5 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -42,10 +42,10 @@
 void Widgets::handleXGeometry(TQWidget * dlg)
 {
 #ifdef TQ_WS_X11
-    if ( ! kapp->geometryArgument().isEmpty()) {
+    if ( ! tdeApp->geometryArgument().isEmpty()) {
 	int x, y;
 	int w, h;
-	int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
+	int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	if ( (m & XNegative) )
 	    x = TDEApplication::desktop()->width()  + x - w;
 	if ( (m & YNegative) )
@@ -69,7 +69,7 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin
 {
   KPasswordDialog dlg( KPasswordDialog::Password, false, 0, parent );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption(title);
   dlg.setPrompt(text);
 
@@ -86,7 +86,7 @@ int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& ti
 //  KTextBox dlg(parent, 0, TRUE, width, height, file);
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() );
   edit->setReadOnly(TRUE);
 
@@ -119,7 +119,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin
 //  KTextBox dlg(parent, 0, TRUE, width, height, file);
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   TQVBox* vbox = dlg.makeVBoxMainWidget();
 
   if( args.count() > 0 )
@@ -152,7 +152,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString&
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok|KDialogBase::Cancel,
                    KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption(title);
   TQVBox* vbox = dlg.makeVBoxMainWidget();
 
@@ -177,7 +177,7 @@ bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& t
 {
   TDEListBoxDialog box(text,parent);
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i = 0; i+1<args.count(); i += 2) {
@@ -205,7 +205,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
 
   TQListBox &table = box.getTable();
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
@@ -249,7 +249,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
 
   TQListBox &table = box.getTable();
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
@@ -274,7 +274,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
 bool Widgets::progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps)
 {
   ProgressDialog dlg( parent, title, text, totalSteps );
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption( title );
   handleXGeometry(&dlg);
   dlg.exec();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 9f5871b6c..f3c56956e 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -178,7 +178,7 @@ void KfindWindow::copySelection()
 
   if (drag_obj)
   {
-    TQClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = tdeApp->clipboard();
     cb->setData(drag_obj);
   }
 }
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 44fc2a97d..b9dc76aa3 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -384,7 +384,7 @@ void KQuery::processQuery( KFileItem* file)
                  return;
              }
           }
-          kapp->processEvents();
+          tdeApp->processEvents();
        }
        delete stream;
 
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 7acac556d..821cc0d05 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -148,7 +148,7 @@ void FontDialog::setupFontEncodingBox()
 
 void FontDialog::load()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
 
@@ -178,7 +178,7 @@ void FontDialog::load()
 
 void FontDialog::save()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "General" );
 		cfg->writeEntry( "UseKonqSettings", false );
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 30819d4a0..73d98d113 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -94,7 +94,7 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
 
 	m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
 
-	m_config = kapp->config();
+	m_config = tdeApp->config();
 	m_config->setGroup( "Glossary" );
 
 }
@@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const
 
 void Glossary::rebuildGlossaryCache()
 {
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
 
@@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc )
 	
 	m_status = CacheOk;
 
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 );
 
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 69e6521ae..0b2c67138 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -256,7 +256,7 @@ void History::fillForwardMenu()
 
 void History::fillGoMenu()
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu || m_goMenuIndex == -1 )
     return;
@@ -289,7 +289,7 @@ void History::fillGoMenu()
 
 void History::goMenuActivated( int id )
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu )
     return;
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 72534bc6b..9b2f67abf 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch()
 
 TQString HTMLSearch::dataPath(const TQString& _lang)
 {
-    return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
+    return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
 }
 
 
@@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir)
         if (*it != "." && *it != "..")
         {
             scanDir(dir + *it + "/");
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
 }
 
@@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
 
     // add KDE help dirs
     if (config->readBoolEntry("KDE", true))
-        dirs = kapp->dirs()->findDirs("html", _lang + "/");
+        dirs = tdeApp->dirs()->findDirs("html", _lang + "/");
     kdDebug() << "got " << dirs.count() << " dirs\n";
 
     // TODO: Man and Info!!
@@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // create progress dialog
     progress = new ProgressDialog(parent);
     progress->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // create files list ----------------------------------------------
     if (!saveFilesList(_lang))
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // run htdig ------------------------------------------------------
     TDEConfig *config = new TDEConfig("khelpcenterrc", true);
     TDEConfigGroupSaver saver(config, "htdig");
-    TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+    TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
     {
@@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
         // execute htdig
         _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
 
-        kapp->enter_loop();
+        tdeApp->enter_loop();
 
         if (!_proc->normalExit() || _proc->exitStatus() != 0)
 	{
@@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
         // _filesDigged += CHUNK_SIZE;
         progress->setFilesDigged(_filesDigged);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     progress->setState(2);
 
     // run htmerge -----------------------------------------------------
-    exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"));
+    exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"));
     if (exe.isEmpty())
     {
         delete config;
@@ -347,7 +347,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
     _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-    kapp->enter_loop();
+    tdeApp->enter_loop();
 
     if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
@@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     delete _proc;
 
     progress->setState(3);
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     delete progress;
     delete config;
@@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p)
 {
     kdDebug() << "htdig terminated " << p->exitStatus() << endl;
     _htdigRunning = false;
-    kapp->exit_loop();
+    tdeApp->exit_loop();
 }
 
 
@@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *)
 {
   kdDebug() << "htmerge terminated" << endl;
   _htmergeRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *)
 {
   kdDebug() << "htsearch terminated" << endl;
   _htsearchRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   // run htsearch ----------------------------------------------------
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
   TDEConfigGroupSaver saver(config, "htdig");
-  TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+  TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
       delete config;
@@ -454,7 +454,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
 
   _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-  kapp->enter_loop();
+  tdeApp->enter_loop();
 
   if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index d51496cae..d737f2528 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load()
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
 
   config->setGroup("htdig");
-  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
-  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
-  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")));
+  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")));
+  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
+  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")));
 
   config->setGroup("Scope");
   indexKDE->setChecked(config->readBoolEntry("KDE", true));
@@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save()
 
 void TDEHTMLSearchConfig::defaults()
 {
-  htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
-  htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
-  htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge"));
+  htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig"));
+  htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
+  htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge"));
 
   indexKDE->setChecked(true);
   indexMan->setChecked(false);
@@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults()
 
 void TDEHTMLSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 
@@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex()
 {
   save();
 
-  TQString exe = kapp->dirs()->findExe("tdehtmlindex");
+  TQString exe = tdeApp->dirs()->findExe("tdehtmlindex");
   if (exe.isEmpty())
     return;
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index d7af38c07..d62e9fdb2 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -121,7 +121,7 @@ void HtmlSearchConfig::load( TDEConfig *config )
 {
   config->setGroup("htdig");
 
-  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
+  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
   mIndexerBin->lineEdit()->setText(config->readPathEntry("indexer"));
   mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) );
 }
@@ -137,14 +137,14 @@ void HtmlSearchConfig::save( TDEConfig *config )
 
 void HtmlSearchConfig::defaults()
 {
-    mHtsearchUrl->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
+    mHtsearchUrl->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
     mIndexerBin->lineEdit()->setText("");
     mDbDir->lineEdit()->setText("/opt/www/htdig/db/" );
 }
 
 void HtmlSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 } // End namespace KHC
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 2c71d2bbe..83c2ce5ea 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent )
   m_categoryItem = new NavigatorItem( entry, parent );
   m_categoryItem->setAutoDeleteDocEntry( true );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   cfg->setGroup( "Info pages" );
   TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
   // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 63bea1668..5d03c92eb 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -240,12 +240,12 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
 
   load();
 
-  bool success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  bool success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexProgress()", "kcmhelpcenter",
       "slotIndexProgress()", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
 
-  success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexError(TQString)", "kcmhelpcenter",
       "slotIndexError(TQString)", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index b6b961785..df7a2a3aa 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -143,21 +143,21 @@ void IndexBuilder::sendErrorSignal( const TQString &error )
   TQByteArray params;
   TQDataStream stream( params, IO_WriteOnly );
   stream << error;
-  kapp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
 }
 
 void IndexBuilder::sendProgressSignal()
 {
   kdDebug(1402) << "IndexBuilder::sendProgressSignal()" << endl;
  
-  kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
 }
 
 void IndexBuilder::quit()
 {
   kdDebug(1402) << "IndexBuilder::quit()" << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 0bfc80118..909dbca17 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -130,7 +130,7 @@ MainWindow::MainWindow()
     mSplitter->setSizes(sizes);
     setGeometry(366, 0, 800, 600);
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     {
       TDEConfigGroupSaver groupSaver( cfg, "General" );
       if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
@@ -447,7 +447,7 @@ void MainWindow::updateZoomActions()
   actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 );
   actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "General" );
     cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() );
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 5860e9af7..7568736d6 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -80,7 +80,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
    : TQWidget( parent, name ), mIndexDialog( 0 ),
      mView( view ), mSelected( false )
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("General");
     mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
 
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 80c2e33cb..337aa39d4 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry )
       appItem = new NavigatorAppItem( entry, mListView, mCurrentItem );
     else
       appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup( "General" );
     appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) );
     mCurrentItem = appItem;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 051a99231..2f8a9775f 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -44,7 +44,7 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *
 
 void ScrollKeeperTreeBuilder::loadConfig()
 {
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
     mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false );
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 46ce57304..a99926dfe 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -366,7 +366,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
 
     while (mSearchRunning && mProc->isRunning())
-      kapp->processEvents();
+      tdeApp->processEvents();
 
     if ( !mProc->normalExit() || mProc->exitStatus() != 0 ) {
       kdError() << "Unable to run search program '" << commonSearchProgram
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 49135e0b0..21def32d3 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -62,7 +62,7 @@ View::~View()
 
 void View::copySelectedText()
 {
-  kapp->clipboard()->setText( selectedText() );
+  tdeApp->clipboard()->setText( selectedText() );
 }
 
 bool View::openURL( const KURL &url )
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
 
 void View::slotReload( const KURL &url )
 {
-  const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
+  const_cast<TDEHTMLSettings *>( settings() )->init( tdeApp->config() );
   KParts::URLArgs args = browserExtension()->urlArgs();
   args.reload = true;
   browserExtension()->setURLArgs( args );
diff --git a/khotkeys/TODO b/khotkeys/TODO
index d8e7fd352..00e84a7cc 100644
--- a/khotkeys/TODO
+++ b/khotkeys/TODO
@@ -11,7 +11,7 @@ SOON :
 pri modify gestures vymazat stav
 nektere simple akce by mely mit i conditions (nebo alespon jedno okno)
 QPtrList -> QValueList
-pouzit Q/KApp( nogui ? ) v daemonu ?
+pouzit Q/TDEApp( nogui ? ) v daemonu ?
 class Condition + tab 'Windows' -> 'Conditions'
   - asi rozdelit Command/URL na Command/URL a SwitchToWindow
   - nebo udelat, ze Command_url_action_data ( atd. ) maji jen jednu shortcut a tak, tj. dalsi zjednoduseni UI ?
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 54d25b465..64da17c14 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -78,7 +78,7 @@ void KHotKeysApp::reread_configuration()
 
 void KHotKeysApp::quit()
     {
-    kapp->quit();
+    tdeApp->quit();
     }
 
 } // namespace KHotKeys
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index c78504919..debb08d80 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -39,7 +39,7 @@ TDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
 {
   // Check if khotkeys is already running as a stand alone application.
   // In such case just exit.
-  if (kapp->dcopClient()->isApplicationRegistered("khotkeys"))
+  if (tdeApp->dcopClient()->isApplicationRegistered("khotkeys"))
   {
     kdWarning(1217) << "khotkeys [kded module] is already running as a standalone application. Exiting." << endl;
     return nullptr;
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 406a29e35..0d326b225 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -122,18 +122,18 @@ void Module::save()
     tab_widget->save_current_action_changes();
     settings.actions = _actions_root;
     settings.write_settings();
-    if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
+    if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         // khotkeys running as a standalone application
         TQByteArray data;
         kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
-        kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
+        tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
         }
     else
         {
         TQCString replyType;
         TQByteArray replyData;
-        if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+        if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
               TQByteArray(), replyType, replyData))
             {
             if (replyType == "QCStringList")
@@ -146,7 +146,7 @@ void Module::save()
                     // khotkeys running as a kded service
                     TQByteArray data;
                     kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
-                    kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+                    tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
                     }
                 }
             }
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 80c632d5b..12191ff63 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -189,20 +189,20 @@ KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
 void khotkeys_send_reread_config()
     {
     TQByteArray data;
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    if(kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         // khotkeys running as a standalone application
         TQByteArray data;
         kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
-        kapp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
+        tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
         }
     else
         {
         TQCString replyType;
         TQByteArray replyData;
-        if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+        if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
               TQByteArray(), replyType, replyData))
             {
             if (replyType == "QCStringList")
@@ -215,7 +215,7 @@ void khotkeys_send_reread_config()
                     // khotkeys running as a kded service
                     TQByteArray data;
                     kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
-                    kapp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+                    tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
                     }
                 }
             }
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index d5a1f4859..0b3389fbe 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -34,15 +34,15 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
 
 void WindowSelector::select()
     {
-    kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
-    kapp->installX11EventFilter( this );
+    tdeApp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
+    tdeApp->installX11EventFilter( this );
     }
 
 bool WindowSelector::x11Event( XEvent* e )
     {
     if( e->type != ButtonPress )
         return false;
-    kapp->desktop()->releaseMouse();
+    tdeApp->desktop()->releaseMouse();
     if( e->xbutton.button == Button1 )
         {
         WId window = findRealWindow( e->xbutton.subwindow );
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 180935f27..563a4a5dc 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -124,7 +124,7 @@ void Command_url_action::execute()
     static bool sm_ready = false;
     if( !sm_ready )
         {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         sm_ready = true;
         }
 //    int space_pos = command_url().find( ' ' );
@@ -149,7 +149,7 @@ void Command_url_action::execute()
             }
         case KURIFilterData::EXECUTABLE:
             {
-            if (!kapp->authorize("shell_access"))
+            if (!tdeApp->authorize("shell_access"))
 		return;
             if( !uri.hasArgsAndOptions())
                 {
@@ -167,7 +167,7 @@ void Command_url_action::execute()
             }
         case KURIFilterData::SHELL:
             {
-            if (!kapp->authorize("shell_access"))
+            if (!tdeApp->authorize("shell_access"))
 		return;
             if( !KRun::runCommand(
                 cmd + ( uri.hasArgsAndOptions() ? uri.argsAndOptions() : "" ),
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 5777f9a4f..d38d4f023 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -86,15 +86,15 @@ void Gesture::update_grab()
     if( _enabled && handlers.count() > 0
         && ( exclude == NULL || !exclude->match( Window_data( windows_handler->active_window()))))
         {
-        kapp->removeX11EventFilter( this ); // avoid being installed twice
-        kapp->installX11EventFilter( this );
+        tdeApp->removeX11EventFilter( this ); // avoid being installed twice
+        tdeApp->installX11EventFilter( this );
         // CHECKME at se grabuje jen kdyz je alespon jedno gesto?
         grab_mouse( true );
         }
     else
         {
         grab_mouse( false );
-        kapp->removeX11EventFilter( this );
+        tdeApp->removeX11EventFilter( this );
         }
     }
 
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 19e503ac5..58fd42050 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -57,6 +57,6 @@ int main( int argc, char* argv[] )
         }
     settings.write_settings();
     TQByteArray data;
-    kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
+    tdeApp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
     return 0;
     }
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index c8432f7e8..dab00ba20 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -919,12 +919,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
 
     connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
     connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
 
     reconfigure();    // initialize clock widget
     slotUpdate();
 
-    if (kapp->authorizeTDEAction("kicker_rmb"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         menu = new TDEPopupMenu();
         connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
 
 void ClockApplet::openContextMenu()
 {
-    if (!menu || !kapp->authorizeTDEAction("kicker_rmb"))
+    if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb"))
         return;
 
     menu->exec( TQCursor::pos() );
@@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu()
 
         menu->insertItem(i18n("&Type"), type_menu, 101, 1);
         menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2);
-        if (kapp->authorize("user/root"))
+        if (tdeApp->authorize("user/root"))
         {
             menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4);
         }
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 2b09dac34..5878c0acd 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)
 }
 
 void QuickURL::run() const
-{  kapp->propagateSessionManager();   // is this needed?
+{  tdeApp->propagateSessionManager();   // is this needed?
    if (_service)
       KRun::run(*(_service), KURL::List());
    else
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index f0d6a7e85..770a8431f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -88,19 +88,19 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     lockButton->installEventFilter( this );
     logoutButton->installEventFilter( this );
 
-    if (!kapp->authorize("lock_screen"))
+    if (!tdeApp->authorize("lock_screen"))
        lockButton->hide();
 
-    if (!kapp->authorize("logout"))
+    if (!tdeApp->authorize("logout"))
        logoutButton->hide();
 
     lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
     logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 
-    connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
+    connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
 }
 
 Lockout::~Lockout()
@@ -146,12 +146,12 @@ void Lockout::lock()
     int kicker_screen_number = tqt_xscreen();
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+    tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void Lockout::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void Lockout::mousePressEvent(TQMouseEvent* e)
@@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
 
 bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
         return false;     // Process event normally:
 
     if( e->type() == TQEvent::MouseButtonPress )
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 52e3da93b..d1aae0268 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -89,7 +89,7 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
     setBackgroundOrigin(AncestorOrigin);
     dcopclient.registerAs( "menuapplet", false );
     // toolbarAppearanceChanged(int) is sent when changing macstyle
-    connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
+    connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
         this, TQ_SLOT( readSettings()));
     claimSelection();
     readSettings();
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 25e6e040d..fb805bef5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -141,9 +141,9 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
     connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
     connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
     connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
-    connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
+    connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
 
-    if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
     {
         m_contextMenu = new TQPopupMenu();
         connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
@@ -799,7 +799,7 @@ void KMiniPager::contextMenuActivated(int result)
             return;
 
         case ConfigureDesktops:
-            kapp->startServiceByDesktopName("desktop");
+            tdeApp->startServiceByDesktopName("desktop");
             return;
 
         case RenameDesktop:
@@ -883,7 +883,7 @@ void KMiniPager::slotDesktopNamesChanged()
 
 void KMiniPager::showPager()
 {
-    DCOPClient *dcop=kapp->dcopClient();
+    DCOPClient *dcop=tdeApp->dcopClient();
 
     if (dcop->isApplicationRegistered("kpager"))
     {
@@ -922,7 +922,7 @@ void KMiniPager::showKPager(bool toggleShow)
             pt=mapToGlobal( TQPoint(x(), y()) );
     }
 
-    DCOPClient *dcop=kapp->dcopClient();
+    DCOPClient *dcop=tdeApp->dcopClient();
 
     TQByteArray data;
     TQDataStream arg(data, IO_WriteOnly);
@@ -941,7 +941,7 @@ void KMiniPager::applicationRegistered( const TQCString  & appName )
 {
     if (appName == "kpager")
     {
-        disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+        disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
                     this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         showKPager(false);
     }
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 22f59956d..517f81cfe 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -213,7 +213,7 @@ void KMiniPagerButton::loadBgPixmap()
     if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
         return; // not needed
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
     {
         client->attach();
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 3d1321140..104cd5efe 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command)
     TQString exec;
     bool focusNeeded = false;
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     _filterData->setData( _input->currentText().stripWhiteSpace() );
     TQStringList filters;
@@ -230,7 +230,7 @@ void RunApplet::run_command(const TQString& command)
     }
     else if (cmd == "logout")
 	{
-	    bool shutdown = kapp->requestShutDown();
+	    bool shutdown = tdeApp->requestShutDown();
 	    if( !shutdown )
             {
                 // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index cd1e45795..a9eea202e 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -161,7 +161,7 @@ void SwallowApplet::createApps( SwallowCommandList* list )
 		 TQ_SLOT( embedded(SwallowApp *)));
 	appList->append( app );
 	++it;
-	kapp->processEvents();
+	tdeApp->processEvents();
     }
 
     m_layout->activate();
@@ -287,7 +287,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
 
 	// move window out of sight
 	//	*process << "-geometry";
-	//	*process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
+	//	*process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height());
 
 	connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
 		this, TQ_SLOT(processExited(TDEProcess*)));
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 50781f9cd..8daac0a9f 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -106,9 +106,9 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
 
     twin_module = new KWinModule(this);
 
-    // kApplication notifies us of settings changes. added to support
+    // TDEApplication notifies us of settings changes. added to support
     // disabling of frame effect on mouse hover
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
 
     TQTimer::singleShot(0, this, TQ_SLOT(initialize()));
@@ -682,7 +682,7 @@ void SystemTrayApplet::refreshExpandButton()
     if (orientation() == TQt::Vertical)
         a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
     else
-        a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
+        a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
     
     m_expandButton->setArrowType(a);
 }
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 3c9bbead7..a34db8b73 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -43,7 +43,7 @@ extern "C"
         // FIXME: what about two taskbars? perhaps this should be inserted just once
         TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
         int options = 0;
-        if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+        if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
            options = KPanelApplet::Preferences;
         TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch,
                                                     options, parent, "ktaskbarapplet" );
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 71abc4321..811d029f3 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -634,7 +634,7 @@
 
 2002-05-14 Tuesday 10:31  gioele
 
-	* kapp.h -> tdeapplication.h
+	* tdeApp.h -> tdeapplication.h
 
 2002-04-23 Tuesday 14:02  binner
 
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index a9a5fd68a..bddeeacb2 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -116,7 +116,7 @@ int main( int argc, char **argv )
   KWin::setOnAllDesktops( kasbar->winId(), true );
   kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
 
-  TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+  tdeApp->dcopClient()->registerAs( "kasbar" );
 
   app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
 
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index ff29d4dd3..ad047a887 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;
-//    TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+//    tdeApp->dcopClient()->registerAs( "kasbar" );
 
 //    setBackgroundMode( NoBackground );
     kasbar = new KasTasker( orientation(), this, name );
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 382e42795..47d457d0d 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -66,11 +66,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
     connect(m_container, TQ_SIGNAL(containerCountChanged()),
             TQ_SIGNAL(updateLayout()));
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()",
                       "configure()", false);
 
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
             TQ_SLOT(setBackgroundTheme()));
 
     TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme()));
diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp
index 7e3b3e044..4b6af8ce1 100644
--- a/kicker/kicker/buttons/nontdeappbutton.cpp
+++ b/kicker/kicker/buttons/nontdeappbutton.cpp
@@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
     // since kicker doesn't listen to or use the session manager, we have
     // to make sure that our environment is set up correctly. this is
     // accomlplished by doing:
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     if (term)
     {
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 9b368407e..6b3836d20 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev )
 {
     KURL::List uriList;
     if( KURLDrag::decode( ev, uriList ) && _service ) {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         KRun::run( *_service, uriList );
     }
     PanelButton::dropEvent(ev);
@@ -200,7 +200,7 @@ void ServiceButton::performExec()
     if (!_service) return;
 
     KURL::List uriList;
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KRun::run( *_service, uriList );
 }
 
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index d398b07b0..cc9bfb0c6 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -140,7 +140,7 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev)
 
 void URLButton::dropEvent(TQDropEvent *ev)
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KURL::List execList;
     if(KURLDrag::decode(ev, execList)){
         KURL url( fileItem->url() );
@@ -165,7 +165,7 @@ void URLButton::startDrag()
 
 void URLButton::slotExec()
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     fileItem->run();
 }
 
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index c8f87b02e..6299a6650 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -58,7 +58,7 @@ AppletHandle::AppletHandle(AppletContainer* parent)
     m_dragBar->installEventFilter(this);
     m_layout->addWidget(m_dragBar);
 
-    if (kapp->authorizeTDEAction("kicker_rmb"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         m_menuButton = new AppletHandleButton( this );
         m_menuButton->installEventFilter(this);
@@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
 void AppletHandle::menuButtonPressed()
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 2005935a3..63a0815da 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -139,7 +139,7 @@ void AppletContainer::configure()
 
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeTDEAction("kicker_rmb"))
+        !tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
@@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved()
 
 void AppletContainer::showAppletMenu()
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
@@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable)
     BaseContainer::setImmutable(immutable);
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeTDEAction("kicker_rmb"))
+        !tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index d3a550a07..c35f54606 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -254,7 +254,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 
         case TQt::RightButton:
         {
-            if (!kapp->authorizeTDEAction("kicker_rmb") ||
+            if (!tdeApp->authorizeTDEAction("kicker_rmb") ||
                 isImmutable())
             {
                 break;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index afb786f7f..877f828d9 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig()
 
 void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
@@ -484,7 +484,7 @@ void ExtensionContainer::moveMe()
 
     if (screen < 0)
     {
-        screen = kapp->desktop()->screenNumber(this);
+        screen = tdeApp->desktop()->screenNumber(this);
     }
 
     if (screen < 0)
@@ -1260,7 +1260,7 @@ int ExtensionContainer::arrangeHideButtons()
             _ltHB->setMaximumHeight(maxHeight);
             _ltHB->setMaximumWidth(14);
             _layout->remove(_ltHB);
-            if (kapp->reverseLayout())
+            if (tdeApp->reverseLayout())
             {
                 _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
@@ -1275,7 +1275,7 @@ int ExtensionContainer::arrangeHideButtons()
             _rbHB->setMaximumHeight(maxHeight);
             _rbHB->setMaximumWidth(14);
             _layout->remove(_rbHB);
-            if (kapp->reverseLayout())
+            if (tdeApp->reverseLayout())
             {
                 _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 626973855..d62d5396c 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -104,7 +104,7 @@ ContainerArea::ContainerArea(TDEConfig* _c,
     setBackground();
 
     connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll()));
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
     connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
             TQ_SLOT(immutabilityChanged(bool)));
     connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
@@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
             a = new DesktopButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "WindowListButton")
             a = new WindowListButtonContainer(group, m_opMenu, m_contents);
-        else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks"))
+        else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks"))
             a = new BookmarksButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "ServiceButton")
             a = new ServiceButtonContainer(group, m_opMenu, m_contents);
@@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info)
 
     if (buttonType == "BookmarksButton")
     {
-        if (kapp->authorizeTDEAction("bookmarks"))
+        if (tdeApp->authorizeTDEAction("bookmarks"))
         {
             return addBookmarksButton();
         }
@@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         saveContainerConfig(true);
 
         PanelDrag *dd = new PanelDrag(_moveAC, this);
-        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
+        dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
         grabKeyboard();
         dd->drag();
         releaseKeyboard();
@@ -1640,7 +1640,7 @@ void ContainerArea::moveDragIndicator(int pos)
 void ContainerArea::updateBackground( const TQPixmap& pm )
 {
     TQBrush bgBrush(colorGroup().background(), pm);
-    TQPalette pal = kapp->palette();
+    TQPalette pal = tdeApp->palette();
     pal.setBrush(TQColorGroup::Background, bgBrush);
     setPalette(pal);
 
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index cb20c7a58..14cc96b29 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -111,7 +111,7 @@ void ExtensionManager::initialize()
         m_mainPanel = pm->createExtensionContainer(
                             "childpanelextension.desktop",
                             true,
-                            TQString(kapp->aboutData()->appName()) + "rc",
+                            TQString(tdeApp->aboutData()->appName()) + "rc",
                             "Main Panel");
     }
 
@@ -129,7 +129,7 @@ void ExtensionManager::initialize()
 
     m_mainPanel->readConfig();
     m_mainPanel->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // read extension list
     config->setGroup("General");
@@ -173,7 +173,7 @@ void ExtensionManager::initialize()
             addContainer(e);
             e->readConfig();
             e->show();
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     m_loadingContainers = false;
@@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
         updateMenubar();
 
         m_menubarPanel->show();
-        connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
+        connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
     }
     else if (m_menubarPanel)
     {
@@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
     }
 
     TQRect workArea;
-    if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
+    if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2))
     {
          /* special value for all screens */
          workArea = Kicker::the()->twinModule()->workArea(list);
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index e99f9fed4..f58c6bfa5 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -59,7 +59,7 @@
 
 #include "kicker.moc"
 
-Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
+Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); }
 
 Kicker::Kicker()
     : TDEUniqueApplication(),
@@ -88,7 +88,7 @@ Kicker::Kicker()
     }
 
     // Make kicker immutable if configuration modules have been marked immutable
-    if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
+    if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
     {
         config()->setReadOnly(true);
         config()->reparseConfiguration();
@@ -413,7 +413,7 @@ void Kicker::configDialogFinished()
     if (m_reloadingConfigDialog) {
         TQByteArray data;
         m_reloadingConfigDialog = false;
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
     }
 }
 
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 94ee0acfb..4e4de2f56 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -70,8 +70,8 @@ MenuManager::MenuManager(TQObject *parent)
     else
 	m_kmenu = new KMenuStub(new KMenu);
 
-    kapp->dcopClient()->setNotifications(true);
-    connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+    tdeApp->dcopClient()->setNotifications(true);
+    connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
             this, TQ_SLOT(applicationRemoved(const TQCString&)));
 }
 
@@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text)
     p->text = text;
     p->icon = icon;
     p->idInParentMenu = m_kmenu->insertClientMenu( p );
-    p->createdBy = kapp->dcopClient()->senderId();
+    p->createdBy = tdeApp->dcopClient()->senderId();
     m_kmenu->adjustSize();
     return name;
 }
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index e55f65697..b3160aed5 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
     if ( e->type() == TQEvent::MouseButtonPress )
     {
         TQMouseEvent* me = (TQMouseEvent*) e;
-        if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
+        if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb"))
         {
             Kicker::the()->setInsertionPoint(me->globalPos());
             opMenu()->exec(me->globalPos());
@@ -386,7 +386,7 @@ void PanelExtension::slotBuildOpMenu()
                             this, TQ_SLOT(showProcessManager()));
     _opMnu->insertSeparator();
 
-    if (kapp->authorize("action/help"))
+    if (tdeApp->authorize("action/help"))
     {
         KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
         _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index 78db46495..d11dee27f 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
 
 void LibUnloader::unload( const TQString &libName )
 {
-    (void)new LibUnloader( libName, kapp );
+    (void)new LibUnloader( libName, tdeApp );
 }
 
 void LibUnloader::unload()
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 654114d90..3119d8354 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e)
 //     int screen = xineramaScreen();
 //     if (screen < 0)
 //     {
-//         screen = kapp->desktop()->screenNumber(this);
+//         screen = tdeApp->desktop()->screenNumber(this);
 //     }
 //     TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen);
     if (newSize < PANEL_MINIMUM_HEIGHT)
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 740260d7f..b38ca9fae 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
             insertSeparator();
         }
 
-        TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
+        TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon,
                                                      TDEIcon::Small, 0,
                                                      TDEIcon::DefaultState,
                                                      0, true));
@@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
           insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy()));
     }
 
-    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
+    if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit"))
     {
         if (needSeparator)
         {
@@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
     }
 
     if ((actions & PanelAppletOpMenu::BookmarkEditor) &&
-        kapp->authorizeTDEAction("edit_bookmarks"))
+        tdeApp->authorizeTDEAction("edit_bookmarks"))
     {
         if (needSeparator)
         {
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index a2d7b1e12..7fa213fad 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize()
 
     KURL url;
     url.setPath(path());
-    if (!kapp->authorizeURLAction("list", KURL(), url))
+    if (!tdeApp->authorizeURLAction("list", KURL(), url))
     {
         insertItem(i18n("Not Authorized to Read Folder"));
         return;
@@ -152,7 +152,7 @@ void PanelBrowserMenu::initialize()
        TDEConfig *c = TDEGlobal::config();
        c->setGroup("menus");
        insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager()));
-	if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
+	if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
 	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal()));
     	insertSeparator();
     }
@@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
 
 void PanelBrowserMenu::slotExec(int id)
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     if(!_filemap.contains(id)) return;
 
@@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id)
 
 void PanelBrowserMenu::slotOpenTerminal()
 {
-    TDEConfig * config = kapp->config();
+    TDEConfig * config = tdeApp->config();
     config->setGroup("General");
     TQString term = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index 8a69f0749..72cc6b279 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id)
 	TQByteArray data;
 	TQDataStream dataStream( data, IO_WriteOnly );
 	dataStream << id;
-	kapp->dcopClient()->send( app, obj, "activated(int)", data );
+	tdeApp->dcopClient()->send( app, obj, "activated(int)", data );
     }
 }
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 3107fe17a..3bfd341c4 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -38,11 +38,11 @@ HideButton::HideButton(TQWidget *parent, const char *name)
 {
     setBackgroundOrigin(AncestorOrigin);
 
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
 
-    kapp->addKipcEventMask(KIPC::SettingsChanged);
-    kapp->addKipcEventMask(KIPC::IconChanged);
+    tdeApp->addKipcEventMask(KIPC::SettingsChanged);
+    tdeApp->addKipcEventMask(KIPC::IconChanged);
 
     slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
 }
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 768056473..7048f02c1 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -125,13 +125,13 @@ void PanelKMenu::hideMenu()
     // Try to redraw the area under the menu
     // Qt makes this surprisingly difficult to do in a timely fashion!
     while (isShown() == true)
-        kapp->eventLoop()->processEvents(1000);
+        tdeApp->eventLoop()->processEvents(1000);
     TQTimer *windowtimer = new TQTimer( this );
     connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
     windowtimer->start( 0, TRUE );	// Wait for all window system events to be processed
     while (windowTimerTimedOut == false)
-        kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
+        tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
 
     // HACK
     // The TDE Menu takes an unknown amount of time to disappear, and redrawing
@@ -144,7 +144,7 @@ void PanelKMenu::hideMenu()
     windowTimerTimedOut = false;
     delaytimer->start( 100, TRUE );	// Wait for 100 milliseconds
     while (windowTimerTimedOut == false)
-        kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
+        tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
 }
 
 void PanelKMenu::windowClearTimeout()
@@ -247,9 +247,9 @@ void PanelKMenu::initialize()
     if (loadSidePixmap())
     {
         // in case we've been through here before, let's disconnect
-        disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+        disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
                    this, TQ_SLOT(paletteChanged()));
-        connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+        connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
                 this, TQ_SLOT(paletteChanged()));
     }
     else
@@ -317,7 +317,7 @@ void PanelKMenu::initialize()
     bool need_separator = false;
 
     // insert bookmarks
-    if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks"))
+    if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks"))
     {
         // Need to create a new popup each time, it's deleted by subMenus.clear()
         TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" );
@@ -385,7 +385,7 @@ void PanelKMenu::initialize()
     }
 
     // run command
-    if (kapp->authorize("run_command"))
+    if (tdeApp->authorize("run_command"))
     {
         insertItem(KickerLib::menuIconSet("system-run"),
                    i18n("Run Command..."),
@@ -394,7 +394,7 @@ void PanelKMenu::initialize()
         insertSeparator();
     }
 
-    if (DM().isSwitchable() && kapp->authorize("switch_user"))
+    if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
     {
         sessionsMenu = new TQPopupMenu( this );
         insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
@@ -412,12 +412,12 @@ void PanelKMenu::initialize()
         insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession()));
     }
 
-    if (kapp->authorize("lock_screen"))
+    if (tdeApp->authorize("lock_screen"))
     {
         insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock()));
     }
 
-    if (kapp->authorize("logout"))
+    if (tdeApp->authorize("logout"))
     {
         insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout()));
     }
@@ -477,13 +477,13 @@ void PanelKMenu::slotLock()
     TQByteArray replyData;
     // Block here until lock is complete
     // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages!
-    kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
+    tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
 }
 
 void PanelKMenu::slotLogout()
 {
     hide();
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void PanelKMenu::slotPopulateSessions()
@@ -492,9 +492,9 @@ void PanelKMenu::slotPopulateSessions()
     DM dm;
 
     sessionsMenu->clear();
-    if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+    if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
     {
-        if (kapp->authorize("lock_screen")) {
+        if (tdeApp->authorize("lock_screen")) {
             sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 );
         }
         sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 );
@@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent )
 void PanelKMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
+        tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -558,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock )
 void PanelKMenu::slotSaveSession()
 {
     TQByteArray data;
-    kapp->dcopClient()->send( "ksmserver", "default",
+    tdeApp->dcopClient()->send( "ksmserver", "default",
                               "saveCurrentSession()", data );
 }
 
@@ -569,8 +569,8 @@ void PanelKMenu::slotRunCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
 
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 5bf1d7231..b92440474 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1225,9 +1225,9 @@ void KMenu::initialize()
     kdDebug(1210) << "KMenu::initialize()" << endl;
 
     // in case we've been through here before, let's disconnect
-    disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+    disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
             this, TQ_SLOT(paletteChanged()));
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
             this, TQ_SLOT(paletteChanged()));
 
    /*
@@ -1236,7 +1236,7 @@ void KMenu::initialize()
     TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
     connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
-    m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
+    m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout"));
 
     // load search field history
     TQStringList histList = KickerSettings::history();
@@ -1309,10 +1309,10 @@ void KMenu::insertStaticExitItems()
     int index = 1;
 
     m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ );
-    if (kapp->authorize("logout"))
+    if (tdeApp->authorize("logout"))
        m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ),
                                    i18n( "End current session" ), "kicker:/logout", nId++, index++ );
-    if (kapp->authorize("lock_screen"))
+    if (tdeApp->authorize("lock_screen"))
        m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ),
                                    i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ );
 
@@ -1324,7 +1324,7 @@ void KMenu::insertStaticExitItems()
                                i18n("Save current Session for next login"),
                                "kicker:/savesession", nId++, index++ );
     }
-    if (DM().isSwitchable() && kapp->authorize("switch_user"))
+    if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
     {
         KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
                                                                     i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
@@ -1386,7 +1386,7 @@ void KMenu::insertStaticItems()
     m_systemView->insertMenuItem(p, nId++, index++);
 
     // run command
-    if (kapp->authorize("run_command"))
+    if (tdeApp->authorize("run_command"))
     {
         m_systemView->insertItem( "system-run", i18n("Run Command..."),
                    "", "kicker:/runusercommand", nId++, index++ );
@@ -1479,18 +1479,18 @@ void KMenu::slotLock()
     TQCString appname( "kdesktop" );
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+    tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void KMenu::slotOpenHomepage()
 {
     accept();
-    kapp->invokeBrowser("http://www.trinitydesktop.org");
+    tdeApp->invokeBrowser("http://www.trinitydesktop.org");
 }
 
 void KMenu::slotLogout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void KMenu::slotPopulateSessions()
@@ -1499,9 +1499,9 @@ void KMenu::slotPopulateSessions()
     DM dm;
 
     sessionsMenu->clear();
-    if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+    if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
     {
-        if (kapp->authorize("lock_screen"))
+        if (tdeApp->authorize("lock_screen"))
 	  sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
         sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
         if (!p) {
@@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
 void KMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
+        tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -1583,8 +1583,8 @@ void KMenu::searchAccept()
 
     if ( logout )
     {
-        kapp->propagateSessionManager();
-        kapp->requestShutDown();
+        tdeApp->propagateSessionManager();
+        tdeApp->requestShutDown();
     }
     if ( lock )
     {
@@ -1592,7 +1592,7 @@ void KMenu::searchAccept()
         int kicker_screen_number = tqt_xscreen();
         if ( kicker_screen_number )
             appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-        kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+        tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
     }
 }
 
@@ -1656,7 +1656,7 @@ bool KMenu::runCommand()
       // fall-through to shell case
       case KURIFilterData::SHELL:
       {
-        if (kapp->authorize("shell_access"))
+        if (tdeApp->authorize("shell_access"))
         {
           exec = cmd;
 
@@ -2419,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed)
 #endif
                 )
                 exe = TQString();
-            else if (kapp->authorize("shell_access"))
+            else if (tdeApp->authorize("shell_access"))
             {
                 if( filterData.hasArgsAndOptions() )
                     exe += filterData.argsAndOptions();
@@ -2660,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 0 << -1 << "";
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/runcommand" )
     {
@@ -2675,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 2 << -1 << "";
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/restart" ) {
         TQByteArray params;
         TQDataStream stream(params, IO_WriteOnly);
         stream << 1 << -1 << TQString();
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/suspend_freeze" ) {
         slotSuspend( SuspendType::Freeze );
@@ -2701,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u)
     }
     else if ( u == "kicker:/savesession" ) {
         TQByteArray data;
-        kapp->dcopClient()->send( "ksmserver", "default",
+        tdeApp->dcopClient()->send( "ksmserver", "default",
                 "saveCurrentSession()", data );
     }
     else if ( u == "kicker:/switchuser" ) {
@@ -2722,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 1 << -1 << rebootOptions[u.mid(16).toInt()];
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
 #warning restart entry not supported
 #if 0
@@ -2753,12 +2753,12 @@ void KMenu::slotStartURL(const TQString& u)
                 TQDataStream arg(data, IO_WriteOnly);
                 arg << u.mid(9,22);
 
-                kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
+                tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
             }
             return;
         }
 
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         (void) new KRun( u, parentWidget());
     }
 }
@@ -2837,7 +2837,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
             if (hasEntries)
                 m_popupMenu->insertSeparator();
 
-            if (kapp->authorize("editable_desktop_icons") )
+            if (tdeApp->authorize("editable_desktop_icons") )
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2847,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                   m_popupMenu->insertItem(SmallIconSet("desktop"),
                       i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2857,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                    m_popupMenu->insertItem(SmallIconSet("kicker"),
                       i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
+            if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
             {
                 hasEntries = true;
                 if (kitem->menuPath().endsWith("/"))
@@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                 else
                   m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem);
             }
-            if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
+            if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
             {
                hasEntries = true;
                m_popupMenu->insertItem(SmallIconSet("system-run"),
@@ -2969,10 +2969,10 @@ void KMenu::slotContextMenu(int selected)
 	case AddItemToPanel:
             accept();
 	    if (m_popupService)
-	    	kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
+	    	tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
             else
 #warning FIXME special RecentDocuments/foo.desktop handling
-	    	kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
+	    	tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
 	    accept();
 	    break;
 
@@ -2988,10 +2988,10 @@ void KMenu::slotContextMenu(int selected)
 	case PutIntoRunDialog:
 	    accept();
 	    if (m_popupService)
-	      kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
+	      tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
 	    else
 #warning FIXME special RecentDocuments/foo.desktop handling
-              kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
+              tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
             accept();
 	    break;
 
@@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected)
 	case AddMenuToPanel:
 	    accept();
             ds << "foo" << m_popupPath.menuPath;
-	    kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
+	    tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
 	    break;
 
         case AddToFavorites:
@@ -3243,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
@@ -3569,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service)
     TQDataStream arg(data, IO_WriteOnly);
     arg << service << URLs;
 
-    if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
                       data, replyType, replyData) ) {
         tqWarning( "call to tdelauncher failed.");
         return false;
@@ -3849,7 +3849,7 @@ void KMenu::runUserCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp
index 9ff74535c..d40178dc8 100644
--- a/kicker/kicker/ui/media_watcher.cpp
+++ b/kicker/kicker/ui/media_watcher.cpp
@@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) :
 void MediaWatcher::updateDevices()
 {
     DCOPRef nsd( "kded", "mediamanager" );
-    nsd.setDCOPClient( kapp->dcopClient() );
+    nsd.setDCOPClient( tdeApp->dcopClient() );
     m_devices = nsd.call( "fullList" );
 }
 
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index 7aa839218..a6f3dec5e 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -46,7 +46,7 @@ public:
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
+        tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
@@ -73,7 +73,7 @@ public:
     {
       TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
       size.setHeight(size.height() +
-                     (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
+                     (tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
       return size;
     }
 
diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp
index 9efc1ab5c..4ca117f3f 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.cpp
+++ b/kicker/kicker/ui/quickbrowser_mnu.cpp
@@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize()
     KURL url;
     
     url.setPath(TQDir::homeDirPath());
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"),
                new PanelBrowserMenu(url.path(), this));
                
     url.setPath(TQDir::rootDirPath());
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("folder_red"), i18n("&Root Folder"),
                new PanelBrowserMenu(url.path(), this));
                
     url.setPath(TQDir::rootDirPath() + "etc");
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"),
                new PanelBrowserMenu(url.path(), this));
 }
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index ef2f5c6a1..0cb81b53f 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;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->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 da5deae35..648b7088d 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id)
 
     KSycocaEntry * e = entryMap_[id];
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     KService::Ptr service = static_cast<KService *>(e);
     TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
@@ -596,25 +596,25 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
         switch (contextKSycocaEntry_->sycocaType())
         {
         case KST_KService:
-            if (kapp->authorize("editable_desktop_icons"))
+            if (tdeApp->authorize("editable_desktop_icons"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit"))
+            if (tdeApp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
                     i18n("Edit Item"), EditItem);
             }
-            if (kapp->authorize("run_command"))
+            if (tdeApp->authorize("run_command"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("system-run"),
@@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
             break;
 
         case KST_KServiceGroup:
-            if (kapp->authorize("editable_desktop_icons"))
+            if (tdeApp->authorize("editable_desktop_icons"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Menu to Desktop"), AddMenuToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Menu to Main Panel"), AddMenuToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit"))
+            if (tdeApp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
@@ -691,7 +691,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
             if ( kicker_screen_number )
                 appname.sprintf("kicker-screen-%d", kicker_screen_number);
             service = static_cast<KService *>(contextKSycocaEntry_);
-            kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
+            tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
             break;
         }
 
@@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
             if ( kicker_screen_number )
                 appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
             service = static_cast<KService *>(contextKSycocaEntry_);
-            kapp->updateRemoteUserTimestamp( appname );
-            kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
+            tdeApp->updateRemoteUserTimestamp( appname );
+            tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
             break;
         }
 
@@ -735,7 +735,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
 
             g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
             ds << "foo" << g->relPath();
-            kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
+            tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
             break;
         }
 
diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp
index 4a851df55..73a13749f 100644
--- a/kicker/libkicker/appletinfo.cpp
+++ b/kicker/libkicker/appletinfo.cpp
@@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co
         else
         {
             m_configFile.append("_")
-                        .append(kapp->randomString(20).lower())
+                        .append(tdeApp->randomString(20).lower())
                         .append("_rc");
         }
     }
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index c896c830a..d0aab24de 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -82,7 +82,7 @@ KickerTip::KickerTip(TQWidget * parent)
     hide();
     connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate()));
 //     // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from?
-//     connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
+//     connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
 }
 
 KickerTip::~KickerTip()
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index 8cdc4c664..808c90f80 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -39,13 +39,13 @@ MenuInfo::MenuInfo(const TQString& desktopFile)
     df.setGroup("Desktop Entry");
 
     TQStringList list = df.readListEntry("X-TDE-AuthorizeAction");
-    if (kapp && !list.isEmpty())
+    if (tdeApp && !list.isEmpty())
     {
        for(TQStringList::ConstIterator it = list.begin();
            it != list.end();
            ++it)
        {
-          if (!kapp->authorize((*it).stripWhiteSpace()))
+          if (!tdeApp->authorize((*it).stripWhiteSpace()))
              return;
        }
     }
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 0708d0b5f..688f5604d 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     updateSettings(TDEApplication::SETTINGS_MOUSE);
 
-    kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
+    tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
-    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu()
 
     m_pressedDuringPopup = false;
     KickerTip::enableTipping(false);
-    kapp->syncX();
-    kapp->processEvents();
+    tdeApp->syncX();
+    tdeApp->processEvents();
 
     if (!m_initialized)
     {
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 79fd19915..b6eaf3b79 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+    connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
        TQ_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+    connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
        TQ_SLOT( slotIconChanged( int ) ) );
 
-    kapp->addKipcEventMask( KIPC::SettingsChanged );
-    kapp->addKipcEventMask( KIPC::IconChanged );
+    tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+    tdeApp->addKipcEventMask( KIPC::IconChanged );
 
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index a45bdabb5..3708a9dd1 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos )
 {
   TQString app = mConfigList[ pos ];
 
-  kapp->propagateSessionManager();
+  tdeApp->propagateSessionManager();
 
   KSimpleConfig config(app, true);
   config.setDesktopGroup();
-  if (kapp && config.readEntry("Type") == "Link")
+  if (tdeApp && config.readEntry("Type") == "Link")
   {
-    kapp->invokeBrowser(config.readEntry("URL"));
+    tdeApp->invokeBrowser(config.readEntry("URL"));
   }
   else
   {
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 089a8ac93..a8f16053a 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -167,7 +167,7 @@ void KateSessionMenu::slotExec( int id )
   else if ( id > 2 )
     args << m_sessions[ id-3 ];
 
-  kapp->tdeinitExec("kate", args);
+  tdeApp->tdeinitExec("kate", args);
 }
 
 void KateSessionMenu::reloadSessionsList()
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 321d9ac59..85f85b7bc 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
 {
    TQStringList args;
    args<<"--profile"<<m_profiles[id-1];
-   kapp->tdeinitExec("konqueror", args);
+   tdeApp->tdeinitExec("konqueror", args);
 }
 
 void KonquerorProfilesMenu::reload()
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 2e196186f..17ca9d629 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -91,7 +91,7 @@ void KonsoleMenu::initialize()
     }
     else
     {
-        kapp->iconLoader()->addAppDir("konsole");
+        tdeApp->iconLoader()->addAppDir("konsole");
     }
 
     setInitialized(true);
@@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id)
     }
 
     --id;
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TQStringList args;
     if (static_cast<unsigned int>(id) < sessionList.count())
     {
@@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
     // this is a session, not a bookmark, so execute that instead
    TQStringList args;
    args << "--profile" << m_profiles[id];
-   kapp->tdeinitExec("konsole", args);
+   tdeApp->tdeinitExec("konsole", args);
 }
 
 KURL KonsoleMenu::baseURL() const
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 5440c1ed7..97da9b986 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id)
         return;
     }
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
     TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 90c84ee32..65834db13 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() {
 
 void RecentDocsMenu::slotExec(int id) {
 	if (id >= 0) {
-		kapp->propagateSessionManager();
+		tdeApp->propagateSessionManager();
 		KURL u;
 		u.setPath(_fileList[id]);
 		KDEDesktopMimeType::run(u, true);
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index 3a1b31145..c0ca57d7c 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
     switch (ID)
     {
         case ADD_PRINTER_ID:
-            kapp->tdeinitExec("kaddprinterwizard");
+            tdeApp->tdeinitExec("kaddprinterwizard");
             break;
         case TDEPRINT_SETTINGS_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
             break;
 	case CONFIG_SERVER_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
             KRun::runCommand("tdecmshell tde-printers.desktop");
@@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
             break;
 	case KPRINTER_ID:
-	    kapp->tdeinitExec("kprinter");
+	    tdeApp->tdeinitExec("kprinter");
 	    break;
         default:
             {
                 // start kjobviewer
                 TQStringList args;
                 args << "--show" << "-d" << text(ID).remove('&');
-                kapp->tdeinitExec("kjobviewer", args);
+                tdeApp->tdeinitExec("kjobviewer", args);
             }
             break;
     }
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 3e97cf385..17d1a8b01 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQPainter p(this);
             TQRect r(rect());
             // ew, nasty hack. may result in coredumps due to horrid C-style cast???
-            kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
+            tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
                                       TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
             p.drawPixmap(KDialog::spacingHint(), 1, icon);
             p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
@@ -432,7 +432,7 @@ void TOM::initialize()
     }
     else
     {
-      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
+      connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -484,7 +484,7 @@ void TOM::initialize()
     {
         removeItem(destMenuTitleID);
     }
-    else if (kapp->authorize("run_command"))
+    else if (tdeApp->authorize("run_command"))
     {
         insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
@@ -510,7 +510,7 @@ void TOM::initialize()
     insertTitle(i18n("Special Items"), contextMenuTitleID);
 
     // if we have no destinations, put the run command here
-    if (numDests == 0 && kapp->authorize("run_command"))
+    if (numDests == 0 && tdeApp->authorize("run_command"))
     {
         insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
@@ -817,8 +817,8 @@ void TOM::runCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
 
@@ -826,7 +826,7 @@ void TOM::runTask(int id)
 {
     if (!m_tasks.contains(id)) return;
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 }
@@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id)
 {
     if (id >= 0)
     {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         KURL u;
         u.setPath(m_recentDocURLs[id]);
         KDEDesktopMimeType::run(u, true);
@@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id)
 
 void TOM::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 #include "tom.moc"
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 9c0bdbfb4..ee443523c 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
   , _applet(0)
 {
     // try to attach to DCOP server
-    if (!kapp->dcopClient()->attach()) {
+    if (!tdeApp->dcopClient()->attach()) {
 	kdError() << "Failed to attach to DCOP server." << endl;
         KMessageBox::error(0,
                            i18n("The applet proxy could not be started due to DCOP communication problems."),
@@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
 	exit(0);
     }
 
-    if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) {
+    if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
         KMessageBox::error(0,
                            i18n("The applet proxy could not be started due to DCOP registration problems."),
@@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
 
 AppletProxy::~AppletProxy()
 {
-    kapp->dcopClient()->detach();
+    tdeApp->dcopClient()->detach();
     delete _info;
     delete _applet;
 }
@@ -255,7 +255,7 @@ void AppletProxy::dock(const TQCString& callbackID)
     _callbackID = callbackID;
 
     // try to attach to DCOP server
-    DCOPClient* dcop = kapp->dcopClient();
+    DCOPClient* dcop = tdeApp->dcopClient();
 
     dcop->setNotifications(true);
     connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
@@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
 }
 
 void AppletProxy::slotRequestFocus()
@@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
 }
 
 void AppletProxy::slotApplicationRemoved(const TQCString& appId)
@@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId)
 
     if(appId == appname) {
 	kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
-	kapp->quit();
+	tdeApp->quit();
     }
 }
 
@@ -510,7 +510,7 @@ void AppletProxy::showStandalone()
     _applet->resize( _applet->widthForHeight( 48 ), 48 );
     _applet->setMinimumSize( _applet->size() );
     _applet->setCaption( _info->name() );
-    kapp->setMainWidget( _applet );
+    tdeApp->setMainWidget( _applet );
     _applet->show();
 }
 
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 9a255ab26..1c2a8d2a6 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
   , _extension(0)
 {
     // try to attach to DCOP server
-    if (!kapp->dcopClient()->attach()) {
+    if (!tdeApp->dcopClient()->attach()) {
 	kdError() << "Failed to attach to DCOP server." << endl;
 	exit(0);
     }
 
-    if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) {
+    if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
 	exit(0);
     }
@@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
 
 ExtensionProxy::~ExtensionProxy()
 {
-    kapp->dcopClient()->detach();
+    tdeApp->dcopClient()->detach();
 }
 
 void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile)
@@ -195,7 +195,7 @@ void ExtensionProxy::dock(const TQCString& callbackID)
     _callbackID = callbackID;
 
     // try to attach to DCOP server
-    DCOPClient* dcop = kapp->dcopClient();
+    DCOPClient* dcop = tdeApp->dcopClient();
 
     dcop->setNotifications(true);
     connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
@@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
 }
 
 void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
@@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
 
     if(appId == appname) {
 	kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
-	kapp->quit();
+	tdeApp->quit();
     }
 }
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index ac0133668..d6a7d0f4e 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     blocklayout = false;
 
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
     keys = new TDEGlobalAccel( this );
 #include "taskbarbindings.cpp"
     keys->readSettings();
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index efde7dd2c..32ad5531e 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -161,7 +161,7 @@ void TaskBarContainer::configure()
                 break;
         }
 
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -188,20 +188,20 @@ void TaskBarContainer::preferences()
 {
     TQByteArray data;
 
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME)
     {
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
     }
     else
     {
         TQDataStream args( data, IO_WriteOnly );
         args << configFile;
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
     }
 }
 
@@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
 
     if (windowListButton)
     {
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 5a8464cd5..bbb449a52 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -724,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p)
     if (taskBar->showIcons())
     {
       if (pixmap.isNull() && m_startup)
-          pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
+          pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
 
       if ( !pixmap.isNull() )
       {
@@ -1254,7 +1254,7 @@ void TaskContainer::popupMenu(int action)
     }
     else if (action == m_settingsObject->ShowOperationsMenu)
     {
-        if (!kapp->authorizeTDEAction("twin_rmb"))
+        if (!tdeApp->authorizeTDEAction("twin_rmb"))
         {
             return;
         }
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 43cd3c7e9..3e941315f 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -1459,7 +1459,7 @@ void Task::tileTo(int position)
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
     stream << _win << position;
-    TDEApplication::kApplication()->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params);
+    tdeApp->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params);
 }
 
 Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data,
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index bd8e28317..56a57db7b 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -90,7 +90,7 @@ void KlipperApplet::preferences()
 
 void KlipperApplet::help()
 {
-    kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
+    tdeApp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
 }
 
 void KlipperApplet::about()
@@ -114,7 +114,7 @@ void KlipperAppletWidget::init()
     TQByteArray arg1, arg2;
     TQCString str;
     // call() - wait for finishing
-    kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
+    tdeApp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
     // register ourselves, so if klipper process is started,
     // it will quit immediately (TDEUniqueApplication)
     s_dcop = new DCOPClient;
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index a2f5368a8..852a2ef30 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -78,7 +78,7 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     selection.timestamp_atom = atoms[ 4 ];
     clipboard.timestamp_atom = atoms[ 5 ];
     bool use_polling = true;
-    kapp->installX11EventFilter( this );
+    tdeApp->installX11EventFilter( this );
 #ifdef HAVE_XFIXES
     int dummy;
     if( XFixesQueryExtension( tqt_xdisplay(), &xfixes_event_base, &dummy ))
@@ -108,8 +108,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     
 void ClipboardPoll::initPolling()
 {
-    connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
-    connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
+    connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+    connect( tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
     connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout()));
     timer.start( 1000, false );
     selection.atom = XA_PRIMARY;
@@ -146,7 +146,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
     if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify )
     {
         XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e );
-        if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection())
+        if( ev->selection == XA_PRIMARY && !tdeApp->clipboard()->ownsSelection())
         {
 #ifdef NOISY_KLIPPER_
             kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@@ -154,7 +154,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
             set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( true );
         }
-        else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
+        else if( ev->selection == xa_clipboard && !tdeApp->clipboard()->ownsClipboard())
         {
 #ifdef NOISY_KLIPPER_
             kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@@ -217,13 +217,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
 void ClipboardPoll::timeout()
 {
     KlipperWidget::updateTimestamp();
-    if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
+    if( !tdeApp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "SELECTION CHANGED" << endl;
 #endif
         emit clipboardChanged( true );
     }
-    if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
+    if( !tdeApp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "CLIPBOARD CHANGED" << endl;
 #endif
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 473b3ff53..aaabcc0ff 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -121,7 +121,7 @@ extern bool tqt_qclipboard_bailout_hack;
 
 static void ensureGlobalSyncOff(TDEConfig* config);
 
-// config == kapp->config for process, otherwise applet
+// config == tdeApp->config for process, otherwise applet
 KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     : TQWidget( parent )
     , DCOPObject( "klipper" )
@@ -138,7 +138,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
 
     updateTimestamp(); // read initial X user time
     setBackgroundMode( X11ParentRelative );
-    clip = kapp->clipboard();
+    clip = tdeApp->clipboard();
 
     connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
     m_overflowClearTimer.start( 1000 );
@@ -187,7 +187,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     showTimer = new TQTime();
 
     readProperties(m_config);
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
     poll = new ClipboardPoll( this );
     connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
@@ -235,7 +235,7 @@ KlipperWidget::~KlipperWidget()
     delete showTimer;
     delete hideTimer;
     delete myURLGrabber;
-    if( m_config != kapp->config())
+    if( m_config != tdeApp->config())
         delete m_config;
     tqt_qclipboard_bailout_hack = false;
 }
@@ -616,7 +616,7 @@ void KlipperWidget::slotQuit()
         return;
     config->sync();
 
-    kapp->quit();
+    tdeApp->quit();
 
 }
 
@@ -785,7 +785,7 @@ bool KlipperWidget::blockFetchingNewData()
 //   while the user is doing a selection using the mouse, OOo stops updating the clipboard
 //   contents, so in practice it's like the user has selected only the part which was
 //   selected when Klipper asked first.
-    ButtonState buttonstate = kapp->keyboardMouseState();
+    ButtonState buttonstate = tdeApp->keyboardMouseState();
     if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
         || ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
         m_pendingContentsCheck = true;
@@ -1180,7 +1180,7 @@ TDEAboutData* KlipperWidget::aboutData()
 }
 
 Klipper::Klipper( TQWidget* parent )
-    : KlipperWidget( parent, kapp->config())
+    : KlipperWidget( parent, tdeApp->config())
 {
 }
 
@@ -1192,7 +1192,7 @@ Klipper::Klipper( TQWidget* parent )
 // find newInstance()  (which doesn't do anything in Klipper anyway)
 int Klipper::newInstance()
 {
-    kapp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
+    tdeApp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
     return 0;
 }
 
@@ -1200,8 +1200,8 @@ int Klipper::newInstance()
 // (AKA ugly hack)
 void Klipper::quitProcess()
 {
-    kapp->dcopClient()->detach();
-    kapp->quit();
+    tdeApp->dcopClient()->detach();
+    tdeApp->quit();
 }
 
 static void ensureGlobalSyncOff(TDEConfig* config) {
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 8a924a46f..fa0c103b3 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -127,7 +127,7 @@ protected:
     bool ignoreClipboardChanges() const;
 
     TDEConfig* config() const { return m_config; }
-    bool isApplet() const { return m_config != kapp->config(); }
+    bool isApplet() const { return m_config != tdeApp->config(); }
 
 protected slots:
     void slotPopupMenu();
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 078e38097..9fd003857 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -49,7 +49,7 @@ URLGrabber::URLGrabber( TDEConfig* config )
  : m_config( config )
 {
     if( m_config == NULL )
-        m_config = kapp->config();
+        m_config = tdeApp->config();
     myMenu = 0L;
     myPopupKillTimeout = 8;
     m_stripWhiteSpace = true;
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index e064305e9..5cbdd9aa4 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -171,7 +171,7 @@ void KNetAttach::finished()
 	return;
     }
 
-    kapp->invokeBrowser(url.url());
+    tdeApp->invokeBrowser(url.url());
 
     TQString name = _connectionName->text().stripWhiteSpace();
 
diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp
index 5f3cbd14f..f2b3d4c0d 100644
--- a/konqueror/KonqMainWindowIface.cpp
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -93,7 +93,7 @@ DCOPRef KonqMainWindowIface::currentView()
   if ( !view )
     return DCOPRef();
 
-  return DCOPRef( kapp->dcopClient()->appId(), view->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), view->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::currentPart()
@@ -115,7 +115,7 @@ DCOPRef KonqMainWindowIface::view(int viewNumber)
       ++it;
   if ( it == viewMap.end() )
       return DCOPRef();
-  return DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::part(int viewNumber)
@@ -131,7 +131,7 @@ DCOPRef KonqMainWindowIface::part(int viewNumber)
 
 DCOPRef KonqMainWindowIface::action( const TQCString &name )
 {
-  return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
+  return DCOPRef( tdeApp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
 }
 
 QCStringList KonqMainWindowIface::actions()
diff --git a/konqueror/KonqViewIface.cpp b/konqueror/KonqViewIface.cpp
index 77bfbb61c..12e0fb4a1 100644
--- a/konqueror/KonqViewIface.cpp
+++ b/konqueror/KonqViewIface.cpp
@@ -91,7 +91,7 @@ DCOPRef KonqViewIface::part()
   if ( dcopProperty.type() != TQVariant::CString )
     return res;
 
-  res.setRef( kapp->dcopClient()->appId(), dcopProperty.toCString() );
+  res.setRef( tdeApp->dcopClient()->appId(), dcopProperty.toCString() );
   return res;
 }
 
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp
index db87e39ed..a449a0488 100644
--- a/konqueror/KonquerorIface.cpp
+++ b/konqueror/KonquerorIface.cpp
@@ -60,7 +60,7 @@ DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 
 DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return openBrowserWindow( url );
 }
 
@@ -71,7 +71,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url )
 
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, TQString::null, tempFile );
 }
 
@@ -86,7 +86,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStr
 
 DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindowWithSelection( url, filesToSelect );
 }
 
@@ -106,7 +106,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mi
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype,
     const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, mimetype, tempFile );
 }
 
@@ -123,7 +123,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path );
 }
 
@@ -141,7 +141,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, c
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path, filename );
 }
 
@@ -157,7 +157,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & p
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url );
 }
 
@@ -175,7 +175,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &pa
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
 }
 
@@ -218,7 +218,7 @@ TQValueList<DCOPRef> KonquerorIface::getWindows()
     {
       TQPtrListIterator<KonqMainWindow> it( *mainWindows );
       for (; it.current(); ++it )
-        lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
+        lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
     }
     return lst;
 }
@@ -290,5 +290,5 @@ bool KonquerorIface::processCanBeReused( int screen )
 void KonquerorIface::terminatePreloaded()
 {
     if( KonqMainWindow::isPreloaded())
-        kapp->exit();
+        tdeApp->exit();
 }
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index a18aa3eda..b7605adea 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -111,7 +111,7 @@ TQString KonqAboutPageFactory::launch()
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
   res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.arg( "" );
@@ -196,7 +196,7 @@ TQString KonqAboutPageFactory::intro()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -251,7 +251,7 @@ TQString KonqAboutPageFactory::specs()
 	return res;
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -348,7 +348,7 @@ TQString KonqAboutPageFactory::tips()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -412,7 +412,7 @@ TQString KonqAboutPageFactory::plugins()
     if ( s_plugins_html )
         return *s_plugins_html;
 
-    TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+    TQString res = loadFile( locate( "data", tdeApp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
                   .arg(i18n("Installed Plugins"))
                   .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
                   .arg(i18n("Installed"))
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index 9bf5a746a..50f79fe64 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -454,7 +454,7 @@ bool clientApp::doIt()
   }
   TQCString command = args->arg(0);
 
-  // read ASN env. variable for non-KApp cases
+  // read ASN env. variable for non-TDEApp cases
   startup_id_str = TDEStartupInfo::currentStartupIdEnv().id();
 
   if ( command == "openURL" || command == "newTab" )
@@ -619,7 +619,7 @@ bool clientApp::doIt()
   {
     checkArgumentCount(argc, 1, 1);
     TQByteArray data;
-    kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
     // Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync.
   }
   else if ( command == "configureDesktop" )
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 395da6a5d..052fa341c 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -343,7 +343,7 @@ void ActionsImpl::slotCopy() {
     TQValueList<KBookmark> bookmarks
         = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
     KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
-    kapp->clipboard()->setData(data, TQClipboard::Clipboard);
+    tdeApp->clipboard()->setData(data, TQClipboard::Clipboard);
 }
 
 void ActionsImpl::slotPaste() {
@@ -351,7 +351,7 @@ void ActionsImpl::slotPaste() {
     KEBMacroCommand *mcmd =
         CmdGen::insertMimeSource(
                             i18n("Paste"),
-                            kapp->clipboard()->data(TQClipboard::Clipboard),
+                            tdeApp->clipboard()->data(TQClipboard::Clipboard),
                             ListView::self()->userAddress());
     CmdHistory::self()->didCommand(mcmd);
 }
@@ -442,7 +442,7 @@ void ActionsImpl::slotPrint() {
     (*tstream) << exporter.toString(CurrentMgr::self()->mgr()->root(), true);
     tmpf.close();
 
-    s_appId = kapp->dcopClient()->appId();
+    s_appId = tdeApp->dcopClient()->appId();
     s_objId = s_part->property("dcopObjectId").toString().latin1();
     connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint()));
 
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index 73cbd9ced..d3d8ce432 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,7 +83,7 @@ void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
+        m_updater = new FavIconUpdater(tdeApp, "FavIconUpdater");
         connect(m_updater, TQ_SIGNAL( done(bool) ),
                 this,      TQ_SLOT( slotDone(bool) ) );
     }
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 1355874de..6bb249beb 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -61,7 +61,7 @@ static void continueInWindow(TQString _wname) {
     TQCString wname = _wname.latin1();
     int id = -1;
 
-    QCStringList apps = kapp->dcopClient()->registeredApplications();
+    QCStringList apps = tdeApp->dcopClient()->registeredApplications();
     for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
         TQCString &clientId = *it;
 
@@ -93,7 +93,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     int ret = KMessageBox::warningYesNo(0, 
             i18n("Another instance of %1 is already running, do you really "
                 "want to open another instance or continue work in the same instance?\n"
-                "Please note that, unfortunately, duplicate views are read-only.").arg(kapp->caption()), 
+                "Please note that, unfortunately, duplicate views are read-only.").arg(tdeApp->caption()), 
             i18n("Warning"),
             i18n("Run Another"),     /* yes */
             i18n("Continue in Same") /*  no */);
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index d685e8dee..c37b8f480 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -245,7 +245,7 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ),
+    connect(tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ),
                                TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
@@ -317,7 +317,7 @@ void KEBApp::slotClipboardDataChanged() {
     // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
     if (!m_readOnly) {
         m_canPaste = KBookmarkDrag::canDecode(
-                        kapp->clipboard()->data(TQClipboard::Clipboard));
+                        tdeApp->clipboard()->data(TQClipboard::Clipboard));
         updateActions();
     }
 }
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp
index fa93bca57..3f2c4cce9 100644
--- a/konqueror/konq_actions.cpp
+++ b/konqueror/konq_actions.cpp
@@ -90,7 +90,7 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject*
 
 int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   // Go menu
@@ -242,7 +242,7 @@ void KonqLogoAction::updateIcon(int id)
 
 int KonqLogoAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
 /*
diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index ef65a5412..d7e5870ae 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -131,8 +131,8 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
     setHistoryEditorEnabled( true ); 
     connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) );
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 }
 
 KonqCombo::~KonqCombo()
@@ -157,8 +157,8 @@ void KonqCombo::setURL( const TQString& url )
         m_returnPressed = false;      
         TQByteArray data;
         TQDataStream s( data, IO_WriteOnly );
-        s << url << kapp->dcopClient()->defaultObject();
-        kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+        s << url << tdeApp->dcopClient()->defaultObject();
+        tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                   "addToCombo(TQString,TQCString)", data);
     }
     // important security consideration: always display the beginning
@@ -506,16 +506,16 @@ void KonqCombo::slotCleared()
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
+    s << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
 }
 
 void KonqCombo::slotRemoved( const TQString& item )
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << item << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+    s << item << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                "removeFromCombo(TQString,TQCString)", data);
 }
 
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index 32ca35650..d42e203d8 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
 
     bool hasFocus = m_pParentKonqFrame->isActivePart();
 
-    const TQColorGroup& activeCg = kapp->palette().active();
+    const TQColorGroup& activeCg = tdeApp->palette().active();
     setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
 
     static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp
index 0f582d1a0..f7a9c6c00 100644
--- a/konqueror/konq_main.cpp
+++ b/konqueror/konq_main.cpp
@@ -70,7 +70,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
   KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log");
   KonqMainWindow::s_crashlog_file = crashlog_file.file();
 
-  if ( kapp->isRestored() )
+  if ( tdeApp->isRestored() )
   {
     int n = 1;
     while ( KonqMainWindow::canBeRestored( n ) )
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index d9d726ec6..f1eac5ca8 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -192,7 +192,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   // init history-manager, load history, get completion object
   if ( !s_pCompletion ) {
-    KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" );
+    KonqHistoryManager *mgr = new KonqHistoryManager( tdeApp, "history mgr" );
     s_pCompletion = mgr->completionObject();
 
 
@@ -220,7 +220,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
   connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ),
            this, TQ_SLOT( slotDatabaseChanged() ) );
 
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
 
   //load the xmlui file specified in the profile or the default konqueror.rc
   setXMLFile( xmluiFile );
@@ -347,7 +347,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
   if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) )
   {
     assert( res->inherits( "TDEToolBar" ) );
-    if (!kapp->authorizeTDEAction("bookmarks"))
+    if (!tdeApp->authorizeTDEAction("bookmarks"))
     {
         delete res;
         return 0;
@@ -706,7 +706,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
 bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req )
 {
   // Second argument is referring URL
-  if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
+  if ( !tdeApp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
   {
      TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, _url.prettyURL());
      KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
@@ -1401,7 +1401,7 @@ void KonqMainWindow::slotSendURL()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null,TQString::null,TQString::null,
+  tdeApp->invokeMailer(TQString::null,TQString::null,TQString::null,
                      subject, body);
 }
 
@@ -1441,7 +1441,7 @@ void KonqMainWindow::slotSendFile()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
+  tdeApp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
                      TQString::null, //body
                      TQString::null,
                      urls); // attachments
@@ -2020,7 +2020,7 @@ void KonqMainWindow::slotConfigure()
         for( TQStringList::ConstIterator it = modules.begin();
                 it != end; ++it )
         {
-            if ( kapp->authorizeControlModule( *it ) )
+            if ( tdeApp->authorizeControlModule( *it ) )
             {
                 m_configureDialog->addModule( *it );
             }
@@ -2104,14 +2104,14 @@ void KonqMainWindow::slotRunFinished()
 
   if ( !run->mailtoURL().isEmpty() )
   {
-      kapp->invokeMailer( run->mailtoURL() );
+      tdeApp->invokeMailer( run->mailtoURL() );
   }
 
   if ( run->hasError() ) { // we had an error
       TQByteArray data;
       TQDataStream s( data, IO_WriteOnly );
-      s << run->url().prettyURL() << kapp->dcopClient()->defaultObject();
-      kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+      s << run->url().prettyURL() << tdeApp->dcopClient()->defaultObject();
+      tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
 				"removeFromCombo(TQString,TQCString)", data);
   }
 
@@ -2239,7 +2239,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
     unplugViewModeActions();
     createGUI( 0L );
     KParts::MainWindow::setCaption( "" );
-    KParts::MainWindow::setIcon( kapp->icon());
+    KParts::MainWindow::setIcon( tdeApp->icon());
     return;
   }
 
@@ -3774,7 +3774,7 @@ void KonqMainWindow::comboAction( int action, const TQString& url, const TQCStri
     }
 
     // only one instance should save...
-    if ( combo && objId == kapp->dcopClient()->defaultObject() )
+    if ( combo && objId == tdeApp->dcopClient()->defaultObject() )
       combo->saveItems();
 }
 
@@ -3840,7 +3840,7 @@ void KonqMainWindow::initActions()
   (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
   (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
   (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
-  if (kapp->authorize("shell_access"))
+  if (tdeApp->authorize("shell_access"))
   {
      (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
   }
@@ -3915,7 +3915,7 @@ void KonqMainWindow::initActions()
       "tde-tdehtml_plugins.desktop" << "tde-kcmkonqyperformance.desktop";
 
 
-  if (!kapp->authorizeControlModules(configModules()).isEmpty())
+  if (!tdeApp->authorizeControlModules(configModules()).isEmpty())
      KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() );
 
   KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
@@ -4557,7 +4557,7 @@ void KonqMainWindow::setCaption( const TQString &caption )
   {
     kdDebug(1202) << "KonqMainWindow::setCaption(" << caption << ")" << endl;
 
-    // Keep an unmodified copy of the caption (before kapp->makeStdCaption is applied)
+    // Keep an unmodified copy of the caption (before tdeApp->makeStdCaption is applied)
     m_currentView->setCaption( caption );
     KParts::MainWindow::setCaption( m_currentView->caption() );
   }
@@ -5050,7 +5050,7 @@ void KonqMainWindow::updateOpenWithActions()
 
   m_openWithActions.clear();
 
-  if (!kapp->authorizeTDEAction("openwith"))
+  if (!tdeApp->authorizeTDEAction("openwith"))
      return;
 
   const TDETrader::OfferList & services = m_currentView->appServiceOffers();
@@ -5309,7 +5309,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
   kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl;
   // This breaks session management (the window is withdrawn in twin)
   // so let's do this only when closed by the user.
-  if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() )
+  if ( static_cast<KonquerorApplication *>(tdeApp)->closedByUser() )
   {
     if ( viewManager()->docContainer() && viewManager()->docContainer()->frameType()=="Tabs" )
     {
@@ -5401,7 +5401,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
           TQApplication::sendEvent( (*it)->part()->widget(), e );
   }
   KParts::MainWindow::closeEvent( e );
-  if( isPreloaded() && !kapp->sessionSaving())
+  if( isPreloaded() && !tdeApp->sessionSaving())
   { // queryExit() refused closing, hide instead
       hide();
   }
@@ -5410,7 +5410,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
 
 bool KonqMainWindow::queryExit()
 {
-    if( kapp->sessionSaving()) // *sigh*
+    if( tdeApp->sessionSaving()) // *sigh*
         return true;
     return !stayPreloaded();
 }
@@ -5812,14 +5812,14 @@ void KonqMainWindow::setPreloadedFlag( bool preloaded )
     s_preloaded = preloaded;
     if( s_preloaded )
     {
-        kapp->disableSessionManagement(); // dont restore preloaded konqy's
+        tdeApp->disableSessionManagement(); // dont restore preloaded konqy's
         return; // was registered before calling this
     }
     delete s_preloadedWindow; // preloaded state was abandoned without reusing the window
     s_preloadedWindow = NULL;
-    kapp->enableSessionManagement(); // enable SM again
+    tdeApp->enableSessionManagement(); // enable SM again
     DCOPRef ref( "kded", "konqy_preloader" );
-    ref.send( "unregisterPreloadedKonqy", kapp->dcopClient()->appId());
+    ref.send( "unregisterPreloadedKonqy", tdeApp->dcopClient()->appId());
 }
 
 void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
@@ -5863,7 +5863,7 @@ void KonqMainWindow::resetWindow()
 // Qt remembers the iconic state if the window was withdrawn while on another virtual desktop
     clearWState( WState_Minimized );
     ignoreInitialGeometry();
-    kapp->setTopWidget( this ); // set again the default window icon
+    tdeApp->setTopWidget( this ); // set again the default window icon
 }
 
 bool KonqMainWindow::event( TQEvent* e )
@@ -5901,12 +5901,12 @@ bool KonqMainWindow::stayPreloaded()
         return false;
     DCOPRef ref( "kded", "konqy_preloader" );
     if( !ref.callExt( "registerPreloadedKonqy", DCOPRef::NoEventLoop, 5000,
-        kapp->dcopClient()->appId(), tqt_xscreen()))
+        tdeApp->dcopClient()->appId(), tqt_xscreen()))
     {
         return false;
     }
     KonqMainWindow::setPreloadedFlag( true );
-    kdDebug(1202) << "Konqy kept for preloading :" << kapp->dcopClient()->appId() << endl;
+    kdDebug(1202) << "Konqy kept for preloading :" << tdeApp->dcopClient()->appId() << endl;
     KonqMainWindow::setPreloadedWindow( this );
     return true;
 }
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 281407cf8..d95cada6b 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -474,7 +474,7 @@ protected slots:
   // Connected to KSycoca
   void slotDatabaseChanged();
 
-  // Connected to KApp
+  // Connected to TDEApp
   void slotReconfigure();
 
   void slotForceSaveMainWindowSettings();
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index 1fbea747e..52f5e2857 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -129,7 +129,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path,
   else if( KonqMainWindow::isPreloaded() && KonqMainWindow::preloadedWindow() != NULL )
   {
       mainWindow = KonqMainWindow::preloadedWindow();
-      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), kapp->startupId());
+      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), tdeApp->startupId());
       KonqMainWindow::setPreloadedWindow( NULL );
       KonqMainWindow::setPreloadedFlag( false );
       mainWindow->resetWindow();
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index c7ead1d0b..810d67376 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -1704,7 +1704,7 @@ void KonqViewManager::profileListDirty( bool broadcast )
     return;
   }
 
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
 }
 
 void KonqViewManager::slotProfileActivated( int id )
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 94322e267..efc655a40 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -63,11 +63,11 @@ void TDEHTMLPluginKTTSD::slotReadOut()
     else
     {
         // If KTTSD not running, start it.
-        DCOPClient *client = kapp->dcopClient();
+        DCOPClient *client = tdeApp->dcopClient();
         if (!client->isApplicationRegistered("kttsd"))
         {
             TQString error;
-            if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+            if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error))
                 TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error );
         }
 
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index 5c31c5cea..81e9af735 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -49,7 +49,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="FileNameColumnWidth" type="Int">
-      <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
+      <default code="true">25 * tdeApp->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
       <whatsthis></whatsthis>
     </entry>
diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp
index fcfa4b4d0..4b9e375d7 100644
--- a/konqueror/preloader/preloader.cpp
+++ b/konqueror/preloader/preloader.cpp
@@ -30,7 +30,7 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj )
     : KDEDModule( obj )
     {
     reconfigure();
-    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
         TQ_SLOT( appRemoved( const TQCString& )));
     connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
 	TQ_SLOT( checkAlwaysPreloaded()));
@@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
 	{
 	if( !check_always_preloaded_timer.isActive())
 	    {
-	    if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
+	    if( tdeApp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
 		TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
 		{
 		kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index fc79c711a..6245c2bd9 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -30,7 +30,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
 	                          const TQStringList & )
     : KParts::Plugin( parent, name )
 {
-    if (!kapp->authorize("shell_access"))
+    if (!tdeApp->authorize("shell_access"))
        return;
 
     new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this,
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 51f09e793..955927558 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -852,7 +852,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 
 bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
 		{
 			KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
@@ -901,7 +901,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 
 void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
 			m_menu->exec(TQCursor::pos());
 		}
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index fa4b2b4f6..5e9b29236 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
     else
 	return;
 
-    DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), tree()->topLevelWidget()->name());
 
     if (bookmark.isGroup()) {
         KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
 
     if ( !bookmark.isGroup() )
     {
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Selection );
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Clipboard );
     }
 }
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index eb1621ae9..951dce28b 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -98,7 +98,7 @@ void KonqSidebarHistorySettings::applySettings()
     delete config;
 
     // notify konqueror instances about the new configuration
-    kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
 			      "notifySettingsChanged()", TQByteArray() );
 }
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 188da9d93..056d0deb7 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -155,13 +155,13 @@ void HistorySidebarConfig::save()
     TQByteArray dataAge;
     TQDataStream streamAge( dataAge, IO_WriteOnly );
     streamAge << age << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
 
     TQByteArray dataCount;
     TQDataStream streamCount( dataCount, IO_WriteOnly );
     streamCount << count << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
 
     m_settings->m_valueYoungerThan = dialog->spinNewer->value();
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 147f3135b..dad6fd7bd 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -883,7 +883,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
 bool KonqSidebarTree::tabSupport()
 {
     // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
-   DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+   DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     DCOPReply reply = ref.call("functions()");
     if (reply.isValid()) {
         QCStringList funcs;
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
 void KonqSidebarTree::slotOpenTab()
 {
     if (!m_currentTopLevelItem) return;
-    DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
 }
 
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
 {
     if (!m_currentTopLevelItem) return;
     KURL url = m_currentTopLevelItem->externalURL();
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
 }
 
 ///////////////////////////////////////////////////////////////////
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index c327c9fcf..45775f2e1 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -331,7 +331,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 
   if (isRestored) {
     n_tabbar = wanted_tabbar;
-    TDEConfig *c = TDEApplication::kApplication()->sessionConfig();
+    TDEConfig *c = tdeApp->sessionConfig();
 //    c->setDesktopGroup();      // Reads from wrong group
     b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false);
   }
@@ -359,9 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
     if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
   }
 
-//  connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
+//  connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
 
-  kapp->dcopClient()->setDefaultObject( "konsole" );
+  tdeApp->dcopClient()->setDefaultObject( "konsole" );
 }
 
 
@@ -506,7 +506,7 @@ void Konsole::makeGUI()
    TDEActionCollection* actions = actionCollection();
 
    // Send Signal Menu -------------------------------------------------------------
-   if (kapp->authorizeTDEAction("send_signal"))
+   if (tdeApp->authorizeTDEAction("send_signal"))
    {
       m_signals = new TDEPopupMenu(this);
       m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
@@ -668,11 +668,11 @@ void Konsole::makeGUI()
       selectSetEncoding->setCurrentItem (0);
       selectSetEncoding->plug(m_options);
 
-      if (kapp->authorizeTDEAction("keyboard"))
+      if (tdeApp->authorizeTDEAction("keyboard"))
          m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
 
       // Schema
-      if (kapp->authorizeTDEAction("schema"))
+      if (tdeApp->authorizeTDEAction("schema"))
          m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
 
       // Select size
@@ -960,7 +960,7 @@ void Konsole::makeTabWidget()
   connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)),
                      TQ_SLOT(slotTabbarContextMenu(const TQPoint &)));
 
-  if (kapp->authorize("shell_access")) {
+  if (tdeApp->authorize("shell_access")) {
     connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession()));
 
     m_newSessionButton = new TQToolButton( tabwidget );
@@ -1016,7 +1016,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
 
 void Konsole::makeBasicGUI()
 {
-  if (kapp->authorize("shell_access")) {
+  if (tdeApp->authorize("shell_access")) {
     m_tabbarSessionsCommands = new TDEPopupMenu( this );
     TDEAcceleratorManager::manage( m_tabbarSessionsCommands );
     connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int)));
@@ -1028,7 +1028,7 @@ void Konsole::makeBasicGUI()
   TDEAcceleratorManager::manage( m_edit );
   m_view = new TDEPopupMenu(this);
   TDEAcceleratorManager::manage( m_view );
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
     bookmarkHandler = new KonsoleBookmarkHandler( this, true );
     m_bookmarks = bookmarkHandler->menu();
@@ -1036,20 +1036,20 @@ void Konsole::makeBasicGUI()
     bookmarks_menu_check();
   }
 
-  if (kapp->authorizeTDEAction("settings")) {
+  if (tdeApp->authorizeTDEAction("settings")) {
      m_options = new TDEPopupMenu(this);
      TDEAcceleratorManager::manage( m_options );
   }
 
-  if (kapp->authorizeTDEAction("help"))
+  if (tdeApp->authorizeTDEAction("help"))
      m_help = helpMenu(0, false);
 
-  if (kapp->authorizeTDEAction("konsole_rmb")) {
+  if (tdeApp->authorizeTDEAction("konsole_rmb")) {
      m_rightButton = new TDEPopupMenu(this);
      TDEAcceleratorManager::manage( m_rightButton );
   }
 
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
     // Bookmarks that open new sessions.
     bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false );
@@ -1133,7 +1133,7 @@ void Konsole::makeBasicGUI()
   m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this,
                                 TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
 
-  if (kapp->authorizeTDEAction("zmodem_upload"))
+  if (tdeApp->authorizeTDEAction("zmodem_upload"))
     m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
                                   TQt::CTRL+TQt::ALT+TQt::Key_U, this,
                                   TQ_SLOT( slotZModemUpload() ),
@@ -1239,7 +1239,7 @@ void Konsole::activateMenu()
  */
 bool Konsole::queryClose()
 {
-   if(kapp->sessionSaving())
+   if(tdeApp->sessionSaving())
      // saving session - do not even think about doing any kind of cleanup here
        return true;
 
@@ -3394,7 +3394,7 @@ void Konsole::buildSessionMenus()
 
    createSessionMenus();
 
-   if (kapp->authorizeTDEAction("file_print"))
+   if (tdeApp->authorizeTDEAction("file_print"))
    {
       m_session->insertSeparator();
       m_print->plug(m_session);
@@ -3494,7 +3494,7 @@ void Konsole::loadSessionCommands()
   cmd_serial = 99;
   cmd_first_screen = -1;
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
      return;
 
   addSessionCommand(TQString::null);
@@ -3583,7 +3583,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
 
 void Konsole::loadScreenSessions()
 {
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
      return;
   TQCString screenDir = getenv("SCREENDIR");
   if (screenDir.isEmpty())
@@ -4230,7 +4230,7 @@ void Konsole::slotZModemUpload()
 
 void Konsole::slotZModemDetected(TESession *session)
 {
-  if (!kapp->authorize("zmodem_download")) return;
+  if (!tdeApp->authorize("zmodem_download")) return;
 
   if(se != session)
     activateSession(session);
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index be904d31b..ca275d40b 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -325,14 +325,14 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd)
 
 void konsolePart::makeGUI()
 {
-  if (!kapp->authorizeTDEAction("konsole_rmb"))
+  if (!tdeApp->authorizeTDEAction("konsole_rmb"))
      return;
 
   actions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
   settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
 
   // Send Signal Menu -------------------------------------------------------------
-  if (kapp->authorizeTDEAction("send_signal"))
+  if (tdeApp->authorizeTDEAction("send_signal"))
   {
      m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget);
      m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
@@ -347,7 +347,7 @@ void konsolePart::makeGUI()
   }
 
   // Settings Menu ----------------------------------------------------------------
-  if (kapp->authorizeTDEAction("settings"))
+  if (tdeApp->authorizeTDEAction("settings"))
   {
      m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget);
 
@@ -388,7 +388,7 @@ void konsolePart::makeGUI()
       selectSetEncoding->plug(m_options);
 
      // Keyboard Options Menu ---------------------------------------------------
-     if (kapp->authorizeTDEAction("keyboard"))
+     if (tdeApp->authorizeTDEAction("keyboard"))
      {
         m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_keytab->setCheckable(true);
@@ -397,7 +397,7 @@ void konsolePart::makeGUI()
      }
 
      // Schema Options Menu -----------------------------------------------------
-     if (kapp->authorizeTDEAction("schema"))
+     if (tdeApp->authorizeTDEAction("schema"))
      {
         m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_schema->setCheckable(true);
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 16f8afb63..1b9f70c3c 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -55,7 +55,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
         m_file = locateLocal( "data", "konsole/bookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false);
-    manager->setEditorOptions(kapp->caption(), false);
+    manager->setEditorOptions(tdeApp->caption(), false);
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
     
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 9e5cca6de..282720278 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -289,7 +289,7 @@ extern "C" int TDE_EXPORT kdemain(int argc, char* argv[])
        eargs.append( args->arg(i) );
 
      if (title.isEmpty() &&
-         (kapp->caption() == kapp->aboutData()->programName()))
+         (tdeApp->caption() == tdeApp->aboutData()->programName()))
      {
         title = TQFile::decodeName(shell);  // program executed in the title bar
      }
@@ -413,7 +413,7 @@ extern "C" int TDE_EXPORT kdemain(int argc, char* argv[])
     }
   }
 
-  if (!kapp->authorizeTDEAction("size"))
+  if (!tdeApp->authorizeTDEAction("size"))
     fixed_size = true;
 
   // ///////////////////////////////////////////////
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 8778a1ee9..2f52dc6a7 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().text();
+        m_table[fi].color       = tdeApp->palette().active().text();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }
@@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().base();
+        m_table[fi].color       = tdeApp->palette().active().base();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index b66f4eddf..4bb930266 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -181,7 +181,7 @@ void TESession::run()
     return;
   }
 
-  TQString appId=kapp->dcopClient()->appId();
+  TQString appId=tdeApp->dcopClient()->appId();
 
   TQString cwd_save = TQDir::currentDirPath();
   if (!initial_cwd.isEmpty())
diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp
index 7b178c846..0fffd7538 100644
--- a/konsole/terminalhere/terminalhere.cpp
+++ b/konsole/terminalhere/terminalhere.cpp
@@ -32,7 +32,7 @@ TerminalHere::TerminalHere() : TDEApplication()
 {
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("General");
 	TQString term = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 29d0470a0..5be814af7 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration()
 
 void KPagerConfigDialog::initConfiguration(void)
 {
-  TDEConfig *cfg= kapp->config();
+  TDEConfig *cfg= tdeApp->config();
   cfg->setGroup("KPager");
 
   m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode);
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index c731f5353..1e22ceb5f 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -160,16 +160,16 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp
 void Desktop::convertRectS2P(TQRect &r)
 {
     TQRect tmp(r);
-    r.setRect(deskX()+tmp.x()*deskWidth()/kapp->desktop()->width(),
-	      deskY()+tmp.y()*deskHeight()/kapp->desktop()->height(),
-	      tmp.width()*deskWidth()/kapp->desktop()->width(),
-	      tmp.height()*deskHeight()/kapp->desktop()->height());
+    r.setRect(deskX()+tmp.x()*deskWidth()/tdeApp->desktop()->width(),
+	      deskY()+tmp.y()*deskHeight()/tdeApp->desktop()->height(),
+	      tmp.width()*deskWidth()/tdeApp->desktop()->width(),
+	      tmp.height()*deskHeight()/tdeApp->desktop()->height());
 }
 
 void Desktop::convertCoordP2S(int &x, int &y)
 {
-    x=(x-deskX())*(kapp->desktop()->width())/deskWidth();
-    y=(y-deskY())*(kapp->desktop()->height())/deskHeight();
+    x=(x-deskX())*(tdeApp->desktop()->width())/deskWidth();
+    y=(y-deskY())*(tdeApp->desktop()->height())/deskHeight();
 }
 
 TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height)
@@ -201,7 +201,7 @@ void Desktop::loadBgPixmap(void)
   bool retval;
 
 //  if (!m_bgDirty) return;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isAttached())
       client->attach();
   TQByteArray data, data2, replyData;
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 68f73982a..3d6804974 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
     m_pPager = new KPager(this, 0);
     setCentralWidget(m_pPager);
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup("KPager");
 
     // Update the last used geometry
@@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
 //	  rect.pos.y+rect.size.height-m_pPager->height());
 // antonio:The above lines don't work. I should look at them when I have
 // more time
-        move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25);
+        move(tdeApp->desktop()->width()-m_pPager->sizeHint().width()-5,tdeApp->desktop()->height()-m_pPager->sizeHint().height()-25);
     }
 
     // Set the wm flags to this window
@@ -158,9 +158,9 @@ void KPagerMainWindow::showAt(int x, int y)
   // Just in case we lost the sticky bit... (as when a window is hidden)
   KWin::setOnAllDesktops( winId(), true);
   
-  if (x>kapp->desktop()->width()/2) // Right
+  if (x>tdeApp->desktop()->width()/2) // Right
     x-=m_pPager->width()+5;
-  if (y>kapp->desktop()->height()/2) // Bottom
+  if (y>tdeApp->desktop()->height()/2) // Bottom
     y-=m_pPager->height()+25;
   move(x,y);
   show();
@@ -195,7 +195,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
 
     KPagerConfigDialog::initConfiguration();
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup("KPager");
     m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false);
 
@@ -224,7 +224,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
              TQ_SLOT( slotNumberOfDesktopsChanged(int) ) );
     connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)),
              TQ_SLOT( slotCurrentDesktopChanged(int) ) );
-    connect(kapp, TQ_SIGNAL(backgroundChanged(int)),
+    connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)),
             TQ_SLOT(slotBackgroundChanged(int)));
 
     TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
@@ -232,7 +232,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
     setFont(defFont);
 
     m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection());
-    m_quit_action = KStdAction::quit(kapp, TQ_SLOT(quit()), parent->actionCollection());
+    m_quit_action = KStdAction::quit(tdeApp, TQ_SLOT(quit()), parent->actionCollection());
 
     updateLayout();
 }
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index e56e05ff5..66d56cc73 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -163,18 +163,18 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 		TQByteArray data, da;
 		TQDataStream stream( data, IO_WriteOnly );
 		stream << comboLang->current();
-		if ( !kapp->dcopClient()->isAttached() )
-			kapp->dcopClient()->attach();
+		if ( !tdeApp->dcopClient()->isAttached() )
+			tdeApp->dcopClient()->attach();
 		// tdesycoca needs to be rebuilt
 		TDEProcess proc;
 		proc << TQString::fromLatin1("tdebuildsycoca");
 		proc.start(TDEProcess::DontCare);
 		kdDebug() << "TDELocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
-		kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
+		tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
 		// call, not send, so that we know it's done before coming back
 		// (we both access kdeglobals...)
-		kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
+		tdeApp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
 	}
 	// KPersonalizer::next() probably waits for a return-value
 	return true;
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 9c1fb7765..b0c9e8767 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -416,7 +416,7 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){
 	else
 		stream << panelsize;
 
-	kapp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
+	tdeApp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
 }
 
 /** No descriptions */
@@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){
 	kdesktopconf->sync();
 	TDEGlobal::config()->sync();
 	// restart twin  for window effects
-	kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	// set the display options (style effects)
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
 	TQApplication::syncX();
 	// kicker stuff: Iconzooming etc.
-	kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
 	// Icon stuff
 	for (int i=0; i<TDEIcon::LastGroup; i++) {
 		KIPC::sendMessageAll(KIPC::IconChanged, i);
@@ -637,10 +637,10 @@ void KEyeCandyPage::save(bool currSettings){
 	// font stuff
 	KIPC::sendMessageAll(KIPC::FontChanged);
 	// unfortunately, the konqiconview does not re-read the configuration to restructure the previews and the background picture
-	kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
+	tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
 }
 
 void KEyeCandyPage::slotEyeCandyShowDetails(bool details){
@@ -677,7 +677,7 @@ void KEyeCandyPage::getUserDefaults(){
 	TQByteArray replydata;
 	TQByteArray data;
 	TQCString replytype;
-	kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
+	tdeApp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
 	TQDataStream stream( replydata, IO_ReadOnly );
 	stream >> panelsize;
 
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 017b95fe7..bd7f1a7c2 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -90,14 +90,14 @@ void KOSPage::save(bool currSettings){
 	TQApplication::syncX();
 	// enable/disable the mac menu, call dcop
 	// Tell kdesktop about the new config file
-	kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
+	tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
 	///////////////////////////////////////////
 	/// restart twin  for window effects
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	///////////////////////////////////////////
 	
 	// Make the kaccess daemon read the changed config file
-	kapp->startServiceByDesktopName("kaccess");
+	tdeApp->startServiceByDesktopName("kaccess");
 }
 
 
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index cef8619ea..d30b163a2 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -57,11 +57,11 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
 	: KWizard(parent, name, true) {
 
 	// first, reset the startup from true (see desktop file in share/autostart) to false
-	setCaption(kapp->caption());
-	kapp->config()->setGroup("General");
+	setCaption(tdeApp->caption());
+	tdeApp->config()->setGroup("General");
 	os_dirty = eye_dirty = style_dirty=false;
-	kapp->config()->writeEntry("FirstLogin", false);
-	kapp->config()->sync();
+	tdeApp->config()->writeEntry("FirstLogin", false);
+	tdeApp->config()->sync();
 
 	countrypage= new KCountryPage(this);
 	addPage( countrypage, i18n( "Step 1: Introduction" ) );
diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp
index e03c19038..7c83315c1 100644
--- a/kpersonalizer/main.cpp
+++ b/kpersonalizer/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 	TDELocale::setMainCatalogue("kpersonalizer");
 
 	TDEApplication a;
-	if ( !kapp->dcopClient()->isAttached() )
-		kapp->dcopClient()->attach();
+	if ( !tdeApp->dcopClient()->isAttached() )
+		tdeApp->dcopClient()->attach();
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 2fd4a8419..f82525617 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -522,9 +522,9 @@ void TDEStylePage::liveUpdate() {
 	// color palette changes
 	KIPC::sendMessageAll(KIPC::PaletteChanged);
 	// twin-style
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	// kdesktop-background
-	kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
+	tdeApp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
 }
 
 /** show the previewWidget styled with the selected one */
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 71c6588d9..9af05caac 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -68,7 +68,7 @@ void KRootBacking::init()
     m_bInit = false;
     m_bActive = false;
 
-    connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
     connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint()));
 #ifdef TQ_WS_X11
     connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
@@ -195,7 +195,7 @@ void KRootBacking::enableExports()
 {
 #ifdef TQ_WS_X11
     kdDebug(270) << k_lineinfo << "activating background exports.\n";
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
     TQByteArray data;
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 5a4360836..d095b1df7 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -192,8 +192,8 @@ extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    kapp->dcopClient()->registerAs("ksmserver", false);
-    if (!kapp->dcopClient()->isRegistered())
+    tdeApp->dcopClient()->registerAs("ksmserver", false);
+    if (!tdeApp->dcopClient()->isRegistered())
     {
        tqWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
        return 1;
@@ -217,7 +217,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
 #endif
 
     KSMServer *server = new KSMServer( TQString::fromLatin1(wm), TQString::fromLatin1(wmaddargs), only_local);
-    kapp->dcopClient()->setDefaultObject( server->objId() );
+    tdeApp->dcopClient()->setDefaultObject( server->objId() );
 
     IceSetIOErrorHandler( IoErrorHandler );
 
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 28687076d..25116593b 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -514,8 +514,8 @@ static void sighandler(int sig)
        delete server;
     }
 
-    if (kapp) {
-        kapp->quit();
+    if (tdeApp) {
+        tdeApp->quit();
     }
     //::exit(0);
 }
@@ -688,7 +688,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     connect( &protectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( protectionTimerTick() ) );
     connect( &restoreTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryRestoreNext() ) );
     connect( &shutdownTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeoutQuit() ) );
-    connect( kapp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
+    connect( tdeApp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
 
     reconfigure();
 }
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 2fa90da01..93720ee47 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -257,7 +257,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
         // Set the real desktop background to black so that exit looks
         // clean regardless of what was on "our" desktop.
         if (!showLogoutStatusDlg) {
-            kapp->desktop()->setBackgroundColor( TQt::black );
+            tdeApp->desktop()->setBackgroundColor( TQt::black );
         }
         state = Shutdown;
         wmPhase1WaitingCount = 0;
@@ -318,7 +318,7 @@ void KSMServer::suspendInternal(int state)
         TQByteArray replyData;
         // Block here until lock is complete
         // If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
-        kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
+        tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
     }
 
 #ifdef WITH_TDEHWLIB
@@ -833,12 +833,12 @@ void KSMServer::completeShutdownOrCheckpoint()
 
     if ( state == Shutdown ) {
         bool waitForKNotify = true;
-        if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+        if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
             "notifySignal(TQString,TQString,TQString,TQString,TQString,int,int,int,int)",
             "ksmserver", "notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int)", false )) {
             waitForKNotify = false;
         }
-        if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+        if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
             "playingFinished(int,int)",
             "ksmserver", "logoutSoundFinished(int,int)", false )) {
             waitForKNotify = false;
@@ -1024,7 +1024,7 @@ void KSMServer::killingCompleted()
         pid_t child;
         child = fork();
         if (child != 0) {
-            kapp->quit();
+            tdeApp->quit();
         }
         else if (child == 0) {
             // If any remaining client(s) do not exit quickly (e.g. drkonqui) terminate so that they can be seen and interacted with
@@ -1033,7 +1033,7 @@ void KSMServer::killingCompleted()
         }
     }
     else {
-        kapp->quit();
+        tdeApp->quit();
     }
 }
 
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index ed01d30d0..2cf7c9a5f 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -86,7 +86,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
    m_greyImageCreated( FALSE )
 
 {
-	if (kapp->isX11CompositionAvailable()) {
+	if (tdeApp->isX11CompositionAvailable()) {
 		m_grayImage = TQImage( TQApplication::desktop()->width(), TQApplication::desktop()->height(), 32 );
 		m_grayImage = m_grayImage.convertDepth(32);
 		m_grayImage.setAlphaBuffer(false);
@@ -132,7 +132,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 		float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
 		float doFancyLogoutFadeBackTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
 
-		if (kapp->isX11CompositionAvailable()) {
+		if (tdeApp->isX11CompositionAvailable()) {
 			// We can do this in a different (simpler) manner because we have compositing support!
 			// if slotPaintEffect() is called first time, we have to initialize the gray image
 			// we also could do that in the constructor, but then the displaying of the
@@ -377,7 +377,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 	else {
 		if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) {
 			// standard logout fade
-			 if (kapp->isX11CompositionAvailable()) {
+			 if (tdeApp->isX11CompositionAvailable()) {
 				// We can do this in a different (simpler) manner because we have compositing support!
 				// The end effect will be very similar to the old style logout
 				float doFancyLogoutFadeTime = 1000;
@@ -580,7 +580,7 @@ void KSMShutdownIPFeedback::enableExports()
 {
 #ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
-	DCOPClient *client = kapp->dcopClient();
+	DCOPClient *client = tdeApp->dcopClient();
 	if (!client->isAttached()) {
 		client->attach();
 	}
@@ -646,14 +646,14 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 			pm = TQPixmap();
 		}
 	}
-	if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) {
+	if ((pm.isNull()) || (pm.width() != tdeApp->desktop()->width()) || (pm.height() != tdeApp->desktop()->height())) {
 		if (mPixmapTimeout < 10) {
 			TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 			mPixmapTimeout++;
 			return;
 		}
 		else {
-			pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
+			pm = TQPixmap(tdeApp->desktop()->width(), tdeApp->desktop()->height());
 			pm.fill(TQt::black);
 			m_paintedFromSharedRootPixmap = false;
 		}
@@ -1168,7 +1168,7 @@ void KSMShutdownDlg::slotHybridSuspend()
 
 bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMShutdownDlg* l = new KSMShutdownDlg( 0 /*KSMShutdownFeedback::self()*/, maysd, mayrb, sdtype, selection );
 
 	// Show dialog (will save the background in showEvent)
@@ -1182,16 +1182,16 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::Sh
 
 	delete l;
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 	return result;
 }
 
 TQWidget* KSMShutdownIPDlg::showShutdownIP()
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMShutdownIPDlg* l = new KSMShutdownIPDlg( 0 );
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 
 	return l;
 }
@@ -1346,7 +1346,7 @@ void KSMDelayedMessageBox::updateText()
 
 bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
 	TQSize sh = msg.sizeHint();
 	TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
@@ -1355,7 +1355,7 @@ bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, cons
 			rect.y() + (rect.height() - sh.height())/2);
 	bool result = msg.exec();
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 	return result;
 }
 
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index e236ddfee..8bd196ab0 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -63,10 +63,10 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 
 TQWidget* KSMStartupIPDlg::showStartupIP()
 {
-    kapp->enableStyles();
+    tdeApp->enableStyles();
     KSMStartupIPDlg* l = new KSMStartupIPDlg( 0 );
 
-    kapp->disableStyles();
+    tdeApp->disableStyles();
 
     return l;
 }
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 1c311ed8b..fd943a8e5 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -191,7 +191,7 @@ void ThemeDefault::_initUi()
   setFixedHeight( mInactivePixmap->height() +
                   top_label->height() + bottom_label->height() );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   // kdDebug() << "ThemeDefault::_initUi" << rect << endl;
 
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 609956592..e7d41d132 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -32,9 +32,9 @@ ObjKsTheme::ObjKsTheme( const TQString& theme )
   :mActiveTheme (theme), mThemeDir("/"), mThemeConfig (0L), mThemePrefix( "Themes/" ), d(0)
 {
   // Get Xinerama config.
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Xinerama" );
-  TQDesktopWidget *desktop = kapp->desktop();
+  TQDesktopWidget *desktop = tdeApp->desktop();
   mXineramaScreen = config->readNumEntry("KSplashScreen", desktop->primaryScreen());
 
   // For Xinerama, let's put the mouse on the first head.  Otherwise it could appear anywhere!
@@ -92,7 +92,7 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force )
 bool ObjKsTheme::loadLocalConfig( const TQString& activeTheme, bool force )
 {
   //kdDebug() << "ObjKsTheme::loadLocalConfig" << endl;
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   return( loadTDEConfig( cfg, activeTheme, force ) );
 }
 
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 3792d6057..da7665baf 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -86,7 +86,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
 
 void ThemeRedmond::_initUi()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   mImage.resize( screen.width(), screen.height() );
@@ -275,7 +275,7 @@ void ThemeRedmond::_initUi()
 
 void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   TQPainter p;
   p.begin( this );
@@ -308,7 +308,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 
 void ThemeRedmond::_readSettings()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   if( !mTheme )
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 8fd950eb5..4c62f24a0 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -75,7 +75,7 @@ void ThemeStandard::_initUi()
     resize( 0, 0 );
   }
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   move( rect.x() + (rect.width() - size().width())/2,
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index c6c16170c..9f12a5aed 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -65,7 +65,7 @@ WndIcon::WndIcon(
   TQPoint p = determinePosition();
   mGroundX = mPosX = p.x();
   mGroundY = mPosY = p.y();
-  move( p + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( p + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 
   if( mIconJumping )
   {
@@ -98,7 +98,7 @@ TQPoint WndIcon::determinePosition()
   int DW, DH, SBH, wid, X, Y, x, y, nSlot, topshift, bottomshift;
 
   bottomshift = topshift = 0;
-  const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
+  const TQRect srect = tdeApp->desktop()->screenGeometry( mXineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   DW = srect.width();
   DH = srect.height();
@@ -301,7 +301,7 @@ void WndIcon::slotJump()
     mPosY = (int)((float)mPosY - mVelocity );
     break;
   }
-  move( TQPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( TQPoint( mPosX, mPosY ) + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 }
 
 void WndIcon::slotStopJumping()
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index db397a055..9567a1028 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -46,7 +46,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
   setCursor( KCursor::blankCursor() );
   setSpacing( 5 );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( xineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   TQLabel *pix = new TQLabel( this );
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 7458abefd..e7e34866e 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -44,9 +44,9 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args )
   : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0), mUseWM(false)
 {
   d = new ThemeEnginePrivate;
-  kapp->installX11EventFilter( this );
-  kapp->installEventFilter( this );
-  (void)kapp->desktop();
+  tdeApp->installX11EventFilter( this );
+  tdeApp->installEventFilter( this );
+  (void)tdeApp->desktop();
   XWindowAttributes rootAttr;
   XGetWindowAttributes(tqt_xdisplay(), RootWindow(tqt_xdisplay(),
                         tqt_xscreen()), &rootAttr);
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index e0ba8fb9e..200fb3a30 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -77,7 +77,7 @@ void ThemeUnified::_initUi()
   mSysModalDialog->show();
   mSysModalDialog->setActiveWindow();
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   // Center the dialog
   TQSize sh = sizeHint();
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 3c07e5191..13a293b0f 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -46,7 +46,7 @@ KSplash::KSplash(const char *name)
   mSessMgrCalled = false;
   mTimeToGo = false;
 
-  TDEConfig * config = kapp->config();
+  TDEConfig * config = tdeApp->config();
   slotReadProperties(config);
 
   prepareSplashScreen();
@@ -160,17 +160,17 @@ void KSplash::nextIcon()
 
 void KSplash::initDcop()
 {
-  disconnect( kapp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), kapp, TQ_SLOT( dcopFailure(const TQString&) ) );
+  disconnect( tdeApp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), tdeApp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
-  if ( kapp->dcopClient()->isAttached() )
+  if ( tdeApp->dcopClient()->isAttached() )
     return;
 
-  if ( kapp->dcopClient()->attach() )
+  if ( tdeApp->dcopClient()->attach() )
   {
     if(!mKsTheme->managedMode())
       upAndRunning( "dcop" );
-    kapp->dcopClient()->registerAs( "ksplash", false );
-    kapp->dcopClient()->setDefaultObject( objId() );
+    tdeApp->dcopClient()->registerAs( "ksplash", false );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
   else
   {
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index 7f83e5e8e..0fbc44ce2 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -61,7 +61,7 @@ KStart::KStart()
     }
     // propagate the app startup notification info to the started app
     TDEStartupInfoId id;
-    id.initId( kapp->startupId());
+    id.initId( tdeApp->startupId());
     id.setupStartupEnv();
 
     //finally execute the comand
@@ -76,7 +76,7 @@ KStart::KStart()
     else
         TDEStartupInfo::sendFinish( id ); // failed to start
 
-  TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQ_SLOT( quit()));
+  TQTimer::singleShot( useRule ? 0 : 120 * 1000, tdeApp, TQ_SLOT( quit()));
 }
 
 void KStart::sendRule() {
@@ -126,7 +126,7 @@ void KStart::sendRule() {
     }
 
     msg.broadcastMessage( "_KDE_NET_WM_TEMPORARY_RULES", message, -1, false );
-    kapp->flushX();
+    tdeApp->flushX();
 }
 
 const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index ac029e5e2..78b49a06c 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
@@ -182,7 +182,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
       case 3: {
           TQCustomEvent *e = new TQCustomEvent( TQEvent::User );
           e->setData( this );
-          kapp->postEvent( parent(), e );
+          tdeApp->postEvent( parent(), e );
         }
         break;
       case 4:
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 63cee160b..8bd4ea288 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
@@ -406,7 +406,7 @@ SensorLogger::RMBClicked(TQListViewItem* item, const TQPoint& point, int)
 	case 2: {
 		TQCustomEvent* ev = new TQCustomEvent(TQEvent::User);
 		ev->setData(this);
-		kapp->postEvent(parent(), ev);
+		tdeApp->postEvent(parent(), ev);
 		break;
 		}
 	case 3:	{
diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp
index 9ff979965..b2175c3ed 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cpp
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
@@ -211,7 +211,7 @@ bool HostConnector::useCustom() const
 
 void HostConnector::slotHelp()
 {
-  kapp->invokeHelp( "CONNECTINGTOOTHERHOSTS", "ksysguard/the-sensor-browser.html" );
+  tdeApp->invokeHelp( "CONNECTINGTOOTHERHOSTS", "ksysguard/the-sensor-browser.html" );
 }
 
 #include "HostConnector.moc"
diff --git a/ksysguard/gui/ksgrd/SensorManager.cpp b/ksysguard/gui/ksgrd/SensorManager.cpp
index 1412df7d7..a260dcb9a 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cpp
+++ b/ksysguard/gui/ksgrd/SensorManager.cpp
@@ -238,7 +238,7 @@ void SensorManager::requestDisengage( const SensorAgent *agent )
 	 * So we have to post an event which is later caught by
 	 * SensorManger::customEvent(). */
   TQCustomEvent* event = new TQCustomEvent( TQEvent::User, (void*)agent );
-  kapp->postEvent( this, event );
+  tdeApp->postEvent( this, event );
 }
 
 bool SensorManager::disengage( const SensorAgent *agent )
@@ -293,7 +293,7 @@ void SensorManager::hostLost( const SensorAgent *agent )
     TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
     event->setData( new TQString( i18n( "Connection to %1 has been lost." )
                     .arg( agent->hostName() ) ) );
-    kapp->postEvent( mBroadcaster, event );
+    tdeApp->postEvent( mBroadcaster, event );
   }
 }
 
@@ -305,7 +305,7 @@ void SensorManager::notify( const TQString &msg ) const
   if ( mBroadcaster ) {
     TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
     event->setData( new TQString( msg ) );
-    kapp->postEvent( mBroadcaster, event );
+    tdeApp->postEvent( mBroadcaster, event );
   }
 }
 
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 65326d826..6f46e8f22 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -186,7 +186,7 @@ void TopLevel::showProcesses()
 void TopLevel::showOnCurrentDesktop()
 {
   KWin::setOnDesktop( winId(), KWin::currentDesktop() );
-  kapp->updateUserTimestamp();
+  tdeApp->updateUserTimestamp();
   KWin::forceActiveWindow( winId() );
 }
 
@@ -216,7 +216,7 @@ TQString TopLevel::readIntegerSensor( const TQString &sensorLocator )
   TQString sensor = sensorLocator.right( sensorLocator.length() -
                                         sensorLocator.find( ':' ) - 1 );
 
-  DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
+  DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction();
   mDCopFIFO.prepend( dcopTransaction );
 
   KSGRD::SensorMgr->engage( host, "", "ksysguardd" );
@@ -233,7 +233,7 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator )
   TQString sensor = sensorLocator.right( sensorLocator.length() -
                                         sensorLocator.find( ':' ) - 1 );
 
-  DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
+  DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction();
   mDCopFIFO.prepend( dcopTransaction );
 
   KSGRD::SensorMgr->engage( host, "", "ksysguardd" );
@@ -317,7 +317,7 @@ void TopLevel::disconnectHost()
 
 void TopLevel::editToolbars()
 {
-  saveMainWindowSettings( kapp->config() );
+  saveMainWindowSettings( tdeApp->config() );
   KEditToolbar dlg( actionCollection() );
   connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this,
            TQ_SLOT( slotNewToolbarConfig() ) );
@@ -328,7 +328,7 @@ void TopLevel::editToolbars()
 void TopLevel::slotNewToolbarConfig()
 {
   createGUI();
-  applyMainWindowSettings( kapp->config() );
+  applyMainWindowSettings( tdeApp->config() );
 }
 
 void TopLevel::editStyle()
@@ -371,8 +371,8 @@ bool TopLevel::queryClose()
     if ( !mWorkSpace->saveOnQuit() )
       return false;
 
-    saveProperties( kapp->config() );
-    kapp->config()->sync();
+    saveProperties( tdeApp->config() );
+    tdeApp->config()->sync();
   }
 
   return true;
@@ -471,7 +471,7 @@ void TopLevel::answerReceived( int id, const TQString &answer )
       reply << answer;
 
       DCOPClientTransaction *dcopTransaction = mDCopFIFO.last();
-      kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
+      tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
       mDCopFIFO.removeLast();
       break;
     }
@@ -490,7 +490,7 @@ void TopLevel::answerReceived( int id, const TQString &answer )
       reply << resultList;
 
       DCOPClientTransaction *dcopTransaction = mDCopFIFO.last();
-      kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
+      tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
       mDCopFIFO.removeLast();
       break;
     }
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 39cb71b16..bb0c06c5c 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -143,14 +143,14 @@ void KSysTrayCmd::refresh()
 
   TQToolTip::remove( this );
   if ( win ) {
-    TDEConfig *appCfg = kapp->config();
+    TDEConfig *appCfg = tdeApp->config();
     TDEConfigGroupSaver configSaver(appCfg, "System Tray");
     int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
 
     // ksystraycmd's icon or app's icon
     if (ownIcon)
     {
-      setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+      setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
     }
     else
     {
@@ -167,7 +167,7 @@ void KSysTrayCmd::refresh()
     else
       TQToolTip::add( this, window );
 
-    setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+    setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
   }
 }
 
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index fac058a6f..8329f85aa 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -445,8 +445,8 @@ void LayoutConfig::save()
 	keys->writeSettings(0, true);
 
 	// Get current layout from Kxkb
-	if (!kapp->dcopClient()->isAttached())
-		kapp->dcopClient()->attach();
+	if (!tdeApp->dcopClient()->isAttached())
+		tdeApp->dcopClient()->attach();
 
 	DCOPRef kxkbref("kxkb", "kxkb");
 	DCOPReply reply = kxkbref.call( "getCurrentLayout" );
@@ -459,7 +459,7 @@ void LayoutConfig::save()
 	}
 
 	// Cause Kxkb to reread configuration
-	kapp->tdeinitExecWait("kxkb");
+	tdeApp->tdeinitExecWait("kxkb");
 
 	// If previous call was valid, try to change layout
 	if ( reply.isValid() ) {
@@ -1247,7 +1247,7 @@ extern "C"
 		m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);
 
 		if( m_kxkbConfig.m_useKxkb == true ) {
-			kapp->startServiceByDesktopName("kxkb");
+			tdeApp->startServiceByDesktopName("kxkb");
 		}
 		else {
 			if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index c8be694be..fce6349be 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -129,7 +129,7 @@ void KeyboardConfig::load()
 
   XKeyboardState kbd;
 
-  XGetKeyboardControl(kapp->getDisplay(), &kbd);
+  XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
   config.setGroup("Keyboard");
   bool key = config.readBoolEntry("KeyboardRepeating", true);
@@ -156,7 +156,7 @@ void KeyboardConfig::save()
 
   kbd.key_click_percent = clickVolume;
   kbd.auto_repeat_mode = keyboardRepeat;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                            KBKeyClickPercent | KBAutoRepeatMode,
                            &kbd);
   if( keyboardRepeat ) {
@@ -538,12 +538,12 @@ void KeyboardConfig::init_keyboard()
 	XKeyboardState   kbd;
 	XKeyboardControl kbdc;
 
-	XGetKeyboardControl(kapp->getDisplay(), &kbd);
+	XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 	bool key = config->readBoolEntry("KeyboardRepeating", true);
 	kbdc.key_click_percent = config->readNumEntry("ClickVolume", kbd.key_click_percent);
 	kbdc.auto_repeat_mode = (key ? AutoRepeatModeOn : AutoRepeatModeOff);
 
-	XChangeKeyboardControl(kapp->getDisplay(),
+	XChangeKeyboardControl(tdeApp->getDisplay(),
 						   KBKeyClickPercent | KBAutoRepeatMode,
 						   &kbdc);
 
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index fd8db27d5..2dc9733e6 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -114,7 +114,7 @@ bool KXKBApp::settingsRead()
 	}
 
     if ( kxkbConfig.m_useKxkb == false ) {
-        kapp->quit();
+        tdeApp->quit();
         return false;
     }
 	
@@ -153,7 +153,7 @@ bool KXKBApp::settingsRead()
 	kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
 	
 	if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) {
-		kapp->quit();
+		tdeApp->quit();
 		return false;
  	}
 
@@ -172,7 +172,7 @@ void KXKBApp::initTray()
 	{
 		KSystemTray* sysTray = new KxkbSystemTray();
 		TDEPopupMenu* popupMenu = sysTray->contextMenu();
-	//	popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() );
+	//	popupMenu->insertTitle( tdeApp->miniIcon(), tdeApp->caption() );
 
 		m_tray = new KxkbLabelController(sysTray, popupMenu);
  		connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int)));
@@ -270,7 +270,7 @@ void KXKBApp::menuActivated(int id)
 	}
 	else if (id == KxkbLabelController::HELP_MENU_ID)
 	{
-		TDEApplication::kApplication()->invokeHelp(0, "kxkb");
+		tdeApp->invokeHelp(0, "kxkb");
 	}
 //	else
 //	{
@@ -301,7 +301,7 @@ void KXKBApp::maybeShowLayoutNotification() {
 		QCStringList modules;
 		TQCString replyType;
 		TQByteArray replyData;
-		if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+		if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
 			TQByteArray(), replyType, replyData))
 		{
 			if (replyType == "QCStringList") {
@@ -317,7 +317,7 @@ void KXKBApp::maybeShowLayoutNotification() {
 
 	if (useKMilo) {
 		DCOPRef kmilo("kded", "kmilod");
-		if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, kapp->miniIcon()))
+		if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, tdeApp->miniIcon()))
 			notificationSent = true;
 	}
 
diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp
index c4d90d5b7..2066d9600 100644
--- a/libkonq/konq_dirpart.cpp
+++ b/libkonq/konq_dirpart.cpp
@@ -168,7 +168,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
 	    this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
     connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
 
-    connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+    connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
 #if 0
     // Extract 6 icon sizes from the icon theme.
     // Use 16,22,32,48,64,128 as default.
diff --git a/libkonq/konq_faviconmgr.cpp b/libkonq/konq_faviconmgr.cpp
index c5c828ec0..411d680f9 100644
--- a/libkonq/konq_faviconmgr.cpp
+++ b/libkonq/konq_faviconmgr.cpp
@@ -44,7 +44,7 @@ void KonqFavIconMgr::setIconForURL(const KURL &url, const KURL &iconURL)
     TQByteArray data;
     TQDataStream str(data, IO_WriteOnly);
     str << url << iconURL;
-    kapp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
+    tdeApp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
 }
 
 void KonqFavIconMgr::downloadHostIcon(const KURL &url)
@@ -52,6 +52,6 @@ void KonqFavIconMgr::downloadHostIcon(const KURL &url)
     TQByteArray data;
     TQDataStream str(data, IO_WriteOnly);
     str << url;
-    kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
+    tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
 }
 
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index 5bc3de86b..ee5e9e272 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -217,12 +217,12 @@ void KonqFileTip::setFilter( bool enable )
     if ( enable == m_filter ) return;
 
     if ( enable ) {
-        kapp->installEventFilter( this );
+        tdeApp->installEventFilter( this );
         TQApplication::setGlobalMouseTracking( true );
     }
     else {
         TQApplication::setGlobalMouseTracking( false );
-        kapp->removeEventFilter( this );
+        tdeApp->removeEventFilter( this );
     }
     m_filter = enable;
 }
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index ac6916c81..8d07ab416 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -50,8 +50,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     m_filename = locateLocal( "data",
 			      TQString::fromLatin1("konqueror/konq_history" ));
 
-    if ( !kapp->dcopClient()->isAttached() )
-	kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+	tdeApp->dcopClient()->attach();
 
 
     // take care of the completion object
@@ -355,7 +355,7 @@ void KonqHistoryManager::emitAddToHistory( const KonqHistoryEntry& entry )
     // Protection against very long urls (like data:)
     if ( data.size() > 4096 )
         return;
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyHistoryEntry(KonqHistoryEntry, TQCString)",
 			      data );
 }
@@ -397,7 +397,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL& url )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << url << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyRemove(KURL, TQCString)", data );
 }
 
@@ -406,7 +406,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL::List& urls )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << urls << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyRemove(KURL::List, TQCString)", data );
 }
 
@@ -415,7 +415,7 @@ void KonqHistoryManager::emitClear()
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyClear(TQCString)", data );
 }
 
@@ -424,7 +424,7 @@ void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << count << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxCount(TQ_UINT32, TQCString)", data );
 }
 
@@ -433,7 +433,7 @@ void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << days << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxAge(TQ_UINT32, TQCString)", data );
 }
 
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 09ed599fd..0dbd11782 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -127,8 +127,8 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
     connect( this, TQ_SIGNAL( selectionChanged() ),
              this, TQ_SLOT( slotSelectionChanged() ) );
 
-    kapp->addKipcEventMask( KIPC::IconChanged );
-    connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+    tdeApp->addKipcEventMask( KIPC::IconChanged );
+    connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
     connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) );
     connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) );
     connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
@@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         d->pSoundPlayer->mimeTypes().contains(
             item->item()->mimetype())
         && TDEGlobalSettings::showFilePreview(item->item()->url())
-        && topLevelWidget() == kapp->activeWindow())
+        && topLevelWidget() == tdeApp->activeWindow())
     {
         d->pSoundItem = item;
         d->bSoundItemClicked = false;
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 520506879..a57746bee 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -296,7 +296,7 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
       if (!keyName.isEmpty())
       {
          // Check kmessagebox setting... erase & copy to konquerorrc.
-         TDEConfig *config = kapp->config();
+         TDEConfig *config = tdeApp->config();
          TDEConfigGroupSaver saver(config, "Notification Messages");
          if (!config->readBoolEntry(keyName, true))
          {
@@ -512,7 +512,7 @@ void KonqOperations::doFileCopy()
     }
 
     bool linkOnly = false;
-    if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
+    if (isDesktopFile && !tdeApp->authorize("run_desktop_files") &&
         (m_destURL.path(1) == TDEGlobalSettings::desktopPath()) )
     {
        linkOnly = true;
@@ -520,7 +520,7 @@ void KonqOperations::doFileCopy()
 
     if ( !mlst.isEmpty() && m_destURL.protocol() == "trash" )
     {
-        if ( itemIsOnDesktop && !kapp->authorize("editable_desktop_icons") )
+        if ( itemIsOnDesktop && !tdeApp->authorize("editable_desktop_icons") )
         {
             delete this;
             return;
diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp
index b814af2f3..e560cc63c 100644
--- a/libkonq/konq_pixmapprovider.cpp
+++ b/libkonq/konq_pixmapprovider.cpp
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
 KonqPixmapProvider * KonqPixmapProvider::self()
 {
     if ( !s_self )
-	s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" );
+	s_self = new KonqPixmapProvider( tdeApp, "KonqPixmapProvider" );
 
     return s_self;
 }
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index 7d7600b8c..c26484485 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -314,13 +314,13 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg)
     }
 
     TQStringList list = cfg.readListEntry("X-TDE-AuthorizeAction");
-    if (kapp && !list.isEmpty())
+    if (tdeApp && !list.isEmpty())
     {
         for(TQStringList::ConstIterator it = list.begin();
             it != list.end();
             ++it)
         {
-            if (!kapp->authorize((*it).stripWhiteSpace()))
+            if (!tdeApp->authorize((*it).stripWhiteSpace()))
             {
                 return false;
             }
@@ -433,7 +433,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
             connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
             while (!d->localURLSlotFired) {
-                kapp->eventLoop()->enterLoop();
+                tdeApp->eventLoop()->enterLoop();
             }
             if (d->localURLResultIsLocal) {
                 realURL = d->localURLResultURL;
@@ -488,10 +488,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if (!isCurrentTrash)
         addMerge( "konqueror" );
 
-    bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
+    bool isKDesktop = TQCString( tdeApp->name() ) == "kdesktop";
 
     if (( kpf & ShowProperties ) && isKDesktop &&
-        !kapp->authorize("editable_desktop_icons"))
+        !tdeApp->authorize("editable_desktop_icons"))
     {
         kpf &= ~ShowProperties; // remove flag
     }
@@ -584,7 +584,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     addDel = true;
                 }
                 else {
-                    TDEConfigGroup configGroup( kapp->config(), "KDE" );
+                    TDEConfigGroup configGroup( tdeApp->config(), "KDE" );
                     if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
                         addDel = true;
                 }
@@ -634,7 +634,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
         if (m_lstItems.count() > 1)
             act->setEnabled(false);
-        if (kapp->authorizeTDEAction("bookmarks"))
+        if (tdeApp->authorizeTDEAction("bookmarks"))
             addAction( act );
         if (bIsLink)
             addGroup( "linkactions" );
@@ -715,7 +715,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( cfg.hasKey( "X-TDE-ShowIfRunning" ) )
             {
                 const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" );
-                if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) )
+                if ( !tdeApp->dcopClient()->isApplicationRegistered( app.utf8() ) )
                     continue;
             }
             if ( cfg.hasKey( "X-TDE-ShowIfDcopCall" ) )
@@ -723,7 +723,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 TQString dcopcall = cfg.readEntry( "X-TDE-ShowIfDcopCall" );
                 const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();
 
-                //if( !kapp->dcopClient()->isApplicationRegistered( app ))
+                //if( !tdeApp->dcopClient()->isApplicationRegistered( app ))
                 //	continue; //app does not exist so cannot send call
 
                 TQByteArray dataToSend;
@@ -739,7 +739,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     continue; //Be safe.
                 }
 
-                if(!kapp->dcopClient()->call( app, object,
+                if(!tdeApp->dcopClient()->call( app, object,
                                               function.utf8(),
                                               dataToSend, replyType, replyData, true, 1000))
                     continue;
@@ -839,7 +839,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
         TDETrader::OfferList offers;
 
-        if (kapp->authorizeTDEAction("openwith"))
+        if (tdeApp->authorizeTDEAction("openwith"))
         {
             TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'";
             TQString subConstraint = " and '%1' in ServiceTypes";
@@ -1221,7 +1221,7 @@ void KonqPopupMenu::slotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool
   d->localURLSlotFired = true;
   d->localURLResultURL = url;
   d->localURLResultIsLocal = isLocal;
-  kapp->eventLoop()->exitLoop();
+  tdeApp->eventLoop()->exitLoop();
 }
 
 void KonqPopupMenu::slotLocalURLKIODestroyed()
@@ -1230,7 +1230,7 @@ void KonqPopupMenu::slotLocalURLKIODestroyed()
     d->localURLSlotFired = true;
     d->localURLResultURL = KURL();
     d->localURLResultIsLocal = false;
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
   }
 }
 
diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp
index 9272bbf5c..4ecca65fa 100644
--- a/libkonq/konq_undo.cpp
+++ b/libkonq/konq_undo.cpp
@@ -197,8 +197,8 @@ public:
 KonqUndoManager::KonqUndoManager()
 : DCOPObject( "KonqUndoManager" )
 {
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
 
   d = new KonqUndoManagerPrivate;
   d->m_syncronized = initializeFromKDesky();
@@ -625,7 +625,7 @@ bool KonqUndoManager::initializeFromKDesky()
   // ### FIXME: post 2.1
   return false;
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
 
   if ( client->appId() == "kdesktop" ) // we are master :)
     return true;
diff --git a/libkonq/konq_xmlguiclient.cpp b/libkonq/konq_xmlguiclient.cpp
index a12d237c6..2352498c1 100644
--- a/libkonq/konq_xmlguiclient.cpp
+++ b/libkonq/konq_xmlguiclient.cpp
@@ -79,7 +79,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
 {
   static const TQString& tagAction = TDEGlobal::staticQString( "action" );
 
-  if (!kapp->authorizeTDEAction(name))
+  if (!tdeApp->authorizeTDEAction(name))
      return;
 
   handlePendingSeparator();
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 88ff45ced..1c6f092f4 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -22,7 +22,7 @@ public:
             {
                 TDEIO::file_copy(KURL::fromPathOrURL(globalBookmarkFile),
                                  KURL::fromPathOrURL(bookmarksFile));
-                kapp->processEvents(3000);   // Allows up to 3 seconds to copy the file
+                tdeApp->processEvents(3000);   // Allows up to 3 seconds to copy the file
             }
             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
         }
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index edaa07717..8ddc26a42 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -201,8 +201,8 @@ NSPluginLoader::NSPluginLoader()
   _filetype.setAutoDelete(true);
 
   // trap dcop register events
-  kapp->dcopClient()->setNotifications(true);
-  TQObject::connect(kapp->dcopClient(),
+  tdeApp->dcopClient()->setNotifications(true);
+  TQObject::connect(tdeApp->dcopClient(),
                    TQ_SIGNAL(applicationRegistered(const TQCString&)),
                    this, TQ_SLOT(applicationRegistered(const TQCString&)));
 
@@ -376,9 +376,9 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
 
    // wait for the process to run
    int cnt = 0;
-   while (!kapp->dcopClient()->isApplicationRegistered(_dcopid))
+   while (!tdeApp->dcopClient()->isApplicationRegistered(_dcopid))
    {
-       //kapp->processEvents(); // would lead to recursive calls in tdehtml
+       //tdeApp->processEvents(); // would lead to recursive calls in tdehtml
 #ifdef HAVE_USLEEP
        usleep( 50*1000 );
 #else
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 3e5530f3a..500361464 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -301,7 +301,7 @@ bool PluginPart::openURL(const KURL &url)
     emit setStatusBarText( i18n("Loading Netscape plugin for %1").arg(url.prettyURL()) );
 
     // create plugin widget
-    NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, kapp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
+    NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, tdeApp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
 
     if ( inst ) {
         _widget = inst;
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 0ed350abb..2e02b6d91 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -653,7 +653,7 @@ int main( int argc, char **argv )
       printf("90\n"); fflush(stdout);
     }
 
-    DCOPClient *dcc = kapp->dcopClient();
+    DCOPClient *dcc = tdeApp->dcopClient();
     if ( !dcc->isAttached() )
         dcc->attach();
     // Tel kded to update sycoca database.
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 7ac24ee2c..821f17e29 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -46,7 +46,7 @@ TestNSPlugin::TestNSPlugin()
    // file menu
    KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
    KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
-   KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection());
+   KStdAction::quit( tdeApp, TQ_SLOT(quit()), actionCollection());
 
    createGUI( "testnspluginui.rc" );
 }
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index d65b6c702..995b4a9a6 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1323,7 +1323,7 @@ DCOPRef NSPluginViewer::newClass( TQString plugin )
        _classes.insert( plugin, cls );
    }
 
-   return DCOPRef( kapp->dcopClient()->appId(), cls->objId() );
+   return DCOPRef( tdeApp->dcopClient()->appId(), cls->objId() );
 }
 
 
@@ -1566,7 +1566,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb
    }
 
    _instances.append( inst );
-   return DCOPRef(kapp->dcopClient()->appId(), inst->objId());
+   return DCOPRef(tdeApp->dcopClient()->appId(), inst->objId());
 }
 
 
diff --git a/tdedebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp
index d7c84a499..c1e579939 100644
--- a/tdedebugdialog/kabstractdebugdialog.cpp
+++ b/tdedebugdialog/kabstractdebugdialog.cpp
@@ -72,8 +72,8 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
 
 void KAbstractDebugDialog::slotShowHelp()
 {
-  if (kapp)
-    kapp->invokeHelp();
+  if (tdeApp)
+    tdeApp->invokeHelp();
 }
 
 void KAbstractDebugDialog::slotApply()
diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp
index 6a1043345..1f1df1239 100644
--- a/tdedebugdialog/tdedebugdialog.cpp
+++ b/tdedebugdialog/tdedebugdialog.cpp
@@ -244,7 +244,7 @@ void TDEDebugDialog::save()
   pConfig->writeEntry( "AbortFatal", pAbortFatal->isChecked() );
 
   TQByteArray data;
-  if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
+  if (!tdeApp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
   {
     kdError() << "Unable to send DCOP message" << endl;
   }
diff --git a/tdedebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp
index 4c3bb9f0e..c25cb18f6 100644
--- a/tdedebugdialog/tdelistdebugdialog.cpp
+++ b/tdedebugdialog/tdelistdebugdialog.cpp
@@ -168,7 +168,7 @@ void TDEListDebugDialog::save()
 
   // send DCOP message to all clients
   TQByteArray data;
-  if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
+  if (!tdeApp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
   {
     kdError() << "Unable to send DCOP message" << endl;
   }
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index 510437072..efa26e884 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -247,7 +247,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 		connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
 		         this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
 		*/
-		kapp->dcopClient()
+		tdeApp->dcopClient()
 		->connectDCOPSignal("kded", "mediamanager",
 		                    "mediumChanged(TQString, bool)",
 		                    "mediaimpl",
@@ -272,7 +272,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 
 		mp_mounting = 0L;
 		
-		kapp->dcopClient()
+		tdeApp->dcopClient()
 		->disconnectDCOPSignal("kded", "mediamanager",
 		                       "mediumChanged(TQString, bool)",
 		                       "mediaimpl",
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index b84242b58..46670cd24 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -1239,7 +1239,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 		// The caller expects the device to be mounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1350,7 +1350,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		// The caller expects the device to be unmounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1682,7 +1682,7 @@ void TDEBackend::slotResult(TDEIO::Job *job)
 	/* Job completed. Notify the caller */
 	data->error = job->error();
 	data->completed = true;
-	kapp->eventLoop()->exitLoop();
+	tdeApp->eventLoop()->exitLoop();
 }
 
 TQString TDEBackend::isInFstab(const Medium *medium)
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index c7e33fdb1..b3eec63d6 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -114,7 +114,7 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
 	// in the background due to focus stealing prevention. Entering a new media can
 	// be seen as a kind of user activity after all. It'd be better to update the timestamp
 	// as soon as the media is entered, but it apparently takes some time to get here.
-	kapp->updateUserTimestamp();
+	tdeApp->updateUserTimestamp();
 
 	KURL url(  "system:/media/"+name );
 
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index 28d7e02f9..6e75ef474 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -39,7 +39,7 @@ class JobTray : public KSystemTray
 {
 public:
 	JobTray(KJobViewerApp *parent, const char *name = 0)
-		: KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) ); }
+		: KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), tdeApp, TQ_SLOT( quit() ) ); }
 protected:
 	void mousePressEvent(TQMouseEvent*);
 private:
@@ -184,7 +184,7 @@ void KJobViewerApp::slotJobsShown(KMJobViewer *view, bool hasJobs)
 	}
 	else {
 		TDEStartupInfo::appStarted();
-		kapp->quit();
+		tdeApp->quit();
 	}
 }
 
@@ -230,7 +230,7 @@ void KJobViewerApp::slotViewerDestroyed(KMJobViewer *view)
 	if (view)
 		m_views.take(view->printer());
 	if (m_views.count() == 0)
-		kapp->quit();
+		tdeApp->quit();
 }
 
 #include "kjobviewer.moc"
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index aed2065a1..16adb438a 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -276,7 +276,7 @@ void PrintWrapper::slotPrint()
 			errormsg(i18n("Unable to construct the print dialog."));
 	}
 
-	TQTimer::singleShot(10,kapp,TQ_SLOT(quit()));
+	TQTimer::singleShot(10,tdeApp,TQ_SLOT(quit()));
 }
 
 void hack( KPrintDialog* dlg );
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index b98953627..9c9ecd1b1 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -459,7 +459,7 @@ bool TDEIO_Print::getDBFile( const KURL& src )
 	connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
 	connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
 	connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-	kapp->enter_loop();
+	tdeApp->enter_loop();
 	m_httpBuffer.close();
 
 	/* return the result */
@@ -510,7 +510,7 @@ void TDEIO_Print::slotResult( TDEIO::Job *j )
 		m_httpError = j->error();
 		m_httpErrorTxt = j->errorText();
 	}
-	kapp->exit_loop();
+	tdeApp->exit_loop();
 }
 
 void TDEIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 1e256a538..d96f6c93c 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -486,7 +486,7 @@ void FaxCtrl::filter()
 		}
 		else
 		{
-			TQString	tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8);
+			TQString	tmp = locateLocal("tmp","tdeprintfax_") + tdeApp->randomString(8);
 			m_filteredfiles.prepend(tmp);
 			m_tempfiles.append(tmp);
 			m_process->clearArguments();
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 4538bc7ae..3511b2bae 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	updateState();
 
 	resize(550,500);
-	TQWidget	*d = kapp->desktop();
+	TQWidget	*d = tdeApp->desktop();
 	move((d->width()-width())/2, (d->height()-height())/2);
 }
 
diff --git a/tdesu/ChangeLog b/tdesu/ChangeLog
index f9bd05eb5..3d01f2e01 100644
--- a/tdesu/ChangeLog
+++ b/tdesu/ChangeLog
@@ -50,7 +50,7 @@ Wed, 8 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
 Wed, 1 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
-    * Deferred instantiation of kapp in tdesu.cpp.
+    * Deferred instantiation of tdeApp in tdesu.cpp.
     * Finished porting to KDE2.
 
 Sun, 29 Aug 99    Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index b36b0513b..fef3d76a4 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
     
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         id.setupStartupEnv(); // make DESKTOP_STARTUP_ID env. var. available again
     }
 
@@ -272,7 +272,7 @@ static int startApp()
     
     QCStringList env;
     TQCString options;
-    env << ( "DESKTOP_STARTUP_ID=" + kapp->startupId());
+    env << ( "DESKTOP_STARTUP_ID=" + tdeApp->startupId());
     
     if (pw->pw_uid)
     {
@@ -348,7 +348,7 @@ static int startApp()
     if (needpw)
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         TDEStartupInfoData data;
         data.setSilent( TDEStartupInfoData::Yes );
         TDEStartupInfo::sendChange( id, data );
@@ -380,7 +380,7 @@ static int startApp()
     }
 
     // Some events may need to be handled (like a button animation)
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Run command
     if (!change_uid)
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index d0815efbe..c623a2fd6 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -1020,7 +1020,7 @@ KStdGreeter::KStdGreeter()
 		case LOGO_LOGO:
 			{
 				TQMovie movie( _logo );
-				kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 );
+				tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 );
 				TQPixmap pixmap;
 				if (!movie.framePixmap().isNull() || pixmap.load( _logo )) {
 					pixLabel = new TQLabel( this );
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 6921b8666..7b8e012a9 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -106,7 +106,7 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
 #endif
 {
 	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
-	connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
+	connect( tdeApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	_parent->installEventFilter( this );
 }
@@ -849,7 +849,7 @@ KGVerify::handleVerify()
 			failed = true;
 			updateStatus();
 			handler->verifyFailed();
-			timer.start( 1500 + kapp->random()/(RAND_MAX/1000) );
+			timer.start( 1500 + tdeApp->random()/(RAND_MAX/1000) );
 			return;
 		}
 		if (ret != V_FAIL)
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index 88beae860..b6fbd29c9 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -41,7 +41,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 	timer->start( 1000 );
 
 	// reading rc file
-	//TDEConfig *config = kapp->config();
+	//TDEConfig *config = tdeApp->config();
 
 	//config->setGroup( "Option" );
 	mDate = false;//config->readNumEntry( "date", FALSE );
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 340fabbba..8dc4f7f43 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -276,7 +276,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 		freeStrArr( tlist );
 		targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
 		TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
-		int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+		int spc = tdeApp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
 		          + howGroup->insideSpacing();
 		hb->addSpacing( spc );
 		hb->addWidget( targets );
diff --git a/tqt3integration/README b/tqt3integration/README
index 1af1034a8..75579fdc9 100644
--- a/tqt3integration/README
+++ b/tqt3integration/README
@@ -19,7 +19,7 @@ v kded nesmi byt nic, co znovu vstupuje do event loop
     - udelat na to test
     - spravit tdewallet
 
-blokovat uzivatelsky vstup, jako to dela kapp pro dcop
+blokovat uzivatelsky vstup, jako to dela tdeApp pro dcop
 
 obcas se dela demand-attention v taskbaru
 - navic je problem s focus stealing prevention, kdyz aplikace nejdriv zobrazi jen samotny dialog
diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index 45b0a8b96..aa9f10a67 100644
--- a/tqt3integration/libtqttde/tqttde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -87,7 +87,7 @@ static DCOPClient* dcopClient()
         assert( tqApp != NULL ); // TODO
         prepared = true;
         dcop->bindToApp();
-        if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
+        if( !tqApp->inherits( "TDEApplication" )) // TDEApp takes care of input blocking
             {
             static tqttde_EventLoop* loop = new tqttde_EventLoop;
             TQObject::connect( dcop, TQ_SIGNAL( blockUserInput( bool )), loop, TQ_SLOT( block( bool )));
diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp
index 03a2bf422..5e896fb14 100644
--- a/tqt3integration/utils/gen.cpp
+++ b/tqt3integration/utils/gen.cpp
@@ -740,7 +740,7 @@ void genarateTDEPreStub( TQTextStream& stream )
         if( function.delayed_return )
             {
             stream << "    JobData job;\n";
-            stream << "    job.transaction = kapp->dcopClient()->beginTransaction();\n";
+            stream << "    job.transaction = tdeApp->dcopClient()->beginTransaction();\n";
             stream << "    job.type = JobData::" + TQString( function.name[ 0 ].upper()) + function.name.mid( 1 ) + ";\n";
             }
         for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -870,7 +870,7 @@ void genarateTDEPostStub( TQTextStream& stream )
             stream << ";\n";
             }
         if( function.delayed_return )
-            stream << "    kapp->dcopClient()->endTransaction( job.transaction, replyType, replyData );\n";
+            stream << "    tdeApp->dcopClient()->endTransaction( job.transaction, replyType, replyData );\n";
         stream << "    }\n";
         stream << "\n";
         }
diff --git a/twin/clients/PORTING b/twin/clients/PORTING
index 199ddb9de..3db8af576 100644
--- a/twin/clients/PORTING
+++ b/twin/clients/PORTING
@@ -84,7 +84,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
 - Replace 'contextHelp()' with 'showContextHelp()'.
 - WindowWrapperShowEvent() is gone, simply use showEvent() filtered by the event filter if needed.
 - Change 'animateIconifyOrDeiconify()' to 'animateMinize()', if it's empty, simply remove it.
-  Make sure it doesn't reenter the event loop (no kapp->processEvents()).
+  Make sure it doesn't reenter the event loop (no tdeApp->processEvents()).
 - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition().
   I.e. usually call setCursor( ArrowCursor ) in your MyButton.
 - In the part where you insert windowWrapper() into the layout, i.e. something like
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 4fba7538d..c353abc1b 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -57,7 +57,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
 	hbox = new TQHBox(sliderBox);
 	hbox->setSpacing(6);
 
-	bool rtl = kapp->reverseLayout();
+	bool rtl = tdeApp->reverseLayout();
 	label1 = new TQLabel(i18n("Small"), hbox);
 	label1->setAlignment(rtl ? AlignRight : AlignLeft);
 	label2 = new TQLabel(i18n("Medium"), hbox);
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 581c07ac1..657c6a1ed 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -223,12 +223,12 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co
     {
     if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
         desktop = currentDesktop();
-    TQDesktopWidget *desktopwidget = kapp->desktop();
+    TQDesktopWidget *desktopwidget = tdeApp->desktop();
     TQRect sarea = screenarea // may be NULL during KWin initialization
         ? screenarea[ desktop ][ screen ]
         : desktopwidget->screenGeometry( screen );
     TQRect warea = workarea[ desktop ].isNull()
-        ? kapp->desktop()->geometry()
+        ? tdeApp->desktop()->geometry()
         : workarea[ desktop ];
     switch (opt)
         {
@@ -802,7 +802,7 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area
     // HACK: workarea handling is not xinerama aware, so if this strut
     // reserves place at a xinerama edge that's inside the virtual screen,
     // ignore the strut for workspace setting.
-    if( area == kapp->desktop()->geometry())
+    if( area == tdeApp->desktop()->geometry())
         {
         if( stareaL.left() < screenarea.left())
             stareaL = TQRect();
@@ -2376,14 +2376,14 @@ bool Client::startMoveResize()
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
     {
         grabXServer();
-        kapp->sendPostedEvents();
+        tdeApp->sendPostedEvents();
         // we have server grab -> nothing should cause paint events
         // unfortunately, that's not completely true, Qt may generate
         // paint events on some widgets due to FocusIn(?)
         // eat them, otherwise XOR painting will be broken (#58054)
         // paint events for the geometrytip need to be allowed, though
         // eater = new EatAllPaintEvents;
-// not needed anymore?        kapp->installEventFilter( eater );
+// not needed anymore?        tdeApp->installEventFilter( eater );
     }
     Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
 
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 3050bdf36..a1de82d0a 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -970,7 +970,7 @@ TQString KWinDecorationModule::handbookSection() const
 
 void KWinDecorationModule::resetKWin()
 {
-	bool ok = kapp->dcopClient()->send("twin*", "KWinInterface",
+	bool ok = tdeApp->dcopClient()->send("twin*", "KWinInterface",
                         "reconfigure()", TQByteArray());
 	if (!ok)
 		kdDebug() << "kcmtwindecoration: Could not reconfigure twin" << endl;
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 0b392cd14..0bc9c942c 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -183,9 +183,9 @@ void KWinOptions::save()
   emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
@@ -295,9 +295,9 @@ void TDEActionsOptions::save()
   emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 0e197071c..8ed44e79e 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -368,7 +368,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
     coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
   }
 
-  connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
+  connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
 
   layout->addStretch();
 
@@ -567,9 +567,9 @@ void KTitleBarActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
@@ -850,9 +850,9 @@ void KWindowActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index e88601507..fae19516f 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -585,9 +585,9 @@ void KFocusConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -748,9 +748,9 @@ void KActiveBorderConfig::save() {
     if (standAlone)
     {
         config->sync();
-        if (!kapp->dcopClient()->isAttached())
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if (!tdeApp->dcopClient()->isAttached())
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -954,9 +954,9 @@ void KAdvancedConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -1382,9 +1382,9 @@ void KMovingConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -1965,9 +1965,9 @@ void KTranslucencyConfig::save( void )
   if (standAlone)
   {
     config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
   if (useTranslucency->isChecked())
     startKompmgr();
@@ -2035,12 +2035,12 @@ bool KTranslucencyConfig::kompmgrAvailable()
 
 void KTranslucencyConfig::startKompmgr()
 {
-    kapp->dcopClient()->send("twin*", "", "startKompmgr()", TQString(""));
+    tdeApp->dcopClient()->send("twin*", "", "startKompmgr()", TQString(""));
 }
 
 void KTranslucencyConfig::stopKompmgr()
 {
-    kapp->dcopClient()->send("twin*", "", "stopKompmgr()", TQString(""));
+    tdeApp->dcopClient()->send("twin*", "", "stopKompmgr()", TQString(""));
 }
 
 void KTranslucencyConfig::showWarning(bool alphaActivated)
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index e2a75ee62..7e2cac86c 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -66,9 +66,9 @@ void KCMRules::save()
     emit TDECModule::changed( false );
     // Send signal to twin
     config.sync();
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
 
 void KCMRules::defaults()
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 67e21332c..ef8a30956 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -256,9 +256,9 @@ static int edit( Window wid, bool whole_app )
         delete orig_rule;
         }
     saveRules( rules );
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     return 0;
     }
     
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index ee8e66eef..03daebc28 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -659,7 +659,7 @@ class KWIN_EXPORT KDecoration
 	 * This function may be reimplemented to provide custom minimize/restore animations
 	 * The reimplementation is allowed to perform X server grabs if necessary
          * (only using the functions provided by this API, no direct Xlib calls), but no
-	 * futher event processing is allowed (i.e. no kapp->processEvents()).
+	 * futher event processing is allowed (i.e. no tdeApp->processEvents()).
 	 * @a False should be returned if the default implementation should be used.
 	 * Note that you should not use this function to force disabling of the animation.
 	 *
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 00cdb6a22..0b51dd284 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -42,13 +42,13 @@ bool SessionManaged::saveState( TQSessionManager& sm )
         {
         Workspace::self()->sessionSaveStarted();
         if( ksmserver ) // save stacking order etc. before "save file?" etc. dialogs change it
-            Workspace::self()->storeSession( kapp->sessionConfig(), SMSavePhase0 );
+            Workspace::self()->storeSession( tdeApp->sessionConfig(), SMSavePhase0 );
         sm.release(); // Qt doesn't automatically release in this case (bug?)
         sm.requestPhase2();
         return true;
         }
-    Workspace::self()->storeSession( kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
-    kapp->sessionConfig()->sync();
+    Workspace::self()->storeSession( tdeApp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
+    tdeApp->sessionConfig()->sync();
     return true;
     }
 
@@ -149,7 +149,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase )
 void Workspace::loadSessionInfo()
     {
     session.clear();
-    TDEConfig* config = kapp->sessionConfig();
+    TDEConfig* config = tdeApp->sessionConfig();
     config->setGroup("Session" );
     int count =  config->readNumEntry( "count" );
     int active_client = config->readNumEntry( "active" );
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index c706eb5df..33ee8fd3e 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -67,7 +67,7 @@ void KDecorationPreview::performRepaintTest(int n)
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
         deco->widget()->repaint();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -80,7 +80,7 @@ void KDecorationPreview::performCaptionTest(int n)
         bridge->setCaption(caption.arg(i) );
         deco->captionChange();
         deco->widget()->repaint();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -91,7 +91,7 @@ void KDecorationPreview::performResizeTest(int n)
     deco->captionChange();
     for (int i = 0; i < n; ++i) {
         positionPreviews(i % 200);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -103,7 +103,7 @@ void KDecorationPreview::performRecreationTest(int n)
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
         recreateDecoration();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 821828e19..c50c77401 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -131,7 +131,7 @@ TQPopupMenu* Workspace::clientPopup()
         popup->insertSeparator();
 
         if (!TDEGlobal::config()->isImmutable() && 
-            !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
+            !tdeApp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
             {
             popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQ_SLOT( configureWM() ));
             popup->insertSeparator();
@@ -1148,7 +1148,7 @@ void Workspace::slotWindowOperations()
 
 void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
     {
-    if (!kapp->authorizeTDEAction("twin_rmb"))
+    if (!tdeApp->authorizeTDEAction("twin_rmb"))
         return;
     if( !cl )
         return;
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index b710b6579..d942adfe6 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -220,7 +220,7 @@ Workspace::Workspace( bool restore )
         (WFlags)(TQt::WType_Desktop | TQt::WPaintUnclipped)
     );
 
-    kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later
+    tdeApp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later
     // call this before XSelectInput() on the root window
     startup = new TDEStartupInfo(
         TDEStartupInfo::DisableKWinModule | TDEStartupInfo::AnnounceSilenceChanges, this );
@@ -259,7 +259,7 @@ Workspace::Workspace( bool restore )
     init();
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-    connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
+    connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
     if (!supportsCompMgr()) {
@@ -414,12 +414,12 @@ void Workspace::init()
     // extra NETRootInfo instance in Client mode is needed to get the values of the properties
     NETRootInfo client_info( tqt_xdisplay(), NET::ActiveWindow | NET::CurrentDesktop );
     int initial_desktop;
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         initial_desktop = client_info.currentDesktop();
     else
         {
-        TDEConfigGroupSaver saver( kapp->sessionConfig(), "Session" );
-        initial_desktop = kapp->sessionConfig()->readNumEntry( "desktop", 1 );
+        TDEConfigGroupSaver saver( tdeApp->sessionConfig(), "Session" );
+        initial_desktop = tdeApp->sessionConfig()->readNumEntry( "desktop", 1 );
         }
     if( !setCurrentDesktop( initial_desktop ))
         setCurrentDesktop( 1 );
@@ -431,16 +431,16 @@ void Workspace::init()
             TQ_SLOT(slotReconfigure()));
     connect( &updateToolWindowsTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( slotUpdateToolWindows()));
 
-    connect(kapp, TQ_SIGNAL(appearanceChanged()), this,
+    connect(tdeApp, TQ_SIGNAL(appearanceChanged()), this,
             TQ_SLOT(slotReconfigure()));
-    connect(kapp, TQ_SIGNAL(settingsChanged(int)), this,
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), this,
             TQ_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int )));
+    connect(tdeApp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int )));
 
     active_client = NULL;
     rootInfo->setActiveWindow( None );
     focusToNull();
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         ++block_focus; // because it will be set below
 
     char nm[ 100 ];
@@ -503,7 +503,7 @@ void Workspace::init()
         } // end updates blocker block
 
     Client* new_active_client = NULL;
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         {
         --block_focus;
         new_active_client = findClient( WindowMatchPredicate( client_info.activeWindow()));
@@ -1277,7 +1277,7 @@ TQStringList Workspace::configModules(bool controlCenter)
     args <<  "tde-twindecoration.desktop";
     if (controlCenter)
         args << "tde-twinoptions.desktop";
-    else if (kapp->authorizeControlModule("tde-twinoptions.desktop"))
+    else if (tdeApp->authorizeControlModule("tde-twinoptions.desktop"))
         args  << "twinactions" << "twinfocus" <<  "twinmoving" << "twinadvanced" << "twinrules" << "twintranslucency";
     return args;
     }
@@ -1423,7 +1423,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
 
         current_desktop = new_desktop; // change the desktop (so that Client::updateVisibility() works)
 
-        bool desktopHasCompositing = kapp->isCompositionManagerAvailable();	// Technically I should call isX11CompositionAvailable(), but it isn't initialized via my kapp constructir, and in this case it doesn't really matter anyway....
+        bool desktopHasCompositing = tdeApp->isCompositionManagerAvailable();	// Technically I should call isX11CompositionAvailable(), but it isn't initialized via my tdeApp constructir, and in this case it doesn't really matter anyway....
         if (!desktopHasCompositing) {
             // If composition is not in use then we can hide the old windows before showing the new ones
             for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
@@ -1806,7 +1806,7 @@ void Workspace::setActiveScreenMouse( TQPoint mousepos )
 
 TQRect Workspace::screenGeometry( int screen ) const
     {
-    if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2))
+    if (( !options->xineramaEnabled ) || (tdeApp->desktop()->numScreens() < 2))
         return tqApp->desktop()->geometry();
     return tqApp->desktop()->screenGeometry( screen );
     }
@@ -2995,7 +2995,7 @@ void Workspace::startKompmgr()
         TQByteArray ba;
         TQDataStream arg(ba, IO_WriteOnly);
         arg << "";
-        kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStarted()", ba);
+        tdeApp->dcopClient()->emitDCOPSignal("default", "kompmgrStarted()", ba);
     }
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
 }
@@ -3014,7 +3014,7 @@ void Workspace::stopKompmgr()
     TQByteArray ba;
     TQDataStream arg(ba, IO_WriteOnly);
     arg << "";
-    kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba);
+    tdeApp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba);
 }
 
 void Workspace::kompmgrReloadSettings()