Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.rename/kapp-tdeapp

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

209 files changed, 629 insertions, 642 deletions

diff --git a/DEBUG b/DEBUG
index cf3dfbc43..47540b3b2 100644
--- a/DEBUG
+++ b/DEBUG
@@ -75,7 +75,7 @@ code where we want to place the breakpoint. An external editor is of great
 use at this point. With the list command we can select the source file we
 are interested in and verify that we have found the correct source line:
 
-(gdb) list kapp.cpp:220
+(gdb) list tdeApp.cpp:220
 215         parseCommandLine( argc, argv );
 216     }
 217
@@ -87,7 +87,7 @@ are interested in and verify that we have found the correct source line:
 223     {
 224         if (!GUIenabled)
 (gdb) break 224
-Breakpoint 2 at 0x4048aa7e: file kapp.cpp, line 224.
+Breakpoint 2 at 0x4048aa7e: file tdeApp.cpp, line 224.
 (gdb) 
 
 We can now continue the execution of kedit. Execution will stop when it hits
@@ -100,7 +100,7 @@ Qt: gdb: -nograb added to command-line options.
          Use the -dograb option to enforce grabbing.
  
 Breakpoint 2, TDEApplication::TDEApplication (this=0xbffff6a8, allowStyles=true,
-    GUIenabled=true) at kapp.cpp:224
+    GUIenabled=true) at tdeApp.cpp:224
 224         if (!GUIenabled)
 (gdb) 
 
diff --git a/TODO b/TODO
index c52d8aaf6..6f6d21d90 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,7 @@ that we would like to make for the next binary incompatible release.
 
 - Move all utility functions away from TDEApplication. TBD: Make TDEApplication 
   a very thin wrapper around QApplication. Ideally, TDEApplication should go 
-  away completely. The kapp pointer references everywhere must die. Find a 
+  away completely. The tdeApp pointer references everywhere must die. Find a 
   way to make that possible
 
 - Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4.
@@ -35,11 +35,11 @@ that we would like to make for the next binary incompatible release.
 - Make it possible to create a KSystemTray without a TDEMainWindow and instead lazily
   create the main window on demand.
 
-- Make KSystemTray's Quit option in the context menu call kapp->quit() instead of
+- Make KSystemTray's Quit option in the context menu call tdeApp->quit() instead of
   closing all windows, so apps that save their window state on exit don't need
   workarounds to detect a window close caused by the tray rather than the user.
 
-- Make KSystemTray add its own reference to KApp, so tray apps that adhere to the
+- Make KSystemTray add its own reference to TDEApp, so tray apps that adhere to the
   style guide can safely close their main window without having to worry about
   the app quitting instead.
 
diff --git a/arts/kde/kaudioconverter.cpp b/arts/kde/kaudioconverter.cpp
index d387535d2..e959851f9 100644
--- a/arts/kde/kaudioconverter.cpp
+++ b/arts/kde/kaudioconverter.cpp
@@ -74,7 +74,7 @@ bool KAudioConverter::setup(int samplingRate)
 void KAudioConverter::slotMimeType(const TQString &mimeType)
 {
 	m_mimeType = mimeType;
-	kapp->exit_loop();
+	tdeApp->exit_loop();
 }
 
 void KAudioConverter::requestPlayObject(const KURL &url)
@@ -94,7 +94,7 @@ void KAudioConverter::requestPlayObject(const KURL &url)
 		inputStream.streamStart();
 
 		// ugly hacks.. :/
-		kapp->enter_loop();
+		tdeApp->enter_loop();
 
 		queryInterface = "Arts::StreamPlayObject";		
 	}
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 44901b6f7..ec06d261d 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -298,7 +298,7 @@ void KNotify::loadConfig() {
 
 void KNotify::reconfigure()
 {
-	kapp->config()->reparseConfiguration();
+	tdeApp->config()->reparseConfiguration();
 	loadConfig();
 	
 	// clear loaded config files
@@ -756,12 +756,12 @@ void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
 WId KNotify::checkWinId( const TQString &appName, WId senderWinId )
 {
 	if ( senderWinId == 0 ) {
-		TQCString senderId = kapp->dcopClient()->senderId();
+		TQCString senderId = tdeApp->dcopClient()->senderId();
 		TQCString compare = (appName + "-mainwindow").latin1();
 		int len = compare.length();
 		// kdDebug() << "notifyByPassivePopup: appName=" << appName << " sender=" << senderId << endl;
 		
-		QCStringList objs = kapp->dcopClient()->remoteObjects( senderId );
+		QCStringList objs = tdeApp->dcopClient()->remoteObjects( senderId );
 		for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it ) {
 			TQCString obj( *it );
 			if ( obj.left(len) == compare) {
@@ -769,7 +769,7 @@ WId KNotify::checkWinId( const TQString &appName, WId senderWinId )
 				TQCString replyType;
 				TQByteArray data, replyData;
 			
-				if ( kapp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) {
+				if ( tdeApp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) {
 					TQDataStream answer(replyData, IO_ReadOnly);
 					if (replyType == "int") {
 						answer >> senderWinId;
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 86324529f..16e60317d 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -98,7 +98,7 @@ case:
  * returns the appId that is actually registered, which _may_ be
  * different from what you passed
  */
-appId = client->registerAs(kApp->name());
+appId = client->registerAs(tdeApp->name());
 
 If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
@@ -111,8 +111,8 @@ call DCOPClient::registerAs() with the new name.
 TDEUniqueApplication automatically registers itself to DCOP. If you
 are using TDEUniqueApplication you should not attach or register
 yourself, this is already done. The appId is by definition
-equal to kapp->name(). You can retrieve the registered DCOP client
-by calling kapp->dcopClient().
+equal to tdeApp->name(). You can retrieve the registered DCOP client
+by calling tdeApp->dcopClient().
 
 Sending Data to a Remote Application:
 -------------------------------------
@@ -247,7 +247,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
-    myTransaction = kapp->dcopClient()->beginTransaction();
+    myTransaction = tdeApp->dcopClient()->beginTransaction();
 
     // start processing...
     // Calls slotProcessingDone when finished.
@@ -266,7 +266,7 @@ slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    kapp->dcopClient()->endTransaction( myTransaction, replyType, replyData );
+    tdeApp->dcopClient()->endTransaction( myTransaction, replyType, replyData );
 }
 
 DCOP Signals
@@ -315,7 +315,7 @@ that an application that was started via TDELauncher terminates.
    QByteArray params;
    QDataStream stream(params, IO_WriteOnly);
    stream << pid;
-   kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
+   tdeApp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
 
 The task manager of the TDE panel connects to this signal. It uses an 
 anonymous connection (it doesn't require that the signal is being emitted
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 186aed76b..ecd2b70f3 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -59,7 +59,7 @@ DCOPClient::registerAs(const QCString &name) to do so.  In the simple
 case:
 
 \code
-appId = client->registerAs(kapp->name());
+appId = client->registerAs(tdeApp->name());
 \endcode
 
 If you never retrieve the DCOPClient pointer from TDEApplication, the
@@ -73,8 +73,8 @@ call DCOPClient::registerAs() with the new name.
 TDEUniqueApplication automatically registers itself to DCOP. If you
 are using TDEUniqueApplication you should not attach or register
 yourself, this is already done. The appId is by definition
-equal to \p kapp->name(). You can retrieve the registered DCOP client
-by calling \p kapp->dcopClient().
+equal to \p tdeApp->name(). You can retrieve the registered DCOP client
+by calling \p tdeApp->dcopClient().
 
 
 \section sending_data Sending Data to a Remote Application:
@@ -208,7 +208,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
-    myTransaction = kapp->dcopClient()->beginTransaction();
+    myTransaction = tdeApp->dcopClient()->beginTransaction();
 
     // start processing...
     // Calls slotProcessingDone when finished.
@@ -227,7 +227,7 @@ slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    kapp->dcopClient()->endTransaction( myTransaction, replyType, replyData );
+    tdeApp->dcopClient()->endTransaction( myTransaction, replyType, replyData );
 }
 \endcode
 
@@ -548,7 +548,7 @@ that an application that was started via TDELauncher terminates:
 QByteArray params;
 QDataStream stream(params, IO_WriteOnly);
 stream << pid;
-kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
+tdeApp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
 \endcode
 
 The task manager of the Trinity panel connects to this signal. It uses an 
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 78cc2783a..a6b45f3e9 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent)
 		d->m_domains+="local.";
 		d->m_browseLAN=true;
 	}
- 	connect(TDEApplication::kApplication(),TQ_SIGNAL(kipcMessage(int,int)),this,
+ 	connect(tdeApp,TQ_SIGNAL(kipcMessage(int,int)),this,
  	        TQ_SLOT(domainListChanged(int,int)));
 }
 
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index c926b2602..0c541e9e2 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -306,11 +306,11 @@
  *
    @verbatim
      // Register DCOP client.
-     DCOPClient *client = kapp->dcopClient();
+     DCOPClient *client = tdeApp->dcopClient();
      if (!client->isRegistered())
      {
          client->attach();
-         client->registerAs(kapp->name());
+         client->registerAs(tdeApp->name());
      }
      // Connect KTTSD DCOP signals to our slots.
      connectDCOPSignal("kttsd", "KSpeech",
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index 022737ed4..7e956f718 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -492,7 +492,7 @@ void KIMProxy::chatWithContact( const TQString& uid )
 	{
 		if ( KIMIface_stub* s = stubForUid( uid ) )
 		{
-			kapp->updateRemoteUserTimestamp( s->app() );
+			tdeApp->updateRemoteUserTimestamp( s->app() );
 			s->chatWithContact( uid );
 		}
 	}
@@ -505,7 +505,7 @@ void KIMProxy::messageContact( const TQString& uid, const TQString& message )
 	{
 		if ( KIMIface_stub* s = stubForUid( uid ) )
 		{
-			kapp->updateRemoteUserTimestamp( s->app() );
+			tdeApp->updateRemoteUserTimestamp( s->app() );
 			s->messageContact( uid, message );
 		}
 	}
@@ -521,7 +521,7 @@ void KIMProxy::sendFile(const TQString &uid, const KURL &sourceURL, const TQStri
 		{
 			if ( it.current()->canReceiveFiles( uid ) )
 			{
-				kapp->updateRemoteUserTimestamp( it.current()->app() );
+				tdeApp->updateRemoteUserTimestamp( it.current()->app() );
 				it.current()->sendFile( uid, sourceURL, altFileName, fileSize );
 				break;
 			}
diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 64cf89bb8..13b634cc6 100644
--- a/interfaces/tdescript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -50,7 +50,7 @@ TQString ShellScript::script() const
 void ShellScript::setScript( const TQString &scriptFile  )
 {
 	m_scriptName = scriptFile;
-	*m_script << "sh" << m_scriptName << kapp->dcopClient()->appId();
+	*m_script << "sh" << m_scriptName << tdeApp->dcopClient()->appId();
 }
 
 void ShellScript::setScript( const TQString &, const TQString & )
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 62bd33605..4abd9421d 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -56,7 +56,7 @@ TDESelectAction * ScriptLoader::getScripts()
 	// Get the available scripts for this application.
 	TQStringList pluginList = "";
 	// Find plugins
-	TQString searchPath = kapp->name();
+	TQString searchPath = tdeApp->name();
 	searchPath += "/scripts/";
 	TQDir d(locate( "data", searchPath));
 	kdDebug() << "loading plugin from " << locate( "data", searchPath) << endl;
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index a0dfbe921..a87cdfa67 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -51,7 +51,7 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile)
 		KDesktopFile desktop(scriptDesktopFile, true);
 		m_scripts.insert(desktop.readName(), new ScriptInfo());
 		m_scripts[desktop.readName()]->scriptType = desktop.readType();
-		TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", "");
+		TQString localpath = TQString(tdeApp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", "");
 		m_scripts[desktop.readName()]->scriptFile = locate("data", localpath);
 //		m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod;
 		success = true;
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 1eddfb8d6..0fc06bd9e 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
 }
 
 void EditorChooser::readAppSetting(const TQString& postfix){
-	TDEConfig *cfg=kapp->config();
+	TDEConfig *cfg=tdeApp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	TQString editor=cfg->readPathEntry("editor");
@@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 }
 
 void EditorChooser::writeAppSetting(const TQString& postfix){
-	TDEConfig *cfg=kapp->config();
+	TDEConfig *cfg=tdeApp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@@ -105,7 +105,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 
 	KTextEditor::Document *tmpDoc=0;
 
-	TDEConfig *cfg=kapp->config();
+	TDEConfig *cfg=tdeApp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
@@ -135,7 +135,7 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
 
         KTextEditor::Editor *tmpEd=0;
 
-        TDEConfig *cfg=kapp->config();
+        TDEConfig *cfg=tdeApp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp
index 0cf8b9307..5b62689e6 100644
--- a/kab/addressbook.cpp
+++ b/kab/addressbook.cpp
@@ -418,7 +418,7 @@ AddressBook::AddressBook(TQWidget* parent, const char* name, bool loadit)
       KMessageBox::error(this,
 	 i18n("Cannot initialize local variables."),
 	 i18n("Out of Memory"));
-      kapp->quit(); // It is critical, but will possibly never happen.
+      tdeApp->quit(); // It is critical, but will possibly never happen.
     }
   connect(data, TQ_SIGNAL(fileChanged()), TQ_SLOT(dataFileChanged()));
   connect(data, TQ_SIGNAL(changed(QConfigDB*)),
@@ -1066,7 +1066,7 @@ AddressBook::add(const Entry& entry, KabKey& key, bool update)
       KMessageBox::error(this,
 	 i18n("Cannot initialize local variables."),
 	 i18n("Out of Memory"));
-      kapp->quit(); // It is critical, but will possibly never happen.
+      tdeApp->quit(); // It is critical, but will possibly never happen.
       return InternError; // shut the compiler up...
     }
   // ----- lock the file:
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index 6a499df8e..c14f16ce3 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -56,7 +56,7 @@ class IndenterConfigPage : public TQWidget
 
   public slots:
     /**
-     * Apply the changes. Save options here, use @p kapp->config() and
+     * Apply the changes. Save options here, use @p tdeApp->config() and
      * group [Kate Indenter MyIndenter].
      */
     virtual void apply () = 0;
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 7625af0eb..bc1c51dd7 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
   m_pluginsSet.fill (true);
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate Document Defaults");
   readConfig (config);
 }
@@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate View Defaults");
   readConfig (config);
 }
@@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("Kate Renderer Defaults");
   readConfig (config);
 }
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index a125c2c85..84177de1f 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -1913,13 +1913,13 @@ void KateDocument::writeConfig(TDEConfig *config)
 
 void KateDocument::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   readConfig (config);
 }
 
 void KateDocument::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   writeConfig (config);
   config->sync();
 }
@@ -1984,10 +1984,10 @@ void KateDocument::configDialog()
                                       i18n("Configure"),
                                       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
                                       KDialogBase::Ok,
-                                      kapp->mainWidget() );
+                                      tdeApp->mainWidget() );
 
 #ifndef TQ_WS_WIN //TODO: reenable
-  KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( kd->winId(), tdeApp->icon(), tdeApp->miniIcon() );
 #endif
 
   TQPtrList<KTextEditor::ConfigPage> editorPages;
@@ -2521,7 +2521,7 @@ bool KateDocument::save()
     // get the right permissions, start with safe default
     mode_t  perms = 0600;
     TDEIO::UDSEntry fentry;
-    if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
+    if (TDEIO::NetAccess::stat (url(), fentry, tdeApp->mainWidget()))
     {
       kdDebug () << "stating succesfull: " << url() << endl;
       KFileItem item (fentry, url());
@@ -2530,8 +2530,8 @@ bool KateDocument::save()
 
     // first del existing file if any, than copy over the file we have
     // failure if a: the existing file could not be deleted, b: the file could not be copied
-    if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
-          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
+    if ( (!TDEIO::NetAccess::exists( u, false, tdeApp->mainWidget() ) || TDEIO::NetAccess::del( u, tdeApp->mainWidget() ))
+          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, tdeApp->mainWidget() ) )
     {
       kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
     }
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index a4fdd3627..e6c50e7b3 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -69,7 +69,7 @@ bool KatePrinter::print (KateDocument *doc)
   printer.addDialogPage( new KatePrintHeaderFooter(&printer, NULL) );
   printer.addDialogPage( new KatePrintLayout(&printer, NULL) );
 
-   if ( printer.setup( kapp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) )
+   if ( printer.setup( tdeApp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) )
    {
      KateRenderer renderer(doc);
      //renderer.config()->setSchema (1);
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 6716d079d..a055a00e5 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
 //BEGIN KateSchemaManager
 TQString KateSchemaManager::normalSchema ()
 {
-  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
+  return tdeApp->aboutData()->appName () + TQString (" - Normal");
 }
 
 TQString KateSchemaManager::printingSchema ()
 {
-  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
+  return tdeApp->aboutData()->appName () + TQString (" - Printing");
 }
 
 KateSchemaManager::KateSchemaManager ()
@@ -864,7 +864,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   hbHl = new TQHBox( this );
   layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
-  lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
+  lHl = new TQLabel( i18n("&Default schema for %1:").arg(tdeApp->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( defaultSchemaCombo );
 
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 872e7467c..948040236 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
   {
      KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
      // flush config, otherwise it isn't nessecarily done
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      config->setGroup("Kate View Defaults");
      KateViewConfig::global()->writeConfig( config );
   }
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4f4e5692d..cc1654cd6 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -365,7 +365,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons
 const char failureSnapshotPrefix[] = "testkateregressionrc-FS.";
 
 static TQString findMostRecentFailureSnapshot() {
-    TQDir dir(kapp->dirs()->saveLocation("config"),
+    TQDir dir(tdeApp->dirs()->saveLocation("config"),
              TQString(failureSnapshotPrefix)+"*",
              TQDir::Time, TQDir::Files);
     return dir[0].mid(sizeof failureSnapshotPrefix - 1);
@@ -906,7 +906,7 @@ static void pause(int msec)
     TQTime t;
     t.start();
     do {
-        kapp->processEvents();
+        tdeApp->processEvents();
     } while (t.elapsed() < msec);
 }
 
@@ -1068,7 +1068,7 @@ void RegressionTest::testStaticFile(const TQString & filename, const TQStringLis
 
     if (!script_error) goto bail_out;
 
-    if (m_showGui) kapp->processEvents();
+    if (m_showGui) tdeApp->processEvents();
 
     if ( m_genOutput ) {
         reportResult(checkOutput(filename+"-result"), "result");
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 83933bfce..8ffa241fd 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
 
 void DocWordCompletionPlugin::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "DocWordCompletion Plugin" );
   m_treshold = config->readNumEntry( "treshold", 3 );
   m_autopopup = config->readBoolEntry( "autopopup", true );
@@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
 
 void DocWordCompletionPlugin::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("DocWordCompletion Plugin");
   config->writeEntry("autopopup", m_autopopup );
   config->writeEntry("treshold", m_treshold );
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 6572ff58b..4d3cecbfa 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -75,7 +75,7 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
       dataStream << TQString("tdebuildsycoca") << args;
       TQCString _launcher = TDEApplication::launcher();
 
-      kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
+      tdeApp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
@@ -148,14 +148,14 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
   if (!module)
      return false;
 
-  module->setCallingDcopClient(kapp->dcopClient());
+  module->setCallingDcopClient(tdeApp->dcopClient());
   return module->process(fun, data, replyType, replyData);
 }
 
 void Kded::initModules()
 {
      m_dontLoad.clear();
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      bool tde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -227,7 +227,7 @@ void Kded::initModules()
 void Kded::loadSecondPhase()
 {
      kdDebug(7020) << "Loading second phase autoload" << endl;
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      KService::List kdedModules = KServiceType::offers("KDEDModule");
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
@@ -510,7 +510,7 @@ void Kded::recreateDone()
       TQByteArray replyData;
       DCOPClientTransaction *transaction = m_recreateRequests.first();
       if (transaction)
-         kapp->dcopClient()->endTransaction(transaction, replyType, replyData);
+         tdeApp->dcopClient()->endTransaction(transaction, replyType, replyData);
       m_recreateRequests.remove(m_recreateRequests.begin());
    }
    m_recreateBusy = false;
@@ -553,7 +553,7 @@ bool Kded::process(const TQCString &fun, const TQByteArray &data,
        }
        m_recreateCount++;
     }
-    m_recreateRequests.append(kapp->dcopClient()->beginTransaction());
+    m_recreateRequests.append(tdeApp->dcopClient()->beginTransaction());
     replyType = "void";
     return true;
   } else {
@@ -659,8 +659,8 @@ void Kded::unregisterWindowId(long windowId)
 
 static void sighandler(int /*sig*/)
 {
-    if (kapp)
-       kapp->quit();
+    if (tdeApp)
+       tdeApp->quit();
 }
 
 KUpdateD::KUpdateD()
@@ -751,9 +751,9 @@ public:
   virtual bool process(const TQCString &fun, const TQByteArray &data,
                        TQCString& replyType, TQByteArray &replyData)
     {
-      if ( kapp && (fun == "quit()") )
+      if ( tdeApp && (fun == "quit()") )
       {
-        kapp->quit();
+        tdeApp->quit();
         replyType = "void";
         return true;
       }
@@ -954,7 +954,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
      if (bCheckHostname)
         (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes
 
-     DCOPClient *client = kapp->dcopClient();
+     DCOPClient *client = tdeApp->dcopClient();
      TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)),
              kded, TQ_SLOT(slotApplicationRemoved(const TQCString&)));
      client->setNotifications(true);
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index 77640dcf1..561bf9835 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -712,7 +712,7 @@ static const char appVersion[] = "1.1";
 class WaitForSignal : public TQObject
 {
 public:
-   ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
+   ~WaitForSignal() { tdeApp->eventLoop()->exitLoop(); }
 };
 
 extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
@@ -792,7 +792,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
        WaitForSignal *obj = new WaitForSignal;
        obj->connect(dcopClient, TQ_SIGNAL(applicationRemoved(const TQCString &)),
                TQ_SLOT(deleteLater()));
-       kapp->eventLoop()->enterLoop();
+       tdeApp->eventLoop()->enterLoop();
      }
      dcopClient->setNotifications( false );
    }
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 83efffc56..1d47eb40f 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -76,7 +76,7 @@
 <!ENTITY documentation.index "<index id='doc-index'></index>">
 ]]>
 <!ENTITY documentation.index "">
-<!--ENTITY kapp "(Oops - someone forgot to fill in the application name here)" -->
+<!--ENTITY tdeApp "(Oops - someone forgot to fill in the application name here)" -->
 
 <!-- Entities to fill in slots in docbook version of FDL notice -->
 <!ENTITY % FDLIS "IGNORE">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index 5792a9467..9d930b034 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -81,7 +81,7 @@
 <!ENTITY documentation.index "<index></index>">
 ]]>
 <!ENTITY documentation.index "">
-<!--ENTITY kapp "(Oops - someone forgot to fill in the application name here)" -->
+<!--ENTITY tdeApp "(Oops - someone forgot to fill in the application name here)" -->
 
 <!-- Entities to fill in slots in docbook version of FDL notice -->
 <!ENTITY % FDLIS "IGNORE">
diff --git a/kdoctools/template.docbook b/kdoctools/template.docbook
index ccd768abc..c5c601fe2 100644
--- a/kdoctools/template.docbook
+++ b/kdoctools/template.docbook
@@ -108,7 +108,7 @@ Please at least include TDE, the TDE package it is in, the name
 <keywordset>
 <keyword>TDE</keyword>
 <keyword>tdeutils</keyword>
-<keyword>Kapp</keyword>
+<keyword>tdeapp</keyword>
 <keyword>nothing</keyword>
 <keyword>nothing else</keyword>
 </keywordset>
@@ -138,7 +138,7 @@ any problems or feature requests to the &tde; mailing lists.
 </para>
 </chapter>
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Using &kmyapplication;</title>
 
 <!-- This chapter should tell the user how to use your app. You should use as
@@ -167,7 +167,7 @@ patent issues. -->
 </para>
 
 
-<sect1 id="kapp-features">
+<sect1 id="tdeApp-features">
 <title>More &kmyapplication; features</title>
 
 <para>It slices! It dices! and it comes with a free toaster!</para>
@@ -198,7 +198,7 @@ Also include any keys that have a special function but have no equivalent in the
 menus or toolbars. This may not be necessary for small apps or apps with no tool
 or menu bars. -->
 
-<sect1 id="kapp-mainwindow">
+<sect1 id="tdeApp-mainwindow">
 <title>The main &kmyapplication; window</title>
 
 <sect2>
@@ -486,7 +486,7 @@ Documentation Copyright &copy; 1999 George N. Ugnacious <email>gnu@kde.org</emai
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>How to obtain &kmyapplication;</title>
 
 <!-- This first entity contains boiler plate for applications that are
@@ -518,19 +518,6 @@ about 5 megs of memory to run, but this may vary depending on your
 platform and configuration.
 </para>
 
-<para>
-All required libraries as well as &kmyapplication; itself can be found
-on <ulink url="ftp://ftp.kapp.org">The &kmyapplication; home page</ulink>.
-</para>
-
-<!-- For a list of updates, you may refer to the application web site
-or the ChangeLog file, or ... -->
-<para>
-You can find a list of changes at <ulink
-url="http://apps.kde.org/kapp">http://apps.kde.org/kapp</ulink>.
-</para>
-</sect1>
-
 <sect1 id="compilation">
 <title>Compilation and Installation</title>
 
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index e83c73604..17c1250cb 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -77,13 +77,13 @@ protected:
     {
         if (e->ascii() == 'q')
         {
-            kapp->quit();
+            tdeApp->quit();
         }
     }
 
     virtual void closeEvent( TQCloseEvent * )
     {
-        kapp->quit();
+        tdeApp->quit();
     }
 };
 
diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 92c106bae..cb0508eaa 100644
--- a/libtdescreensaver/tdescreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -147,7 +147,7 @@ void KBlankEffect::blank( TQWidget *w, Effect effect )
     }
 
     if ( effect == Random )
-        effect = (Effect)(kapp->random() % MaximumEffects);
+        effect = (Effect)(tdeApp->random() % MaximumEffects);
 
     d->effectProgress = 0;
     d->widget = w;
@@ -172,7 +172,7 @@ void KBlankEffect::blankSweepRight()
 {
     TQPainter p( d->widget );
     p.fillRect( d->effectProgress, 0, 50, d->widget->height(), black );
-    kapp->flushX();
+    tdeApp->flushX();
     d->effectProgress += 50;
     if ( d->effectProgress >= d->widget->width() )
         finished();
@@ -183,7 +183,7 @@ void KBlankEffect::blankSweepDown()
 {
     TQPainter p( d->widget );
     p.fillRect( 0, d->effectProgress, d->widget->width(), 50, black );
-    kapp->flushX();
+    tdeApp->flushX();
     d->effectProgress += 50;
     if ( d->effectProgress >= d->widget->height() )
         finished();
@@ -203,7 +203,7 @@ void KBlankEffect::blankBlocks()
         for ( int i = 0; i < bx*by; i++ )
             block[i] = i;
         for ( int i = 0; i < bx*by; i++ ) {
-            int swap = kapp->random()%(bx*by);
+            int swap = tdeApp->random()%(bx*by);
             int tmp = block[i];
             block[i] = block[swap];
             block[swap] = tmp;
@@ -220,7 +220,7 @@ void KBlankEffect::blankBlocks()
         d->effectProgress++;
     }
 
-    kapp->flushX();
+    tdeApp->flushX();
 
     if ( d->effectProgress >= bx*by ) {
         delete[] block;
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index f36220886..81db4a121 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -44,7 +44,7 @@ ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : D
 {
 	d = new ConnectionManagerPrivate;
 	
-	d->m_stub = new ClientIface_stub( kapp->dcopClient(), "kded", "networkstatus" );
+	d->m_stub = new ClientIface_stub( tdeApp->dcopClient(), "kded", "networkstatus" );
 	
 	connectDCOPSignal( "kded", "networkstatus", "statusChange(TQString,int)", "slotStatusChanged(TQString,int)", false );
 	d->m_userInitiatedOnly = false;
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 7937a52d6..8f8e1969c 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -63,8 +63,8 @@ NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule(
 	d = new Private;
 /*	d->clientIface = new ClientIfaceImpl( this );
 	d->serviceIface = new ServiceIfaceImpl( this );*/
-	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
-	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) );
+	connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+	connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) );
 }
 
 NetworkStatusModule::~NetworkStatusModule()
@@ -112,7 +112,7 @@ int NetworkStatusModule::request( const TQString & host, bool userInitiated )
 		return NetworkStatus::Unavailable;
 	
 	NetworkStatus::EnumStatus status = p->status();
-	TQCString appId = kapp->dcopClient()->senderId();
+	TQCString appId = tdeApp->dcopClient()->senderId();
 	if ( status == NetworkStatus::Online )
 	{
 		p->registerUsage( appId, host );
@@ -161,7 +161,7 @@ int NetworkStatusModule::request( const TQString & host, bool userInitiated )
 
 void NetworkStatusModule::relinquish( const TQString & host )
 {
-	TQCString appId = kapp->dcopClient()->senderId();
+	TQCString appId = tdeApp->dcopClient()->senderId();
 	// find network currently used by app for host...
 	NetworkList::iterator end = d->networks.end();
 	NetworkList::iterator it = d->networks.begin();
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 93dc096e5..3af65d143 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -29,14 +29,14 @@
 
 TestService::TestService() : TQObject(), DCOPObject("ProviderIface")
 {
-	kapp->dcopClient()->registerAs("testservice" );
+	tdeApp->dcopClient()->registerAs("testservice" );
 	m_service = new ServiceIface_stub( "kded", "networkstatus" );
 	m_status = NetworkStatus::Offline;
 	NetworkStatus::Properties nsp;
 	nsp.internet = true;
 	nsp.name = "test_net";
 	nsp.onDemandPolicy = NetworkStatus::All;
-	nsp.service = kapp->dcopClient()->appId();
+	nsp.service = tdeApp->dcopClient()->appId();
 	nsp.status = m_status;
 	m_service->registerNetwork( "test_net", nsp );
 }
diff --git a/tdeabc/lock.cpp b/tdeabc/lock.cpp
index 2e2ee7894..9a08aa069 100644
--- a/tdeabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -110,7 +110,7 @@ bool Lock::lock()
   }
 
   TQString lockUniqueName;
-  lockUniqueName = mIdentifier + kapp->randomString( 8 );
+  lockUniqueName = mIdentifier + tdeApp->randomString( 8 );
   mLockUniqueName = locateLocal( "data", "tdeabc/lock/" + lockUniqueName );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index 338d703f3..779f7bae4 100644
--- a/tdeabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -104,7 +104,7 @@ void TestLDAPClient::testIntevation()
   connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
            this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
   mClient->startQuery( filter );
-  kapp->eventLoop()->enterLoop();
+  tdeApp->eventLoop()->enterLoop();
   delete mClient; mClient = 0;
 }
 
@@ -155,7 +155,7 @@ void TestLDAPClient::slotLDAPError( const TQString& err )
 void TestLDAPClient::slotLDAPDone()
 {
   kdDebug() << k_funcinfo << endl;
-  kapp->eventLoop()->exitLoop();
+  tdeApp->eventLoop()->exitLoop();
 }
 
 #include "testldapclient.moc"
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index d593945bf..24f34b79e 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -197,7 +197,7 @@ int main(int argc,char **argv)
 
   LockWidget mainWidget( identifier );
 
-  kapp->setMainWidget( &mainWidget );
+  tdeApp->setMainWidget( &mainWidget );
   mainWidget.show();
 
   return app.exec();  
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index df39d7810..e4171e233 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -79,7 +79,7 @@ static void listModules(const TQString &baseGroup)
      if (p->isType(KST_KService))
      {
         KService *s = static_cast<KService*>(p);
-        if (!kapp->authorizeControlModule(s->menuId()))
+        if (!tdeApp->authorizeControlModule(s->menuId()))
            continue;
         m_modules.append(s);
      }
@@ -128,7 +128,7 @@ bool KCMShell::isRunning()
 
     TQByteArray data;
     TQDataStream str( data, IO_WriteOnly );
-    str << kapp->startupId();
+    str << tdeApp->startupId();
     TQCString replyType;
     TQByteArray replyData;
     if (!dcopClient()->call(m_dcopName, "dialog", "activate(TQCString)", 
@@ -313,7 +313,7 @@ extern "C" TDE_EXPORT int kdemain(int _argc, char *_argv[])
     }
 
     KCMShellMultiDialog *dlg = new KCMShellMultiDialog( dtype, 
-            i18n("Configure - %1").arg(kapp->caption()), 0, "", true );
+            i18n("Configure - %1").arg(tdeApp->caption()), 0, "", true );
 
     for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it)
         dlg->addModule(TDECModuleInfo(*it));
@@ -334,8 +334,8 @@ extern "C" TDE_EXPORT int kdemain(int _argc, char *_argv[])
     else
     {
 
-        if (kapp->iconName() != kapp->name())
-            setIcon(dlg, kapp->iconName());
+        if (tdeApp->iconName() != tdeApp->name())
+            setIcon(dlg, tdeApp->iconName());
         else if ( modules.count() == 1 )
             setIcon(dlg, TDECModuleInfo( modules.first()).icon());
 
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index 475dc070f..2e9a8a0ba 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -46,12 +46,12 @@ void TDEApplication_init_windows(bool /*GUIenabled*/)
 		+ "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" );
 	QTranslator *qt_transl = new QTranslator();
 	if (qt_transl->load( qt_transl_file, ""))
-		kapp->installTranslator( qt_transl );
+		tdeApp->installTranslator( qt_transl );
 	else
 		delete qt_transl;
 }
 
-//unsafe; create kapplication_p.h instead!
+//unsafe; create tdeapplication_p.h instead!
 typedef void* IceIOErrorHandler;
 
 class TDEApplicationPrivate
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 3aa6b9fa7..369f88c3d 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false;
 TDEClipboardSynchronizer * TDEClipboardSynchronizer::self()
 {
     if ( !s_self )
-        s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" );
+        s_self = new TDEClipboardSynchronizer( tdeApp, "KDE Clipboard" );
 
     return s_self;
 }
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 22843da4e..368aaef5d 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
 
   // If the application doesn't have a TQApplication object it can't use
   // a messagebox, as well as in case of GUI is disabled.
-  if ( nOutput == 1 && ( !kapp || !kapp->guiEnabled()) ) {
+  if ( nOutput == 1 && ( !tdeApp || !tdeApp->guiEnabled()) ) {
     nOutput = 2;
   } else if ( nOutput == 4 && nLevel != KDEBUG_FATAL ) {
       return;
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index fa1626701..3e262be3a 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -124,7 +124,7 @@ bool KDesktopFile::isDesktopFile(const TQString& path)
 
 bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path)
 {
-  if (!kapp || kapp->authorize("run_desktop_files"))
+  if (!tdeApp || tdeApp->authorize("run_desktop_files"))
      return true;
 
   if (path.isEmpty())
@@ -300,13 +300,13 @@ bool KDesktopFile::tryExec() const
     }
   }
   TQStringList list = 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;
      }
   }
@@ -320,7 +320,7 @@ bool KDesktopFile::tryExec() const
         user = ::getenv("ADMIN_ACCOUNT");
       if (user.isEmpty())
         user = "root";
-      if (!kapp->authorize("user/"+user))
+      if (!tdeApp->authorize("user/"+user))
         return false;
   }
   else {
@@ -333,7 +333,7 @@ bool KDesktopFile::tryExec() const
             user = ::getenv("ADMIN_ACCOUNT");
           if (user.isEmpty())
             user = "root";
-          if (!kapp->authorize("user/"+user))
+          if (!tdeApp->authorize("user/"+user))
             return false;
       }
   }
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 7b49ecfe4..a222d0242 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -48,7 +48,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
             all_accels = new TQValueList< TDEGlobalAccelPrivate* >;
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
-//	kapp->installX11EventFilter( this );
+//	tdeApp->installX11EventFilter( this );
 }
 
 TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 91cc94b74..a518c58c8 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -89,8 +89,8 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
             all_accels = new TQValueList< TDEGlobalAccelPrivate* >;
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
-	kapp->installX11EventFilter( this );
-	connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int)));
+	tdeApp->installX11EventFilter( this );
+	connect(tdeApp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int)));
 }
 
 TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index f6e267a86..db98fbffd 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -155,9 +155,9 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs)
     d->imgDict.setAutoDelete(true);
     d->links.setAutoDelete(true);
 
-    if (kapp) {
-        kapp->addKipcEventMask(KIPC::IconChanged);
-        TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure()));
+    if (tdeApp) {
+        tdeApp->addKipcEventMask(KIPC::IconChanged);
+        TQObject::connect(tdeApp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure()));
     }
 
     init( _appname, _dirs );
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 68dc72668..2d33aa80b 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -551,17 +551,17 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
          We need to make sure to clear the clipboard before unloading a DSO
          because the DSO could have defined an object derived from QMimeSource
          and placed that on the clipboard. */
-      /*kapp->clipboard()->clear();*/
+      /*tdeApp->clipboard()->clear();*/
 
       /* Well.. let's do something more subtle... convert the clipboard context
          to text. That should be safe as it only uses objects defined by Qt. */
-      if( kapp->clipboard()->ownsSelection()) {
-	kapp->clipboard()->setText(
-            kapp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection );
+      if( tdeApp->clipboard()->ownsSelection()) {
+	tdeApp->clipboard()->setText(
+            tdeApp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection );
       }
-      if( kapp->clipboard()->ownsClipboard()) {
-	kapp->clipboard()->setText(
-            kapp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard );
+      if( tdeApp->clipboard()->ownsClipboard()) {
+	tdeApp->clipboard()->setText(
+            tdeApp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard );
       }
     }
 
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index bfae6406a..8dc2f3f48 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate
 TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
     :   owner( owner_P )
     {
-    kapp->installX11EventFilter( this );
+    tdeApp->installX11EventFilter( this );
     }
     
 bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
@@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate
 TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
     :   watcher( watcher_P )
     {
-    kapp->installX11EventFilter( this );
+    tdeApp->installX11EventFilter( this );
     }
     
 bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index 1eb4b42fb..eaac81754 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -74,14 +74,14 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
                             int present, int level, const TQString &sound,
                             const TQString &file, int winId )
 {
-  if (!kapp) return 0;
+  if (!tdeApp) return 0;
 
   // ensure tray icon is shown and positioned before sending event to notification daemon
 #ifdef TQ_WS_X11
   XFlush(tqt_xdisplay());
 #endif
 
-  DCOPClient *client=kapp->dcopClient();
+  DCOPClient *client=tdeApp->dcopClient();
   if (!client->isAttached())
   {
     client->attach();
@@ -94,7 +94,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
   if( canAvoidStartupEvent( message, appname, present ))
       return -1; // done "successfully" - there will be no event presentation
 
-  int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
+  int uniqueId = kMax( 1, tdeApp->random() ); // must not be 0 -- means failure!
 
   // knotify daemon needs toplevel window
   TQWidget* widget = TQWidget::find( (WId)winId );
@@ -238,7 +238,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present)
 bool KNotifyClient::startDaemon()
 {
   static bool firstTry = true;
-  if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) {
+  if (!tdeApp->dcopClient()->isApplicationRegistered(daemonName)) {
     if( firstTry ) {
       firstTry = false;
       return TDEApplication::startServiceByDesktopName(daemonName) == 0;
@@ -251,12 +251,12 @@ bool KNotifyClient::startDaemon()
 
 void KNotifyClient::beep(const TQString& reason)
 {
-  if ( !kapp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) {
+  if ( !tdeApp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) {
     TQApplication::beep();
     return;
   }
 
-  DCOPClient *client=kapp->dcopClient();
+  DCOPClient *client=tdeApp->dcopClient();
   if (!client->isAttached())
   {
     client->attach();
@@ -307,7 +307,7 @@ public:
 	{
 		if (m_instances.isEmpty())
 		{
-			m_defaultInstance = new Instance(kapp);
+			m_defaultInstance = new Instance(tdeApp);
 		}
 		return m_instances.top();
 	}
@@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const
 // static methods
 
 // We always return a valid KNotifyClient::Instance here. If no special one
-// is available, we have a default-instance with kapp as TDEInstance.
+// is available, we have a default-instance with tdeApp as TDEInstance.
 // We make sure to always have that default-instance in the stack, because
 // the stack might have gotten cleared in the destructor.
 // We can't use QPtrStack::setAutoDelete( true ), because no instance besides
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 723c4bb45..d9afbf8f4 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -217,7 +217,7 @@ namespace KNotifyClient
 	 * placed appropriately.
 	 *
 	 * Call it by KNotifyClient::event(widget->winId(), "EventName");
-	 * It will use TDEApplication::kApplication->dcopClient() to communicate to
+	 * It will use TDEApplication::tdeApplication->dcopClient() to communicate to
 	 * the server
 	 * @param winId The winId() of the widget where the event originates
 	 * @param message The name of the event
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 256d03f17..50c413c47 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -46,7 +46,7 @@ public:
    * reproduced by starting the sequence with the same seed.
    *
    * If you need a single value which needs to be unpredictable, 
-   * you need to use kapp->random() instead.
+   * you need to use tdeApp->random() instead.
    * 
    * @param lngSeed Seed to initialize the sequence with.
    * If lngSeed is 0, the sequence is initialized with a value from
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index 6fac3179e..835cfd618 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -212,8 +212,8 @@ void KSocks::disable()
 KSocks *KSocks::self() {
   // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes.
   if (!_me) {
-     if (kapp) {
-        TDEConfigGroup cfg(kapp->config(), "Socks");
+     if (tdeApp) {
+        TDEConfigGroup cfg(tdeApp->config(), "Socks");
         _me = new KSocks(&cfg);
      } else {
         _disabled = true;
diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp
index b5f18ab04..37c15bcf9 100644
--- a/tdecore/kxmessages.cpp
+++ b/tdecore/kxmessages.cpp
@@ -42,8 +42,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P )
     {
     if( accept_broadcast_P != NULL )
         {
-        ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events
-        kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask
+        ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events
+        tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask
         accept_atom1 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false );
         accept_atom2 = accept_atom1;
         }
@@ -59,8 +59,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P, bool
     {
     if( accept_broadcast_P != NULL )
         {
-        ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events
-        kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask
+        ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events
+        tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask
         accept_atom2 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false );
         accept_atom1 = obsolete_P ? accept_atom2
             : XInternAtom( tqt_xdisplay(), TQCString( accept_broadcast_P ) + "_BEGIN", false );
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index c4ac6b4dc..f4388251f 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -467,7 +467,7 @@ void KSocksSocketDevice::initSocks()
   if (init)
     return;
 
-  if (kapp == 0L)
+  if (tdeApp == 0L)
     return;			// no TDEApplication, so don't initialise
                                 // this should, however, test for TDEInstance
 
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 5d098e4d4..5796bf060 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -110,8 +110,8 @@ TDEAccelEventHandler::TDEAccelEventHandler()
     : TQWidget( 0, "TDEAccelEventHandler" )
 {
 #	ifdef TQ_WS_X11
-	if ( kapp )
-		kapp->installX11EventFilter( this );
+	if ( tdeApp )
+		tdeApp->installX11EventFilter( this );
 #	endif
 }
 
@@ -120,10 +120,10 @@ bool	tqt_try_modal( TQWidget *, XEvent * );
 
 bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
 {
-	if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
+	if( TQWidget::keyboardGrabber() || !tdeApp->focusWidget() )
 		return false;
 
-	if ( !tqt_try_modal(kapp->focusWidget(), pEvent) )
+	if ( !tqt_try_modal(tdeApp->focusWidget(), pEvent) )
 	        return false;
 
 	if( pEvent->type == XKeyPress ) {
@@ -144,7 +144,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
 		ke.ignore();
 
 		g_bAccelActivated = false;
-		kapp->sendEvent( kapp->focusWidget(), &ke );
+		tdeApp->sendEvent( tdeApp->focusWidget(), &ke );
 
 		// If the Override event was accepted from a non-TDEAccel widget,
 		//  then kill the next AccelOverride in TDEApplication::notify.
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 7d18d3ba9..2cdc4b3a4 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
     Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
     Copyright (C) 1998, 1999, 2000 KDE Team
 
@@ -192,9 +192,9 @@ TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
 bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
 bool kde_kiosk_admin = false;
 
-TDEApplication* TDEApplication::KApp = 0L;
+TDEApplication* TDEApplication::TDEApp = nullptr;
 bool TDEApplication::loadedByKdeinit = false;
-DCOPClient *TDEApplication::s_DCOPClient = 0L;
+DCOPClient *TDEApplication::s_DCOPClient = nullptr;
 bool TDEApplication::s_dcopClientNeedsPostInit = false;
 
 #ifdef TQ_WS_X11
@@ -225,12 +225,12 @@ template class TQPtrList<KSessionManaged>;
 extern "C" {
 static int kde_xio_errhandler( Display * dpy )
 {
-  return kapp->xioErrhandler( dpy );
+  return tdeApp->xioErrhandler( dpy );
 }
 
 static int kde_x_errhandler( Display *dpy, XErrorEvent *err )
 {
-  return kapp->xErrhandler( dpy, err );
+  return tdeApp->xErrhandler( dpy, err );
 }
 
 }
@@ -238,8 +238,8 @@ static int kde_x_errhandler( Display *dpy, XErrorEvent *err )
 extern "C" {
 static void kde_ice_ioerrorhandler( IceConn conn )
 {
-    if(kapp)
-        kapp->iceIOErrorHandler( conn );
+    if(tdeApp)
+        tdeApp->iceIOErrorHandler( conn );
     // else ignore the error for now
 }
 }
@@ -925,7 +925,7 @@ TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const T
 
 int TDEApplication::xioErrhandler( Display* dpy )
 {
-    if(kapp)
+    if(tdeApp)
     {
         emit shutDown();
 #ifdef TQ_WS_X11
@@ -942,7 +942,7 @@ int TDEApplication::xErrhandler( Display* dpy, void* err_ )
 { // no idea how to make forward decl. for XErrorEvent
 #ifdef TQ_WS_X11
     XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
-    if(kapp)
+    if(tdeApp)
     {
         // add KDE specific stuff here
         d->oldXErrorHandler( dpy, err );
@@ -997,7 +997,7 @@ void TDEApplication::init(bool GUIenabled)
 
   TQApplication::setDesktopSettingsAware( false );
 
-  KApp = this;
+  TDEApp = this;
 
 
 #ifdef TQ_WS_X11 //FIXME(E)
@@ -1195,11 +1195,11 @@ DCOPClient *TDEApplication::dcopClient()
   {
     s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
   }
-  if( kapp ) {
+  if( tdeApp ) {
     connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)),
-            kapp, TQ_SLOT(dcopFailure(const TQString &)));
+            tdeApp, TQ_SLOT(dcopFailure(const TQString &)));
     connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
-            kapp, TQ_SLOT(dcopBlockUserInput(bool)) );
+            tdeApp, TQ_SLOT(dcopBlockUserInput(bool)) );
   }
   else
     s_dcopClientNeedsPostInit = true;
@@ -1583,10 +1583,10 @@ void TDEApplication::startKdeinit()
      srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
   if (srv.isEmpty())
      return;
-  if (kapp && (Tty != kapp->type()))
+  if (tdeApp && (Tty != tdeApp->type()))
     setOverrideCursor( TQt::waitCursor );
   my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup");
-  if (kapp && (Tty != kapp->type()))
+  if (tdeApp && (Tty != tdeApp->type()))
     restoreOverrideCursor();
 #endif
 }
@@ -1613,12 +1613,12 @@ void TDEApplication::dcopFailure(const TQString &msg)
      msgStr += msg;
      msgStr += i18n("\n\nPlease check that the \"dcopserver\" program is running!");
 
-     if (Tty != kapp->type())
+     if (Tty != tdeApp->type())
      {
        TQMessageBox::critical
          (
-           kapp->mainWidget(),
-           i18n("DCOP communications error (%1)").arg(kapp->caption()),
+           tdeApp->mainWidget(),
+           i18n("DCOP communications error (%1)").arg(tdeApp->caption()),
            msgStr,
            i18n("&OK")
          );
@@ -1870,7 +1870,7 @@ TDEApplication::~TDEApplication()
 
   // close down IPC
   delete s_DCOPClient;
-  s_DCOPClient = 0L;
+  s_DCOPClient = nullptr;
 
   TDEProcessController::deref();
 
@@ -1884,7 +1884,7 @@ TDEApplication::~TDEApplication()
 #endif
 
   delete d;
-  KApp = 0;
+  TDEApp = nullptr;
 
 #ifdef TQ_WS_X11
   mySmcConnection = 0;
@@ -2678,8 +2678,8 @@ void TDEApplication::invokeHelp( const TQString& anchor,
    {
        if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, startup_id, false))
        {
-           if (Tty != kapp->type())
-               TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+           if (Tty != tdeApp->type())
+               TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"),
                i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
            else
                kdWarning() << "Could not launch help:\n" << error << endl;
@@ -2713,8 +2713,8 @@ void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString&
    {
        if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, "", false))
        {
-           if (Tty != kapp->type())
-               TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+           if (Tty != tdeApp->type())
+               TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"),
                i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
            else
                kdWarning() << "Could not launch help:\n" << error << endl;
@@ -2984,8 +2984,8 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons
    // TODO this should check if cmd has a .desktop file, and use data from it, together
    // with sending more ASN data
    if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) {
-     if (Tty != kapp->type()) {
-       TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
+     if (Tty != tdeApp->type()) {
+       TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Mail Client"),
              i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
        }
      else {
@@ -3009,8 +3009,8 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu
 
    if (startServiceByDesktopName("kfmclient", url, &error, 0, 0, startup_id, false))
    {
-      if (Tty != kapp->type())
-          TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Browser"),
+      if (Tty != tdeApp->type())
+          TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Browser"),
                i18n("Could not launch the browser:\n\n%1").arg(error), i18n("&OK"));
       else
           kdWarning() << "Could not launch browser:\n" << error << endl;
@@ -3070,8 +3070,8 @@ startServiceInternal( const TQCString &function,
 
    // Register app as able to send DCOP messages
    DCOPClient *dcopClient;
-   if (kapp)
-      dcopClient = kapp->dcopClient();
+   if (tdeApp)
+      dcopClient = tdeApp->dcopClient();
    else
       dcopClient = new DCOPClient;
 
@@ -3081,7 +3081,7 @@ startServiceInternal( const TQCString &function,
       {
          if (error)
             *error = i18n("Could not register with DCOP.\n");
-         if (!kapp)
+         if (!tdeApp)
             delete dcopClient;
 
          return -1;
@@ -3116,11 +3116,11 @@ startServiceInternal( const TQCString &function,
    {
         if (error)
            *error = i18n("TDELauncher could not be reached via DCOP.\n");
-        if (!kapp)
+        if (!tdeApp)
            delete dcopClient;
         return -1;
    }
-   if (!kapp)
+   if (!tdeApp)
       delete dcopClient;
 
    if (noWait)
@@ -3720,7 +3720,7 @@ void TDEApplication::sigpipeHandler(int)
 
 bool TDEApplication::guiEnabled()
 {
-    return kapp && kapp->d->guiEnabled;
+    return tdeApp && tdeApp->d->guiEnabled;
 }
 
 void TDEApplication::virtual_hook( int id, void* data )
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 1922fa462..0383e757e 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
     Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
     Copyright (c) 1998, 1999 KDE Team
 
@@ -46,7 +46,7 @@ class KSessionManaged;
 class TDEStyle;
 class KURL;
 
-#define kapp TDEApplication::kApplication()
+#define tdeApp TDEApplication::tdeApplication()
 
 class TDEApplicationPrivate;
 
@@ -54,7 +54,7 @@ class TDEApplicationPrivate;
 * Controls and provides information to all KDE applications.
 *
 * Only one object of this class can be instantiated in a single app.
-* This instance is always accessible via the 'kapp' global variable.
+* This instance is always accessible via the 'tdeApp' global variable.
 * See cut() for an example.
 *
 * This class provides the following services to all KDE applications.
@@ -296,7 +296,7 @@ public:
    * to every function that may require it.
    * @return the current application object
    */
-  static TDEApplication* kApplication() { return KApp; }
+  static TDEApplication* tdeApplication() { return TDEApp; }
 
   /**
    * Returns the application session config object.
@@ -619,7 +619,7 @@ public slots:
    * If the widget with focus provides a cut() slot, call that slot.  Thus for a
    * simple application cut can be implemented as:
    * \code
-   * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() );
+   * KStdAction::cut( tdeApp, TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    */
   void cut();
@@ -628,7 +628,7 @@ public slots:
    * If the widget with focus provides a copy() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() );
+   * KStdAction::copy( tdeApp, TQ_SLOT( copy() ), actionCollection() );
    * \endcode
    */
   void copy();
@@ -637,7 +637,7 @@ public slots:
    * If the widget with focus provides a paste() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() );
+   * KStdAction::paste( tdeApp, TQ_SLOT( paste() ), actionCollection() );
    * \endcode
    */
   void paste();
@@ -646,7 +646,7 @@ public slots:
    * If the widget with focus provides a clear() slot, call that slot.  Thus for a
    * simple application clear() can be implemented as:
    * \code
-   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" );
+   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, tdeApp, TQ_SLOT( clear() ), actionCollection(), "clear" );
    * \endcode
    *
    * Note that for some widgets, this may not provide the intended bahavior.  For
@@ -673,7 +673,7 @@ public slots:
    * If the widget with focus provides a selectAll() slot, call that slot.  Thus for a
    * simple application select all can be implemented as:
    * \code
-   * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() );
+   * KStdAction::selectAll( tdeApp, TQ_SLOT( selectAll() ), actionCollection() );
    * \endcode
    */
   void selectAll();
@@ -898,7 +898,7 @@ public:
    * userCaption using a standard layout.
    *
    * To make a compliant caption
-   * for your window, simply do: @p setCaption(kapp->makeStdCaption(yourCaption));
+   * for your window, simply do: @p setCaption(tdeApp->makeStdCaption(yourCaption));
    *
    * @param userCaption The caption string you want to display in the
    * window caption area. Do not include the application name!
@@ -1278,7 +1278,7 @@ protected:
   int kipcEventMask;
 
   /// Current application object.
-  static TDEApplication *KApp;
+  static TDEApplication *TDEApp;
   int pArgc;
 
   /**
@@ -1301,7 +1301,7 @@ protected:
    * focused widget if it provides this slot.  You can combine this with TDEAction with:
    *
    * \code
-   * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQ_SLOT( cut() ), actionCollection() );
+   * KStdAction::deselect( static_cast<MyApplication *>( tdeApp ), TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    *
    * @see cut()
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 4f83e7716..43dc6eb0a 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -1178,7 +1178,7 @@ bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser)
     // Note: We don't ask the user if we should not ask this question again because we can't save the answer.
     errorMsg += i18n("Please contact your system administrator.");
     TQString cmdToExec = TDEStandardDirs::findExe(TQString("kdialog"));
-    TDEApplication *app = kapp;
+    TDEApplication *app = tdeApp;
     if (!cmdToExec.isEmpty() && app)
     {
       TDEProcess lprocess;
diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h
index 79e53dcc6..43a8e281e 100644
--- a/tdecore/tdeconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -1885,7 +1885,7 @@ public:
    * If an application computes a default value at runtime for
    * a certain entry, e.g. like:
    * \code
-   * TQColor computedDefault = kapp->palette().color(TQPalette::Active, TQColorGroup::Text)
+   * TQColor computedDefault = tdeApp->palette().color(TQPalette::Active, TQColorGroup::Text)
    * TQColor color = config->readEntry(key, computedDefault);
    * \encode
    *
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index 7b23f43b8..3864dcdd6 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -53,7 +53,7 @@ TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkelet
 {
   d = new Private();
 
-  kapp->installKDEPropertyMap();
+  tdeApp->installKDEPropertyMap();
   propertyMap = TQSqlPropertyMap::defaultMap();
 
   init(true);
diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index d3d9644a6..8f142f1f9 100644
--- a/tdecore/tdeconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
@@ -63,7 +63,7 @@ class TQSqlPropertyMap;
  * To add KColorButton the following code would be inserted in the main.
  *
  * \code
- * kapp->installKDEPropertyMap();
+ * tdeApp->installKDEPropertyMap();
  * TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap();
  * map->insert("KColorButton", "color");
  * \endcode
diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index 825c74400..d1c2f5a33 100644
--- a/tdecore/tdeconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -791,7 +791,7 @@ public:
    * Constructor.
    * 
    * @param configname name of config file. If no name is given, the default
-   * config file as returned by kapp()->config() is used.
+   * config file as returned by tdeApp()->config() is used.
    */
   TDEConfigSkeleton(const TQString & configname = TQString::null);
 
diff --git a/tdecore/tdecrash.cpp b/tdecore/tdecrash.cpp
index eceece166..e1ff0ab57 100644
--- a/tdecore/tdecrash.cpp
+++ b/tdecore/tdecrash.cpp
@@ -215,9 +215,9 @@ TDECrash::defaultCrashHandler (int sig)
             }
           }
 
-          if ( kapp && !kapp->startupId().isNull()) {
+          if ( tdeApp && !tdeApp->startupId().isNull()) {
             argv[i++] = "--startupid";
-            argv[i++] = kapp->startupId().data();
+            argv[i++] = tdeApp->startupId().data();
           }
 
           if ( safer )
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 97ef4394c..8540a4435 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -724,8 +724,8 @@ void TDEGlobalSettings::initPaths()
     }
 
     // Make sure this app gets the notifications about those paths
-    if (kapp)
-        kapp->addKipcEventMask(KIPC::SettingsChanged);
+    if (tdeApp)
+        tdeApp->addKipcEventMask(KIPC::SettingsChanged);
 }
 
 void TDEGlobalSettings::initColors()
@@ -803,7 +803,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
             // Keep in sync !
             s.handed = KMouseSettings::RightHanded;
             unsigned char map[20];
-            int num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20);
+            int num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
             if( num_buttons == 2 )
             {
                 if ( (int)map[0] == 1 && (int)map[1] == 2 )
diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp
index 4fe075831..cb9016062 100644
--- a/tdecore/tdehw/tderootsystemdevice.cpp
+++ b/tdecore/tdehw/tderootsystemdevice.cpp
@@ -851,7 +851,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState
 		TQByteArray data;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << (int)0 << (int)2 << (int)2;
-		if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
+		if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
 			return true;
 		}
 		return false;
@@ -902,7 +902,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState
 		TQByteArray data;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << (int)0 << (int)1 << (int)2;
-		if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
+		if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
 			return true;
 		}
 		return false;
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 22f2b0bc6..e34964c25 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -124,9 +124,9 @@ TDEStartupInfo::TDEStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P,
 void TDEStartupInfo::init( int flags_P )
     {
     // d == NULL means "disabled"
-    if( !TDEApplication::kApplication())
+    if( !tdeApp)
         return;
-    if( !TDEApplication::kApplication()->getDisplay())
+    if( !tdeApp->getDisplay())
         return;
 
     d = new TDEStartupInfoPrivate( flags_P );
@@ -183,7 +183,7 @@ class DelayedWindowEvent
 
 void TDEStartupInfo::slot_window_added( WId w_P )
     {
-    kapp->postEvent( this, new DelayedWindowEvent( w_P ));
+    tdeApp->postEvent( this, new DelayedWindowEvent( w_P ));
     }
 
 void TDEStartupInfo::customEvent( TQCustomEvent* e_P )
@@ -489,8 +489,8 @@ bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P,
 
 void TDEStartupInfo::appStarted()
     {
-    if( kapp != NULL )  // TDEApplication constructor unsets the env. variable
-        appStarted( kapp->startupId());
+    if( tdeApp != NULL )  // TDEApplication constructor unsets the env. variable
+        appStarted( tdeApp->startupId());
     else
         appStarted( TDEStartupInfo::currentStartupIdEnv().id());
     }
@@ -501,7 +501,7 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id )
     id.initId( startup_id );
     if( id.none())
         return;
-    if( kapp != NULL )
+    if( tdeApp != NULL )
         TDEStartupInfo::sendFinish( id );
     else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay()
         {
@@ -524,7 +524,7 @@ void TDEStartupInfo::disableAutoAppStartedSending( bool disable )
 void TDEStartupInfo::silenceStartup( bool silence )
     {
     TDEStartupInfoId id;
-    id.initId( kapp->startupId());
+    id.initId( tdeApp->startupId());
     if( id.none())
         return;
     TDEStartupInfoData data;
@@ -541,7 +541,7 @@ void TDEStartupInfo::handleAutoAppStartedSending()
 void TDEStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id )
     {
     bool activate = true;
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     if( window != NULL )
         {
         if( !startup_id.isEmpty() && startup_id != "0" )
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index b1b150df7..fff419532 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -92,9 +92,9 @@ KSycoca::KSycoca()
 {
    d = new KSycocaPrivate;
    // Register app as able to receive DCOP messages
-   if (kapp && !kapp->dcopClient()->isAttached())
+   if (tdeApp && !tdeApp->dcopClient()->isAttached())
    {
-      kapp->dcopClient()->attach();
+      tdeApp->dcopClient()->attach();
    }
    // We register with DCOP _before_ we try to open the database.
    // This way we can be relative sure that the KDE framework is
diff --git a/tdecore/tdeuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp
index 7db9f528e..1614ac3d7 100644
--- a/tdecore/tdeuniqueapplication.cpp
+++ b/tdecore/tdeuniqueapplication.cpp
@@ -187,8 +187,8 @@ TDEUniqueApplication::start()
 #ifdef TQ_WS_X11
            // say we're up and running ( probably no new window will appear )
            TDEStartupInfoId id;
-           if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
-               id.initId( kapp->startupId());
+           if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable
+               id.initId( tdeApp->startupId());
            else
                id = TDEStartupInfo::currentStartupIdEnv();
            if( !id.none())
@@ -211,8 +211,8 @@ TDEUniqueApplication::start()
      {
 #ifdef TQ_WS_X11
          TDEStartupInfoId id;
-         if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
-             id.initId( kapp->startupId());
+         if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable
+             id.initId( tdeApp->startupId());
          else
              id = TDEStartupInfo::currentStartupIdEnv();
          if( !id.none())
@@ -274,8 +274,8 @@ TDEUniqueApplication::start()
      TQCString new_asn_id;
 #if defined TQ_WS_X11
      TDEStartupInfoId id;
-     if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
-         id.initId( kapp->startupId());
+     if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable
+         id.initId( tdeApp->startupId());
      else
          id = TDEStartupInfo::currentStartupIdEnv();
      if( !id.none())
@@ -486,7 +486,7 @@ int TDEUniqueApplication::newInstance()
     // and what's important, it does it properly. If you reimplement newInstance(),
     // and don't call the inherited one, use this (but NOT when newInstance()
     // is called for the first time, like here).
-      TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
+      TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId());
 #endif
     }
   }
diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp
index 4614ed51e..3fadee13e 100644
--- a/tdecore/tests/KIDLTestClient.cpp
+++ b/tdecore/tests/KIDLTestClient.cpp
@@ -7,8 +7,8 @@ int main( int argc, char** argv )
 {
     TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ );
 
-    kapp->dcopClient()->attach();
-    // kapp->dcopClient()->registerAs( "kidlclienttest" );
+    tdeApp->dcopClient()->attach();
+    // tdeApp->dcopClient()->registerAs( "kidlclienttest" );
 
     KIDLTest_stub* t = new KIDLTest_stub( "kidlservertest", "Hello" );
 
diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp
index b8bb055d6..531d8dfd7 100644
--- a/tdecore/tests/dcopkonqtest.cpp
+++ b/tdecore/tests/dcopkonqtest.cpp
@@ -6,8 +6,8 @@ int main( int argc, char** argv )
 {
     TDEApplication app( argc, argv, "KIDLTestClient", false );
 
-    kapp->dcopClient()->attach();
-    // kapp->dcopClient()->registerAs( "kidlclienttest" );
+    tdeApp->dcopClient()->attach();
+    // tdeApp->dcopClient()->registerAs( "kidlclienttest" );
 
     TQByteArray data;
 
@@ -15,20 +15,20 @@ int main( int argc, char** argv )
        TQByteArray snd;
        TQByteArray rcv;
        TQCString _type_;
-       kapp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv );
+       tdeApp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv );
        kdDebug() << _type_ << endl;
        if( _type_ != "void" ) kdDebug() << "void expected, " << _type_.data() << " returned" << endl;
 
 /*
 debug("sending configure to object KonquerorIface in konqueror");
-    if (kapp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data ))
+    if (tdeApp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data ))
       debug("ok");
     else
       debug("ko");
 
 /// BROADCAST
 debug("sending databaseChanged to object tdesycoca in all apps");
-    if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data ))
+    if (tdeApp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data ))
       debug("ok");
     else
       debug("ko");
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index 72101d8b1..9692710e2 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -8,12 +8,12 @@
 MyObject::MyObject()
     : TQObject(0L, "testobj")
 {
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged()));
-    connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged()));
-    connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
-    connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
-    connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged()));
-    connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int)));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
+    connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged()));
+    connect(tdeApp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int)));
 }
 
 int main(int argc, char **argv)
diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp
index 44f1ce15a..f83d2a80f 100644
--- a/tdecore/tests/krandomsequencetest.cpp
+++ b/tdecore/tests/krandomsequencetest.cpp
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
    for(int i = 0; i < 20; i++)
       printf("%3ld ", seq.getLong(100));
 
-   seq.setSeed(kapp->random());
+   seq.setSeed(tdeApp->random());
 
    TQPtrList<TQString> list;
    list.append(new TQString("A"));
diff --git a/tdecore/tests/tdeuniqueapptest.cpp b/tdecore/tests/tdeuniqueapptest.cpp
index 9a002c6d8..7ea5b6308 100644
--- a/tdecore/tests/tdeuniqueapptest.cpp
+++ b/tdecore/tests/tdeuniqueapptest.cpp
@@ -54,6 +54,6 @@ main(int argc, char *argv[])
    TestApp a;
 
    printf("Running.\n");
-   kapp->exec();
+   tdeApp->exec();
    printf("Terminating.\n");
 }
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index d69b3f6f4..cb67ab02a 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -29,7 +29,7 @@
   -background, you get the same thing.
 
   in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used 
-  by the static method Kapplication::addCmdLineOptions to add the Qt options
+  by the static method TDEApplication::addCmdLineOptions to add the Qt options
   but its' entries look like this:
 
   { "background <color>", I18N_NOOP("sets the default background color and an\n
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 3871f3513..6e96b3b66 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -167,7 +167,7 @@ ContextWidget::ContextWidget()
 	: TQWidget(0,0)
     {
 	twin_net_create_atoms();
-	kapp->installX11EventFilter( this );
+	tdeApp->installX11EventFilter( this );
 	TQWhatsThis::enterWhatsThisMode();
 	TQCursor c = *TQApplication::overrideCursor();
 	TQWhatsThis::leaveWhatsThisMode();
@@ -241,7 +241,7 @@ void KWin::activateWindow( WId win, long time )
     if( time == 0 )
         time = get_tqt_x_user_time();
     info.setActiveWindow( win, NET::FromApplication, time,
-        kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 );
+        tdeApp->activeWindow() ? tdeApp->activeWindow()->winId() : 0 );
 #endif // TQ_WS_X11 ...
     TDEUniqueApplication::setHandleAutoStarted();
 }
@@ -312,9 +312,9 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
         */
         if( tqt_cast< TQDialog* >( subwindow ) != NULL
             && subwindow->parentWidget() == NULL
-            && kapp->mainWidget() != NULL )
+            && tdeApp->mainWidget() != NULL )
         {
-            kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget(),"
+            kdWarning() << "KWin::setMainWindow(): There either mustn't be tdeApp->mainWidget(),"
                 " or the dialog must have a non-NULL parent, otherwise Qt will reset the change. Bummer." << endl;
         }
         XSetTransientForHint( tqt_xdisplay(), subwindow->winId(), mainwindow );
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index fc1a37574..e34a012fd 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -71,8 +71,8 @@ public:
           strutSignalConnected( false ),
           what( _what )
     {
-	kapp->installX11EventFilter( this );
-	(void ) kapp->desktop(); //trigger desktop widget creation to select root window events
+	tdeApp->installX11EventFilter( this );
+	(void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events
         activate();
 	updateStackingOrder();
     }
@@ -468,13 +468,13 @@ void KWinModule::setDesktopName( int desktop, const TQString& name )
 
 void KWinModule::doNotManage( const TQString& title )
 {
-    if ( !kapp->dcopClient()->isAttached() )
-	kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+	tdeApp->dcopClient()->attach();
     TQByteArray data, replyData;
     TQCString replyType;
     TQDataStream arg(data, IO_WriteOnly);
     arg << title;
-    kapp->dcopClient()->call("twin", "", "doNotManage(TQString)",
+    tdeApp->dcopClient()->call("twin", "", "doNotManage(TQString)",
 			     data, replyType, replyData);
 }
 
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 27fb181bb..afeac6132 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -860,12 +860,12 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
   }
 
   if (dontShowAgain) {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
     config->writeEntry("ReportJavaScriptErrors",TQVariant(false));
     config->sync();
     TQByteArray data;
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
   }
 
   return (m_mode != Stop);
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index c27573844..346af3d08 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -117,7 +117,7 @@ DOMString HTMLDocumentImpl::cookie() const
     TQByteArray params, reply;
     TQDataStream stream(params, IO_WriteOnly);
     stream << URL().url() << windowId;
-    if (!kapp->dcopClient()->call("kcookiejar", "kcookiejar",
+    if (!tdeApp->dcopClient()->call("kcookiejar", "kcookiejar",
                                   "findDOMCookies(TQString,long int)", params,
                                   replyType, reply))
     {
@@ -151,12 +151,12 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
     fake_header.append(value.string().latin1());
     fake_header.append("\n");
     stream << URL().url() << fake_header << windowId;
-    if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+    if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
                                   "addCookies(TQString,TQCString,long int)", params))
     {
          // Maybe it wasn't running (e.g. we're opening local html files)
          TDEApplication::startServiceByDesktopName( "kcookiejar");
-         if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+         if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
                                        "addCookies(TQString,TQCString,long int)", params))
              kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
     }
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 640473489..cf7f12590 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -726,7 +726,7 @@ void KJavaAppletServer::waitForReturnData(JSStackFrame * frame) {
     killTimers();
     startTimer(15000);
     while (!frame->exit)
-        kapp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
+        tdeApp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
     if (d->jsstack.size() <= 1)
         killTimers();
     kdDebug(6100) << "<KJavaAppletServer::waitForReturnData stacksize:" << d->jsstack.size() << endl;
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5a00e14eb..237d74408 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -303,7 +303,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     // check codebase first
     const KURL kbaseURL( baseurl );
     const KURL newURL(kbaseURL, codebase);
-    if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL))
+    if (tdeApp->authorizeURLAction("redirect", KURL(baseurl), newURL))
         applet->setCodeBase (newURL.url());
     applet->setAppletClass (classname);
     KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl);
@@ -329,7 +329,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         TQDataStream stream(params, IO_WriteOnly);
         stream << info << m_view->topLevelWidget()->winId();
 
-        if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
+        if (!tdeApp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
             kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
         } else if ( replyType == "TDEIO::AuthInfo" ) {
             TQDataStream stream2( reply, IO_ReadOnly );
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 50525c342..8b98f0749 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -1022,7 +1022,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
     KURL fullURL (m_doc->completeURL( url.string() )); \
     if ( !fullURL.isValid() || \
          ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file" && fullURL.protocol() != "data") || \
-         doRedirectCheck && ( kapp && m_doc && !kapp->authorizeURLAction("redirect", m_doc->URL(), fullURL))) \
+         doRedirectCheck && ( tdeApp && m_doc && !tdeApp->authorizeURLAction("redirect", m_doc->URL(), fullURL))) \
          return 0L;
 
 CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index c18cd53ac..5a5dbaa58 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -657,7 +657,7 @@ void TDEHTMLPopupGUIClient::slotSendImage()
     TQStringList urls;
     urls.append( d->m_imageURL.url());
     TQString subject = d->m_imageURL.url();
-    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
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 1b74c5388..81cd2fa97 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
   d->m_startOffset = 0;
   d->m_endOffset = 0;
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+  connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
 
   d->m_jobPercent = 0;
@@ -2426,7 +2426,7 @@ void TDEHTMLPart::slotRedirect()
   if ( openedByJS() && d->m_opener )
       cUrl = d->m_opener->url();
 
-  if (!kapp || !kapp->authorizeURLAction("redirect", cUrl, url))
+  if (!tdeApp || !tdeApp->authorizeURLAction("redirect", cUrl, url))
   {
     kdWarning(6050) << "TDEHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl;
     emit completed();
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
 
   // The lineedit of the dialog would make tdehtml lose its selection, otherwise
 #ifndef TQT_NO_CLIPBOARD
-  disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
+  disconnect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Now show the dialog in which the user can choose options.
@@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
     return;
 
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
+  connect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Create the KFind object
@@ -4779,7 +4779,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB
                                                       KGuiItem(i18n("&Send Unencrypted")),
                                                       "WarnOnUnencryptedForm");
           // Move this setting into KSSL instead
-          TDEConfig *config = kapp->config();
+          TDEConfig *config = tdeApp->config();
           TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
           TDEConfigGroupSaver saver( config, grpNotifMsgs );
 
@@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
 #ifndef TQT_NO_CLIPBOARD
     TQString text = selectedText();
     text.replace(TQChar(0xa0), ' ');
-    disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
-    kapp->clipboard()->setText(text,TQClipboard::Selection);
-    connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+    disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
+    tdeApp->clipboard()->setText(text,TQClipboard::Selection);
+    connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
     //kdDebug( 6000 ) << "selectedText = " << text << endl;
     emitSelectionChanged();
@@ -6819,7 +6819,7 @@ bool TDEHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message,
   bool linkAllowed = true;
 
   if ( d->m_doc )
-    linkAllowed = kapp && kapp->authorizeURLAction("redirect", url(), linkURL);
+    linkAllowed = tdeApp && tdeApp->authorizeURLAction("redirect", url(), linkURL);
 
   if ( !linkAllowed ) {
     tdehtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index bbc45da95..8aac65a36 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -493,7 +493,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
     d = new TDEHTMLViewPrivate;
     TQScrollView::setVScrollBarMode(d->vmode);
     TQScrollView::setHScrollBarMode(d->hmode);
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
     connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved()));
 
     // initialize QScrollView
@@ -4574,12 +4574,12 @@ void TDEHTMLView::scrollTick() {
     d->dy -= ddy;
 
 //    TQScrollView::setContentsPos( contentsX() + ddx, contentsY() + ddy);
-    kapp->syncX();
+    tdeApp->syncX();
     TQScrollView::scrollBy(ddx, ddy);
 // Unaccelerated X can get seriously overloaded by scrolling and for some reason
 // will send KeyPress events only infrequently. This should help to reduce
 // the load.
-    kapp->syncX();
+    tdeApp->syncX();
 }
 
 void TDEHTMLView::startScrolling()
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 81b0b9a4e..12769358e 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -139,7 +139,7 @@ void PartMonitor::waitForCompletion()
 
 	sm_highestMonitor = this;
 
-        kapp->enter_loop();
+        tdeApp->enter_loop();
 
         //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) );
         //m_timeout_timer->stop();
@@ -147,12 +147,12 @@ void PartMonitor::waitForCompletion()
     }
 
     TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) );
-    kapp->enter_loop();
+    tdeApp->enter_loop();
 }
 
 void PartMonitor::timeout()
 {
-    kapp->exit_loop();
+    tdeApp->exit_loop();
 }
 
 void PartMonitor::finishTimers()
@@ -164,7 +164,7 @@ void PartMonitor::finishTimers()
         TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) );
         return;
     }
-    kapp->exit_loop();
+    tdeApp->exit_loop();
 }
 
 void PartMonitor::partCompleted()
@@ -324,7 +324,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
             PartMonitor pm(m_part);
             m_part->openURL(url);
             pm.waitForCompletion();
-	    kapp->processEvents(60000);
+	    tdeApp->processEvents(60000);
             break;
         }
 	case OpenPageAsUrl: {
@@ -361,7 +361,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
 		m_part->end();
 		pm.waitForCompletion();
 	    }
-	    kapp->processEvents(60000);
+	    tdeApp->processEvents(60000);
 	    break;
 	}
 	case Begin: {
@@ -376,7 +376,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
         }
         case End: {
             m_part->end();
-	    kapp->processEvents(60000);
+	    tdeApp->processEvents(60000);
             break;
         }
 	case ExecuteScript: {
@@ -386,11 +386,11 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
 	    proxy->evaluate("",0,code,0,&comp);
 	    if (comp.complType() == Throw)
 		exec->setException(comp.value());
-	    kapp->processEvents(60000);
+	    tdeApp->processEvents(60000);
 	    break;
 	}
 	case ProcessEvents: {
-	    kapp->processEvents(60000);
+	    tdeApp->processEvents(60000);
 	    break;
 	}
     }
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 245585d74..e280d195c 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -2349,7 +2349,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const
         return false;
 
     // do we allow this suburl ?
-    if ( !kapp || (newURL.protocol() != "javascript" && !kapp->authorizeURLAction("redirect", thisPart->url(), newURL)) )
+    if ( !tdeApp || (newURL.protocol() != "javascript" && !tdeApp->authorizeURLAction("redirect", thisPart->url(), newURL)) )
         return false;
 
     // We allow one level of self-reference because some sites depend on that.
@@ -2409,7 +2409,7 @@ void DocumentImpl::abort()
 {
     if (m_inSyncLoad) {
 	m_inSyncLoad = false;
-	kapp->exit_loop();
+	tdeApp->exit_loop();
     }
 
     if (m_loadingXMLDoc)
@@ -2421,7 +2421,7 @@ void DocumentImpl::load(const DOMString &uri)
 {
     if (m_inSyncLoad) {
 	m_inSyncLoad = false;
-	kapp->exit_loop();
+	tdeApp->exit_loop();
     }
 
     m_hadLoadError = false;
@@ -2447,7 +2447,7 @@ void DocumentImpl::load(const DOMString &uri)
 
     if (!m_async && m_docLoading) {
 	m_inSyncLoad = true;
-	kapp->enter_loop();
+	tdeApp->enter_loop();
     }
 }
 
@@ -2470,7 +2470,7 @@ void DocumentImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DOMString
     m_docLoading = false;
     if (m_inSyncLoad) {
 	m_inSyncLoad = false;
-	kapp->exit_loop();
+	tdeApp->exit_loop();
     }
 
     assert(m_loadingXMLDoc != 0);
@@ -2483,7 +2483,7 @@ void DocumentImpl::error(int err, const TQString &text)
     m_docLoading = false;
     if (m_inSyncLoad) {
 	m_inSyncLoad = false;
-	kapp->exit_loop();
+	tdeApp->exit_loop();
     }
 
     m_hadLoadError = true;
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index c254ebaa4..a65493979 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -246,8 +246,8 @@ void TDELauncher::close()
 void
 TDELauncher::destruct(int exit_code)
 {
-   if (kapp) ((TDELauncher*)kapp)->close();
-   // We don't delete kapp here, that's intentional.
+   if (tdeApp) ((TDELauncher*)tdeApp)->close();
+   // We don't delete tdeApp here, that's intentional.
    ::exit(exit_code);
 }
 
diff --git a/tdeinit/tests/tdelaunchertest.cpp b/tdeinit/tests/tdelaunchertest.cpp
index 07eaf21f7..8586a936d 100644
--- a/tdeinit/tests/tdelaunchertest.cpp
+++ b/tdeinit/tests/tdelaunchertest.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
 
    TDEApplication k(argc, argv, "tdelaunchertest");
  
-   kapp->dcopClient()->registerAs( kapp->name()) ;
+   tdeApp->dcopClient()->registerAs( tdeApp->name()) ;
 
 #if 0
    TQString error;
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cpp b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
index 44c591ef4..b2185d46e 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cpp
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
@@ -95,7 +95,7 @@ TQStringList TDECrashBookmarkImporterImpl::getCrashLogs()
 {
     TQMap<TQString, bool> activeLogs;
 
-    DCOPClient* dcop = kapp->dcopClient();
+    DCOPClient* dcop = tdeApp->dcopClient();
 
     QCStringList apps = dcop->registeredApplications();
     for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) 
diff --git a/tdeio/bookmarks/kbookmarkmenu.cpp b/tdeio/bookmarks/kbookmarkmenu.cpp
index 070912eb5..6eedb2ca0 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cpp
+++ b/tdeio/bookmarks/kbookmarkmenu.cpp
@@ -401,9 +401,9 @@ void RMB::slotRMBActionCopyLocation( int val )
 
   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 );
   }
 }
@@ -478,7 +478,7 @@ void KBookmarkMenu::refill()
 
 void KBookmarkMenu::addAddBookmarksList()
 {
-  if (!kapp->authorizeTDEAction("bookmarks"))
+  if (!tdeApp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Bookmark Tabs as Folder..." );
@@ -498,7 +498,7 @@ void KBookmarkMenu::addAddBookmarksList()
 
 void KBookmarkMenu::addAddBookmark()
 {
-  if (!kapp->authorizeTDEAction("bookmarks"))
+  if (!tdeApp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Add Bookmark" );
@@ -518,7 +518,7 @@ void KBookmarkMenu::addAddBookmark()
 
 void KBookmarkMenu::addEditBookmarks()
 {
-  if (!kapp->authorizeTDEAction("bookmarks"))
+  if (!tdeApp->authorizeTDEAction("bookmarks"))
      return;
 
   TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ),
@@ -530,7 +530,7 @@ void KBookmarkMenu::addEditBookmarks()
 
 void KBookmarkMenu::addNewFolder()
 {
-  if (!kapp->authorizeTDEAction("bookmarks"))
+  if (!tdeApp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "&New Bookmark Folder..." );
@@ -553,7 +553,7 @@ void KBookmarkMenu::addNewFolder()
 
 void KBookmarkMenu::fillBookmarkMenu()
 {
-  if (!kapp->authorizeTDEAction("bookmarks"))
+  if (!tdeApp->authorizeTDEAction("bookmarks"))
      return;
 
   if ( m_bIsRoot )
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 2bee1af83..4a578db0e 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -187,7 +187,7 @@ KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long
     kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
               << ", WindowId = " << windowId << endl;
     if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
+        tdeApp->updateUserTimestamp( usertime );
 
     TQString key = createCacheKey(info);
 
@@ -256,7 +256,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo
     if ( !info.password.isEmpty() ) // should we really allow the caller to pre-fill the password?
         kdDebug(130) <<  "password was set by caller" << endl;
     if( usertime != 0 )
-        kapp->updateUserTimestamp( usertime );
+        tdeApp->updateUserTimestamp( usertime );
 
     TQString key = createCacheKey(info);
     Request *request = new Request;
diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp
index 2c502ce5a..d7fb0e936 100644
--- a/tdeio/kssl/ksslinfodlg.cpp
+++ b/tdeio/kssl/ksslinfodlg.cpp
@@ -465,11 +465,11 @@ TQScrollView *KSSLInfoDlg::buildCertInfo(const TQString &certName) {
 }
 
 void KSSLInfoDlg::urlClicked(const TQString &url) {
-    kapp->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void KSSLInfoDlg::mailClicked(const TQString &url) {
-    kapp->invokeMailer(url, TQString::null);
+    tdeApp->invokeMailer(url, TQString::null);
 }
 
 #include "ksslinfodlg.moc"
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index 1d2cf8f87..76722c8d4 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -34,7 +34,7 @@
 namespace KPAC
 {
     ProxyScout::QueuedRequest::QueuedRequest( const KURL& u )
-        : transaction( kapp->dcopClient()->beginTransaction() ),
+        : transaction( tdeApp->dcopClient()->beginTransaction() ),
           url( u )
     {
     }
@@ -135,7 +135,7 @@ namespace KPAC
             TQDataStream ds( data, IO_WriteOnly );
             if ( success ) ds << handleRequest( ( *it ).url );
             else ds << TQString( "DIRECT" );
-            kapp->dcopClient()->endTransaction( ( *it ).transaction, type, data );
+            tdeApp->dcopClient()->endTransaction( ( *it ).transaction, type, data );
         }
         m_requestQueue.clear();
         m_downloader->deleteLater();
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 009ea348b..6c8f722d7 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -283,7 +283,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid,
 			kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl;
 		// allow dialog activation even if it interrupts, better than trying hacks
 		// with keeping the dialog on top or on all desktops
-		kapp->updateUserTimestamp();
+		tdeApp->updateUserTimestamp();
 	}
 	if( modal )
 		KWin::setState( dialog->winId(), NET::Modal );
@@ -301,7 +301,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid,
 void TDEWalletD::checkActiveDialog() {
 	if( !activeDialog || !activeDialog->isShown())
 		return;
-	kapp->updateUserTimestamp();
+	tdeApp->updateUserTimestamp();
 	KWin::setState( activeDialog->winId(), NET::KeepAbove );
 	KWin::setOnAllDesktops( activeDialog->winId(), true );
 	KWin::forceActiveWindow( activeDialog->winId());
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index b675ee4de..40e26ed43 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -1037,7 +1037,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) {
 void UIServer::slotQuit()
 {
   m_shuttingDown = true;
-  kapp->quit();
+  tdeApp->quit();
 }
 
 void UIServer::slotUpdate() {
@@ -1360,7 +1360,7 @@ void UIServer::resizeEvent(TQResizeEvent* e)
 
 bool UIServer::queryClose()
 {
-  if (( !m_shuttingDown ) && !kapp->sessionSaving()) {
+  if (( !m_shuttingDown ) && !tdeApp->sessionSaving()) {
     hide();
     return false;
   }
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index ab8e64d92..11a6f6512 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -73,10 +73,10 @@ static KURL rootUrl(const KURL &url)
     KURL root = url;
     root.setPath( "/" );
 
-    if (!kapp->authorizeURLAction("list", KURL(), root))
+    if (!tdeApp->authorizeURLAction("list", KURL(), root))
     {
         root = KURL::fromPathOrURL( TQDir::homeDirPath() );
-        if (!kapp->authorizeURLAction("list", KURL(), root))
+        if (!tdeApp->authorizeURLAction("list", KURL(), root))
         {
             root = url;
         }
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index ba54383a0..a73f34915 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -135,7 +135,7 @@ void TDEIconCanvas::slotLoadFiles()
     TQStringList::ConstIterator end(mFiles.end());
     for (it=mFiles.begin(), i=0; it!=end; ++it, i++)
     {
-	// Calling kapp->processEvents() makes the iconview flicker like hell
+	// Calling tdeApp->processEvents() makes the iconview flicker like hell
 	// (it's being repainted once for every new item), so we don't do this.
 	// Instead, we directly repaint the progress bar without going through
 	// the event-loop. We do that just once for every 10th item so that
@@ -146,7 +146,7 @@ void TDEIconCanvas::slotLoadFiles()
         }
 
         emitProgress++;
-//	kapp->processEvents();
+//	tdeApp->processEvents();
         if ( !d->m_bLoading ) // user clicked on a button that will load another set of icons
             break;
 	TQImage img;
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index b4f4d9c7d..24e1227ab 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -816,11 +816,11 @@ void KNotifyWidget::save()
         ++it;
     }
 
-    if ( kapp )
+    if ( tdeApp )
     {
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
     }
 
     emit changed( false );
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 527f53b51..b1fdbaacc 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -388,7 +388,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls )
 void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 {
   d = new KOpenWithDlgPrivate;
-  bool bReadOnly = kapp && !kapp->authorize("shell_access");
+  bool bReadOnly = tdeApp && !tdeApp->authorize("shell_access");
   m_terminaldirty = false;
   m_pTree = 0L;
   m_pService = 0L;
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 21bfb378b..aa25ac10f 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
     insertPlugin (p);
   }
 
-  if ( kapp->authorizeTDEAction("sharefile") &&
+  if ( tdeApp->authorizeTDEAction("sharefile") &&
        KFileSharePropsPlugin::supports( m_items ) )
   {
     KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -971,7 +971,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
     connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() ));
 
-    if (!kapp->authorizeTDEAction("editfiletype"))
+    if (!tdeApp->authorizeTDEAction("editfiletype"))
        button->hide();
 #endif
 
@@ -3628,7 +3628,7 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items )
     return false;
   // open file and check type
   KDesktopFile config( item->url().path(), true /* readonly */ );
-  return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+  return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
 }
 
 void KPropertiesDialog::virtual_hook( int id, void* data )
@@ -3906,7 +3906,7 @@ bool KExecPropsPlugin::supports( KFileItemList _items )
     return false;
   // open file and check type
   KDesktopFile config( item->url().path(), true /* readonly */ );
-  return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access");
+  return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access");
 }
 
 void KExecPropsPlugin::applyChanges()
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index cf5d97692..e1e911400 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -529,7 +529,7 @@ void KFileDialog::slotOk()
             return;
     }
 
-    if (!kapp->authorizeURLAction("open", KURL(), d->url))
+    if (!tdeApp->authorizeURLAction("open", KURL(), d->url))
     {
         TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL());
         KMessageBox::error( d->mainWidget, msg);
@@ -547,7 +547,7 @@ void KFileDialog::slotOk()
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
         {
-            if (!kapp->authorizeURLAction("open", KURL(), *it))
+            if (!tdeApp->authorizeURLAction("open", KURL(), *it))
             {
                 TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL());
                 KMessageBox::error( d->mainWidget, msg);
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index 5943ae402..5bdea2fd8 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -149,19 +149,19 @@ Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m
                  Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
     }
     // Don't exit while this job is running
-    if (kapp)
-        kapp->ref();
-    if (kapp)
-        updateUserTimestamp( kapp->userTimestamp());
+    if (tdeApp)
+        tdeApp->ref();
+    if (tdeApp)
+        updateUserTimestamp( tdeApp->userTimestamp());
 }
 
 Job::~Job()
 {
     delete m_speedTimer;
     delete d;
-    if (kapp)
+    if (tdeApp)
     {
-      kapp->deref();
+      tdeApp->deref();
     }
 }
 
@@ -315,7 +315,7 @@ void Job::slotSpeedTimeout()
 void Job::showErrorDialog( TQWidget * parent )
 {
   //kdDebug(7007) << "Job::showErrorDialog parent=" << parent << endl;
-  kapp->enableStyles();
+  tdeApp->enableStyles();
   // Show a message box, except for "user canceled" or "no content"
   if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) {
     //old plain error message
@@ -736,7 +736,7 @@ void MkdirJob::start(Slave *slave)
 void MkdirJob::slotRedirection( const KURL &url)
 {
      kdDebug(7007) << "MkdirJob::slotRedirection(" << url << ")" << endl;
-     if (!kapp->authorizeURLAction("redirect", m_url, url))
+     if (!tdeApp->authorizeURLAction("redirect", m_url, url))
      {
        kdWarning(7007) << "MkdirJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl;
        m_error = ERR_ACCESS_DENIED;
@@ -906,7 +906,7 @@ void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry )
 void StatJob::slotRedirection( const KURL &url)
 {
      kdDebug(7007) << "StatJob::slotRedirection(" << url << ")" << endl;
-     if (!kapp->authorizeURLAction("redirect", m_url, url))
+     if (!tdeApp->authorizeURLAction("redirect", m_url, url))
      {
        kdWarning(7007) << "StatJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl;
        m_error = ERR_ACCESS_DENIED;
@@ -1001,7 +1001,7 @@ void TransferJob::slotData( const TQByteArray &_data)
 void TransferJob::slotRedirection( const KURL &url)
 {
      kdDebug(7007) << "TransferJob::slotRedirection(" << url << ")" << endl;
-     if (!kapp->authorizeURLAction("redirect", m_url, url))
+     if (!tdeApp->authorizeURLAction("redirect", m_url, url))
      {
        kdWarning(7007) << "TransferJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl;
        return;
@@ -1408,7 +1408,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo
       _url.setPath("/");
     }
 
-    if (!_error && !kapp->authorizeURLAction("open", KURL(), _url))
+    if (!_error && !tdeApp->authorizeURLAction("open", KURL(), _url))
         _error = TDEIO::ERR_ACCESS_DENIED;
 
     // if request is not valid, return an invalid transfer job
@@ -2162,7 +2162,7 @@ void ListJob::slotResult( TDEIO::Job * job )
 
 void ListJob::slotRedirection( const KURL & url )
 {
-     if (!kapp->authorizeURLAction("redirect", m_url, url))
+     if (!tdeApp->authorizeURLAction("redirect", m_url, url))
      {
        kdWarning(7007) << "ListJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl;
        return;
@@ -2235,7 +2235,7 @@ void ListJob::setUnrestricted(bool unrestricted)
 
 void ListJob::start(Slave *slave)
 {
-    if (kapp && !kapp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted))
+    if (tdeApp && !tdeApp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted))
     {
         m_error = ERR_ACCESS_DENIED;
         m_errorText = m_url.url();
@@ -3431,7 +3431,7 @@ void CopyJob::copyNextFile()
                        TQDataStream streamout(param,IO_WriteOnly);
                        streamout<<(*it).uSource;
                        streamout<<(*it).uDest;
-                       if ( kapp && kapp->dcopClient()->call( "kded",
+                       if ( tdeApp && tdeApp->dcopClient()->call( "kded",
                             "mountwatcher", "createLink(KURL, KURL)", param,retType,data,false ) )
                        {
                           TQDataStream streamin(data,IO_ReadOnly);
@@ -4561,7 +4561,7 @@ bool MultiGetJob::findCurrentEntry()
 void MultiGetJob::slotRedirection( const KURL &url)
 {
   if (!findCurrentEntry()) return; // Error
-  if (kapp && !kapp->authorizeURLAction("redirect", m_url, url))
+  if (tdeApp && !tdeApp->authorizeURLAction("redirect", m_url, url))
   {
      kdWarning(7007) << "MultiGetJob: Redirection from " << m_currentEntry->url << " to " << url << " REJECTED!" << endl;
      return;
diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index 8a7a67632..28edba63b 100644
--- a/tdeio/tdeio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -68,7 +68,7 @@ int KDCOPServiceStarter::findServiceFor( const TQString& serviceType,
     KService::Ptr ptr = offers.first();
     TQCString dcopService = ptr->property("X-DCOP-ServiceName").toString().latin1();
 
-    if ( !kapp->dcopClient()->isApplicationRegistered( dcopService ) )
+    if ( !tdeApp->dcopClient()->isApplicationRegistered( dcopService ) )
     {
         TQString error;
         if ( startServiceFor( serviceType, constraint, preferences, &error, &dcopService, flags ) != 0 )
@@ -93,5 +93,5 @@ int KDCOPServiceStarter::startServiceFor( const TQString& serviceType,
         return -1;
     KService::Ptr ptr = offers.first();
     kdDebug() << "KDCOPServiceStarter: starting " << ptr->desktopEntryPath() << endl;
-    return kapp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService );
+    return tdeApp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService );
 }
diff --git a/tdeio/tdeio/kdcopservicestarter.h b/tdeio/tdeio/kdcopservicestarter.h
index 04f8d7ee2..21699dc9a 100644
--- a/tdeio/tdeio/kdcopservicestarter.h
+++ b/tdeio/tdeio/kdcopservicestarter.h
@@ -68,7 +68,7 @@ public:
      * Find an implementation of the given @p serviceType,
      * and start it, to use its DCOP interface.
      * The default implementation uses TDETrader to find the preferred Application,
-     * and then starts it using kapp->startService...
+     * and then starts it using tdeApp->startService...
      *
      * However applications (like kontact) can reimplement this method, to provide
      * an in-process way of loading the implementation for this service type.
diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index 50bbc6678..5e9296752 100644
--- a/tdeio/tdeio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -35,7 +35,7 @@ public:
                     const TQString &caption = TQString::null)
     {
 	if (TDEApplication::guiEnabled()) {
-     	  kapp->enableStyles();
+     	  tdeApp->enableStyles();
       	  KMessageBox::error( parent, text, caption );
 	} else 
 	  kdWarning() << text << endl;
@@ -46,7 +46,7 @@ public:
                     const TQString &caption = TQString::null)
     {
       if (TDEApplication::guiEnabled()) {
-	 kapp->enableStyles();
+	 tdeApp->enableStyles();
          KMessageBox::sorry( parent, text, caption );
       } else
 	kdWarning() << text << endl;
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index d85d7c541..0555e2285 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -1015,7 +1015,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
     if(!function.endsWith("(KURL::List)")) {
       kdWarning() << "Desktop file " << path << " contains an invalid X-TDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
     } else {
-      if(kapp->dcopClient()->call( app, object,
+      if(tdeApp->dcopClient()->call( app, object,
                    function.utf8(),
                    dataToSend, replyType, replyData, true, -1)
 	    && replyType == "TQStringList" ) {
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 46fc8b535..3dda0cc19 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -143,7 +143,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window,
   {
     if ( u.isLocalFile() && runExecutables)
     {
-      if (kapp->authorize("shell_access"))
+      if (tdeApp->authorize("shell_access"))
       {
         TQString path = u.path();
         shellQuote( path );
@@ -165,7 +165,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window,
     if (!runExecutables)
       noRun = true;
 
-    if (!kapp->authorize("shell_access"))
+    if (!tdeApp->authorize("shell_access"))
       noAuth = true;
   }
 
@@ -213,7 +213,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles )
 
 bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName )
 {
-    if (kapp && !kapp->authorizeTDEAction("openwith"))
+    if (tdeApp && !tdeApp->authorizeTDEAction("openwith"))
     {
        // TODO: Better message, i18n freeze :-(
        KMessageBox::sorry(0L, i18n("You are not authorized to open this file."));
@@ -922,7 +922,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_
   m_timer.start( 0, true );
   kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl;
 
-  kapp->ref();
+  tdeApp->ref();
 }
 
 void KRun::init()
@@ -989,7 +989,7 @@ void KRun::init()
     m_timer.start( 0, true );
     return;
   }
-  if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL))
+  if ( !tdeApp->authorizeURLAction( "open", KURL(), m_strURL))
   {
     TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL());
     d->m_showingError = true;
@@ -1120,7 +1120,7 @@ KRun::~KRun()
   kdDebug(7010) << "KRun::~KRun() " << this << endl;
   m_timer.stop();
   killJob();
-  kapp->deref();
+  tdeApp->deref();
   kdDebug(7010) << "KRun::~KRun() done " << this << endl;
   delete d;
 }
@@ -1540,9 +1540,9 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p)
     // relatively to current directory,  and then in the PATH.
     if ( !TQFile( binName ).exists() && TDEStandardDirs::findExe( binName ).isEmpty() )
     {
-      kapp->ref();
+      tdeApp->ref();
       KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) );
-      kapp->deref();
+      tdeApp->deref();
     }
   }
 #ifdef TQ_WS_X11
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 74df1a6b1..c69c982fb 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -786,7 +786,7 @@ bool KService::noDisplay() const {
 #endif
   }
 
-  if (!kapp->authorizeControlModule(d->menuId))
+  if (!tdeApp->authorizeControlModule(d->menuId))
      return true;
 
   return false;
@@ -924,7 +924,7 @@ void KService::rebuildKSycoca(TQWidget *parent)
                       i18n("Updating system configuration."));
 
   TQByteArray data;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
 
   int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
                data, &dlg, TQ_SLOT(slotFinished()));
diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index b013e2059..f5c44c702 100644
--- a/tdeio/tdeio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
@@ -133,7 +133,7 @@ KShred::fillrandom()
     // assumes that 4096 is a multipe of sizeof(long int)
     int limit = (n + sizeof(long int) - 1) / sizeof(long int);
     for (int i = 0; i < limit; i++)
-      buff[i] = kapp->random();
+      buff[i] = tdeApp->random();
 
     if (!writeData((unsigned char *) buff, n))
       return false;
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 7c79d48f3..2ea5d03fc 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -113,7 +113,7 @@ protected:
 	void done()
 	{
 		if ( !m_terminationRequested )
-			kapp->postEvent( m_receiver, new CompletionMatchEvent( this ) );
+			tdeApp->postEvent( m_receiver, new CompletionMatchEvent( this ) );
 		else
 			delete this;
 	}
@@ -1162,7 +1162,7 @@ TQString KURLCompletion::listDirectories(
 		{
 			KURL url;
 			url.setPath(*it);
-			if ( kapp->authorizeURLAction( "list", KURL(), url ) )
+			if ( tdeApp->authorizeURLAction( "list", KURL(), url ) )
 				dirs.append( *it );
 		}
 
diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp
index 2309c2142..41bd7dbc6 100644
--- a/tdeio/tdeio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -52,12 +52,12 @@ const int KDEBUG_OBSERVER = 7007; // Should be 7028
 Observer::Observer() : DCOPObject("TDEIO::Observer")
 {
     // Register app as able to receive DCOP messages
-    if (kapp && !kapp->dcopClient()->isAttached())
+    if (tdeApp && !tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
-    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+    if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
         kdDebug(KDEBUG_OBSERVER) << "Starting tdeio_uiserver" << endl;
         TQString error;
@@ -70,7 +70,7 @@ Observer::Observer() : DCOPObject("TDEIO::Observer")
             kdDebug(KDEBUG_OBSERVER) << "startServiceByDesktopPath returned " << ret << endl;
 
     }
-    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+    if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
         kdDebug(KDEBUG_OBSERVER) << "The application tdeio_uiserver is STILL NOT REGISTERED" << endl;
     else
         kdDebug(KDEBUG_OBSERVER) << "tdeio_uiserver registered" << endl;
@@ -82,7 +82,7 @@ int Observer::newJob( TDEIO::Job * job, bool showProgress )
 {
     // Tell the UI Server about this new job, and give it the application id
     // at the same time
-    int progressId = m_uiserver->newJob( kapp->dcopClient()->appId(), showProgress );
+    int progressId = m_uiserver->newJob( tdeApp->dcopClient()->appId(), showProgress );
 
     // Keep the result in a dict
     m_dctJobs.insert( progressId, job );
@@ -353,7 +353,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
     arg << caption;
     arg << buttonYes;
     arg << buttonNo;
-    if ( kapp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
+    if ( tdeApp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
         && replyType == "int" )
     {
         int result;
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index ce2ae5323..4b5aee5ab 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -557,7 +557,7 @@ RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption,
                                       time_t mtimeSrc,
                                       time_t mtimeDest)
 {
-  Q_ASSERT(kapp);
+  Q_ASSERT(tdeApp);
 
   RenameDlg dlg( 0L, _caption, _src, _dest, _mode,
                  sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest,
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index abc631284..95b5a778c 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -125,7 +125,7 @@ TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 
 Scheduler::Scheduler()
           : DCOPObject( "TDEIO::Scheduler" ),
-           TQObject(kapp, "scheduler"),
+           TQObject(tdeApp, "scheduler"),
            slaveTimer(0, "Scheduler::slaveTimer"),
            coSlaveTimer(0, "Scheduler::coSlaveTimer"),
            cleanupTimer(0, "Scheduler::cleanupTimer")
@@ -890,7 +890,7 @@ Scheduler::_registerWindow(TQWidget *wid)
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << windowId;
-      if( !kapp->dcopClient()->send( "kded", "kded",
+      if( !tdeApp->dcopClient()->send( "kded", "kded",
                     "registerWindowId(long int)", params ) )
       kdDebug(7006) << "Could not register window with kded!" << endl;
    }
@@ -909,12 +909,12 @@ Scheduler::slotUnregisterWindow(TQObject *obj)
    disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)),
               this, TQ_SLOT(slotUnregisterWindow(TQObject*)));
    m_windowList.remove( it );
-   if (kapp)
+   if (tdeApp)
    {
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << windowId;
-      kapp->dcopClient()->send( "kded", "kded",
+      tdeApp->dcopClient()->send( "kded", "kded",
                     "unregisterWindowId(long int)", params );
    }
 }
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index ffc09d559..f28e3b2c2 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -134,7 +134,7 @@ void SkipDlg::b2Pressed()
 
 SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text )
 {
-  Q_ASSERT(kapp);
+  Q_ASSERT(tdeApp);
 
   SkipDlg dlg( 0L, _multi, _error_text, true );
   return (SkipDlg_Result) dlg.exec();
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index f8e3dccc8..915c4fa55 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -235,7 +235,7 @@ void Slave::hold(const KURL &url)
    deref();
    // Call TDELauncher::waitForSlave(pid);
    {
-      DCOPClient *client = kapp->dcopClient();
+      DCOPClient *client = tdeApp->dcopClient();
       if (!client->isAttached())
          client->attach();
 
@@ -359,7 +359,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     if (protocol == "data")
         return new DataProtocol();
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
 
@@ -464,7 +464,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
     if (protocol == "data")
         return 0;
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
 
diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 1b9e853ed..e2a681581 100644
--- a/tdeio/tdeio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -511,7 +511,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString
 
     TQString caption( _caption );
     if ( type == TDEIO::SlaveBase::SSLMessageBox )
-        caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp
+        caption = TQString::fromUtf8(tdeApp->dcopClient()->appId()); // hack, see observer.cpp
 
     emit needProgressId();
     kdDebug(7007) << "SlaveInterface::messageBox m_progressId=" << m_progressId << endl;
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index b7e9c1650..6905907c2 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -207,7 +207,7 @@ void KIOExec::slotRunApp()
 #ifdef TQ_WS_X11
     // propagate the startup indentification to the started process
     TDEStartupInfoId id;
-    id.initId( kapp->startupId());
+    id.initId( tdeApp->startupId());
     id.setupStartupEnv();
 #endif
 
@@ -265,7 +265,7 @@ void KIOExec::slotRunApp()
         }
     }
 
-    //kapp->quit(); not efficient enough
+    //tdeApp->quit(); not efficient enough
     exit(0);
 }
 
diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp
index 96d39c3c2..40a0ec934 100644
--- a/tdeio/tests/getalltest.cpp
+++ b/tdeio/tests/getalltest.cpp
@@ -7,7 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption
 
 //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
    kdDebug() << "All services" << endl;
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index 15770c941..8a17b2aec 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -197,7 +197,7 @@ void JobTest::get()
     TDEIO::StoredTransferJob* job = TDEIO::storedGet( u );
     connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
             this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) );
-    kapp->eventLoop()->enterLoop();
+    tdeApp->eventLoop()->enterLoop();
     assert( m_result == 0 ); // no error
     assert( m_data.size() == 11 );
     assert( memcmp (m_data, "Hello world", m_data.size()) == 0 ); // m_data is not null-terminated
@@ -207,7 +207,7 @@ void JobTest::slotGetResult( TDEIO::Job* job )
 {
     m_result = job->error();
     m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data();
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
 }
 
 ////
diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 728214487..632960031 100644
--- a/tdeio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -40,9 +40,9 @@ TestService::TestService(const TQString &exec)
 
    proc.start();
 
-   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)),
+   connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)),
            this, TQ_SLOT(newApp(const TQCString&)));
-   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)),
+   connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)),
            this, TQ_SLOT(endApp(const TQCString&)));
    connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)),
            this, TQ_SLOT(appExit()));
@@ -79,19 +79,19 @@ void TestService::appExit()
 
 void TestService::stop()
 {
-   kapp->exit_loop();
+   tdeApp->exit_loop();
 }
 
 int TestService::exec()
 {
-   kapp->enter_loop();
+   tdeApp->enter_loop();
    return result;
 }
 
 int main(int argc, char *argv[])
 {
    setenv("IGNORE_SYCOCA_VERSION", "true", true);
-   TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption
 
    k.dcopClient()->setNotifications(true);
 
diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp
index b3f778772..fb4bc2bd3 100644
--- a/tdeio/tests/kdefaultprogresstest.cpp
+++ b/tdeio/tests/kdefaultprogresstest.cpp
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
         {
             dlg->slotProcessedFiles( 0L, ++files );
         }
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) );
 
diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index c10a36898..8f4b6d075 100644
--- a/tdeio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
@@ -56,7 +56,7 @@ Receiver::Receiver()
         start = new TQPushButton( "Launch KRuns", this );
         stop = new TQPushButton( "Stop those KRuns", this );
         stop->setEnabled(false);
-        TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) );
+        TQObject::connect( h, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) );
         TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) );
         TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) );
 
diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 0c517c808..1f2740527 100644
--- a/tdeio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -54,7 +54,7 @@ void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) {
 
 void SpeedTest::finished(Job*) {
     kdDebug() << "job finished" << endl;
-    kapp->quit();
+    tdeApp->quit();
 }
 
 static TDECmdLineOptions options[] =
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index bd5a1f1bb..7a44f5313 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -184,7 +184,7 @@ void KioslaveTest::slotQuit(){
   }
   if (slave)
     TDEIO::Scheduler::disconnectSlave(slave);
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index f21402405..9747f2d0f 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -67,7 +67,7 @@ void debug(const char *format, const char *txt)
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs TDEApp for makeStdCaption
 
    TQCString instname = "kword";
    TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp
index 5b390efa6..9b0f686b5 100644
--- a/tdeio/tests/tdesycocaupdatetest.cpp
+++ b/tdeio/tests/tdesycocaupdatetest.cpp
@@ -4,7 +4,7 @@
 
 int main(int argc, char *argv[])
 {
-   TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs TDEApp for makeStdCaption
 
    KService::rebuildKSycoca(0);
    return 0;
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index a014387a2..c60097aaf 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -89,7 +89,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     {
         // No window associated... make sure the user notices our dialog.
         KWin::setState( winId(), NET::KeepAbove );
-        kapp->updateUserTimestamp();
+        tdeApp->updateUserTimestamp();
     }
 # endif
 #endif
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index eb4cca5e5..229cb1da2 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -50,14 +50,14 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 
    TDEInstance a("kcookiejar");
    
-   kapp->dcopClient()->attach();
+   tdeApp->dcopClient()->attach();
 
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString replyType;
    TQByteArray replyData;
    if (args->isSet("remove-all"))
    {
-      kapp->dcopClient()->call( "kded", "kcookiejar", "deleteAllCookies()", TQByteArray(), replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "deleteAllCookies()", TQByteArray(), replyType, replyData);
    }
    if (args->isSet("remove"))
    {
@@ -65,7 +65,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << domain;
-      kapp->dcopClient()->call( "kded", "kcookiejar", "deleteCookiesFromDomain(TQString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "deleteCookiesFromDomain(TQString)", params, replyType, replyData);
    }
    if (args->isSet("shutdown"))
    {
@@ -73,11 +73,11 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << module;
-      kapp->dcopClient()->call( "kded", "kded", "unloadModule(TQCString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kded", "unloadModule(TQCString)", params, replyType, replyData);
    }
    else if(args->isSet("reload-config"))
    {
-      kapp->dcopClient()->call( "kded", "kcookiejar", "reloadPolicy()", TQByteArray(), replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "reloadPolicy()", TQByteArray(), replyType, replyData);
    }
    else
    {
@@ -85,7 +85,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << module;
-      kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", params, replyType, replyData);
    }
 
    return 0;
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index cdc35d208..d732d807b 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -552,7 +552,7 @@ void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix)
   {
     m_tb->setTab(it1.current()->id(),false);
   }
-  kapp->syncX();
+  tdeApp->syncX();
   m_delayedRaise=-1;
 
   for (TQMap<KDockWidget*,KDockButton_Private*>::iterator it=m_overlapButtons.begin();
@@ -569,8 +569,8 @@ void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix)
         m_tb->setTab(it.data(),true);
         tabClicked(it.data());
         m_ws->raiseWidget(it.key());
-        kapp->sendPostedEvents();
-        kapp->syncX();*/
+        tdeApp->sendPostedEvents();
+        tdeApp->syncX();*/
 
         m_delayedRaise=it.data();
         TQTimer::singleShot(0,this,TQ_SLOT(delayedRaise()));
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 32f0c2aea..199582469 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -93,12 +93,12 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
   m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQ_SLOT(nextToolViewInDock()),
   actionCollection(),"tdemdi_next_toolview"));
 
-  actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
+  actionCollection()->readShortcutSettings( "Shortcuts", tdeApp->config() );
 }
 
 GUIClient::~GUIClient()
 {
-//     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() );
+//     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", tdeApp->config() );
   for (uint i=0;i<m_toolViewActions.count();i++)
     disconnect(m_toolViewActions.at(i),0,this,0);
 
@@ -139,7 +139,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
 
   // 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/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index c5b3e10ee..c558120d8 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -599,7 +599,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 	for ( ;it1.current() != 0;++it1 )
 		m_tb->setTab( it1.current() ->id(), false );
 
-	kapp->syncX();
+	tdeApp->syncX();
 	m_delayedRaise = -1;
 
 	for ( TQMap<KDockWidget*, KDockButton_Private*>::iterator it = m_overlapButtons.begin();
@@ -723,7 +723,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
 	{
 		m_tb->setTab( it1.current() ->id(), false );
 	}
-	kapp->syncX();
+	tdeApp->syncX();
 	m_delayedRaise = -1;
 
 	for ( TQMap<KDockWidget*, KDockButton_Private*>::iterator it = m_overlapButtons.begin();
@@ -740,8 +740,8 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
 				        m_tb->setTab(it.data(),true);
 				        tabClicked(it.data());
 				        m_ws->raiseWidget(it.key());
-				        kapp->sendPostedEvents();
-				        kapp->syncX();*/
+				        tdeApp->sendPostedEvents();
+				        tdeApp->syncX();*/
 
 				m_delayedRaise = it.data();
 				TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) );
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index d10ef90bb..1d7e56d42 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -166,13 +166,13 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ),
 	                            actionCollection(), "tdemdi_next_toolview" ) );
 
-	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
+	actionCollection() ->readShortcutSettings( "Shortcuts", tdeApp->config() );
 }
 
 KMDIGUIClient::~KMDIGUIClient()
 {
 
-	//     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() );
+	//     actionCollection()->writeShortcutSettings( "KMDI Shortcuts", tdeApp->config() );
 	for ( uint i = 0;i < m_toolViewActions.count();i++ )
 		disconnect( m_toolViewActions.at( i ), 0, this, 0 );
 
@@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 
 	// try to read the action shortcut
 	TDEShortcut sc;
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	TQString _grp = cfg->group();
 	cfg->setGroup( "Shortcuts" );
 	// 	if ( cfg->hasKey( aname ) )
diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp
index 9a1cb2ee2..fa2f7277a 100644
--- a/tdenewstuff/downloaddialog.cpp
+++ b/tdenewstuff/downloaddialog.cpp
@@ -351,7 +351,7 @@ void DownloadDialog::slotResult(TDEIO::Job *job)
 
   kdDebug() << "got data: " << m_data[job] << endl;
 
-  kapp->config()->setGroup("TDENewStuffStatus");
+  tdeApp->config()->setGroup("TDENewStuffStatus");
 
   dom.setContent(m_data[job]);
   knewstuff = dom.documentElement();
@@ -434,8 +434,8 @@ int DownloadDialog::installStatus(Entry *entry)
 
   TQString lang = TDEGlobal::locale()->language();
 
-  kapp->config()->setGroup("TDENewStuffStatus");
-  datestring = kapp->config()->readEntry(entry->name(lang));
+  tdeApp->config()->setGroup("TDENewStuffStatus");
+  datestring = tdeApp->config()->readEntry(entry->name(lang));
   if(datestring.isNull()) installed = 0;
   else
   {
@@ -667,9 +667,9 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job )
 
 void DownloadDialog::install(Entry *e)
 {
-  kapp->config()->setGroup("TDENewStuffStatus");
-  kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate)));
-  kapp->config()->sync();
+  tdeApp->config()->setGroup("TDENewStuffStatus");
+  tdeApp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate)));
+  tdeApp->config()->sync();
 
   TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
 
@@ -843,7 +843,7 @@ void DownloadDialog::slotSelected()
 void DownloadDialog::slotEmail(const TQString& link)
 {
   kdDebug() << "EMAIL: " << link << endl;
-  kapp->invokeMailer(link);
+  tdeApp->invokeMailer(link);
   slotSelected(); // TQTextBrowser oddity workaround as it cannot handle mailto: URLs
 }
 
diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 5d843afeb..4e8ad57f4 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -290,7 +290,7 @@ void Engine::upload( Entry *entry )
 {
   if ( mUploadFile.isNull()) {
     mUploadFile = entry->fullName();
-    mUploadFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadFile );
+    mUploadFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadFile );
 
     if ( !d->mNewStuff->createUploadFile( mUploadFile ) ) {
       KMessageBox::error( mParentWidget, i18n("Unable to create file to upload.") );
@@ -329,7 +329,7 @@ void Engine::upload( Entry *entry )
                                                i18n("Upload Info"),
                                                KStdGuiItem::close() );
       if ( result == KMessageBox::Yes ) {
-        kapp->invokeBrowser( noUploadUrl.url() );
+        tdeApp->invokeBrowser( noUploadUrl.url() );
       }
     }
   } else {
@@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry )
 
   if ( mUploadMetaFile.isNull() ) {
     mUploadMetaFile = entry->fullName() + ".meta";
-    mUploadMetaFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadMetaFile );
+    mUploadMetaFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadMetaFile );
   }
 
   TQFile f( mUploadMetaFile );
diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp
index e636dbc73..ed9540098 100644
--- a/tdenewstuff/ghns.cpp
+++ b/tdenewstuff/ghns.cpp
@@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget()
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   buttonLayout->addWidget( closeButton );
-  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
 }
 
 GhnsWidget::~GhnsWidget()
diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp
index 5702c3c7b..ad77d68d6 100644
--- a/tdenewstuff/testnewstuff.cpp
+++ b/tdenewstuff/testnewstuff.cpp
@@ -82,7 +82,7 @@ MyWidget::MyWidget()
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   topLayout->addWidget( closeButton );
-  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
 }
 
 MyWidget::~MyWidget()
diff --git a/tdenewstuff/uploaddialog.cpp b/tdenewstuff/uploaddialog.cpp
index a8e13a493..c6a52d1e7 100644
--- a/tdenewstuff/uploaddialog.cpp
+++ b/tdenewstuff/uploaddialog.cpp
@@ -136,7 +136,7 @@ void UploadDialog::slotOk()
   entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() );
 
   if ( mPayloadUrl.isValid() ) {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup( TQString("TDENewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
     conf->writeEntry("name", mNameEdit->text());
     conf->writeEntry("author", mAuthorEdit->text());
@@ -164,7 +164,7 @@ void UploadDialog::setPayloadFile( const TQString &payloadFile )
 {
   mPayloadUrl = payloadFile;
 
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup( TQString("TDENewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
   TQString name = conf->readEntry("name");
   TQString author = conf->readEntry("author");
diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 067895872..11eebfad4 100644
--- a/tdeparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
@@ -40,7 +40,7 @@ public:
 HistoryProvider * HistoryProvider::self()
 {
     if ( !s_self )
-	s_self = new HistoryProvider( kapp, "history provider" );
+	s_self = new HistoryProvider( tdeApp, "history provider" );
     return s_self;
 }
 
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 07538003e..3a0c711bd 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -639,7 +639,7 @@ DrMain* KMCupsManager::loadFileDriver(const TQString& filename)
 DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 {
 	TQStringList	comps = TQStringList::split('/', drname, false);
-	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 #else
@@ -807,7 +807,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
 
 bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d)
 {
-	TQString	tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8);
+	TQString	tmpfilename = locateLocal("tmp","print_") + tdeApp->randomString(8);
 
 	// first save the driver in a temporary file
 	saveDriverFile(d,tmpfilename);
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index f0afae75b..7a305345c 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -253,7 +253,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 	connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 
-	if (!kapp->authorize("print/copies"))
+	if (!tdeApp->authorize("print/copies"))
 	{
 		setTitle(i18n("Pages"));
 		m_copybox->hide();
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 25691e673..18e5f8628 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -410,9 +410,9 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) );
 	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
-	d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection");
-	d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection");
-	d->b_systemEnabled = kapp->authorize("print/system") && kapp->authorize("print/selection");
+	d->b_optionsEnabled = tdeApp->authorize("print/options") && tdeApp->authorize("print/selection");
+	d->b_propertiesEnabled = tdeApp->authorize("print/properties") && tdeApp->authorize("print/selection");
+	d->b_systemEnabled = tdeApp->authorize("print/system") && tdeApp->authorize("print/selection");
 	                
 	if (!d->b_systemEnabled)
 	{
@@ -430,7 +430,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 		d->m_wizard->hide();
 	}
 
-	if (!kapp->authorize("print/selection"))
+	if (!tdeApp->authorize("print/selection"))
 	{
 		d->m_extbtn->hide();
 		m_pbox->hide();
@@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on)
 
 void KPrintDialog::slotHelp()
 {
-	kapp->invokeHelp(TQString::null, "tdeprint");
+	tdeApp->invokeHelp(TQString::null, "tdeprint");
 }
 
 void KPrintDialog::slotOutputFileSelected(const TQString& txt)
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 1f6d51a07..518a0a903 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -218,7 +218,7 @@ void KPrinter::saveSettings()
 
 bool KPrinter::setup(TQWidget *parent, const TQString& caption, bool forceExpand)
 {
-	if (!kapp->authorize("print/dialog"))
+	if (!tdeApp->authorize("print/dialog"))
 	{
 		autoConfigure(TQString::null, parent);
 		return true; // Just print it
@@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer)
 					args << "-d";
 					args << printerName();
 					args << "--noshow";
-					kapp->tdeinitExec("kjobviewer", args);
+					tdeApp->tdeinitExec("kjobviewer", args);
 				}
 			}
 		}
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index c61feadd8..2318a09a0 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -197,7 +197,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
 	kdDebug(500) << "tdeprint: print command: " << cmd << endl;
 
 	int result = 0;
-	DCOPClient	*dclient = kapp->dcopClient();
+	DCOPClient	*dclient = tdeApp->dcopClient();
 	if (!dclient || (!dclient->isAttached() && !dclient->attach()))
 	{
 		return result;
@@ -232,7 +232,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 	if (printer && !msg.isEmpty())
 		message.prepend(i18n("Printing document: %1").arg(printer->docName())+"\n");
 
-	DCOPClient	*dclient = kapp->dcopClient();
+	DCOPClient	*dclient = tdeApp->dcopClient();
 	if (!dclient || (!dclient->isAttached() && !dclient->attach()))
 	{
 		return;
@@ -242,7 +242,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 	TQDataStream arg( data, IO_WriteOnly );
 	arg << message;
 	arg << (int)getpid();
-	arg << kapp->caption();
+	arg << tdeApp->caption();
 	dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data );
 }
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index e2642e514..abd41c213 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -56,7 +56,7 @@ bool KPreviewProc::startPreview()
 {
 	if (start())
 	{
-		kapp->enter_loop();
+		tdeApp->enter_loop();
 		return m_bOk;
 	}
 	else
@@ -65,7 +65,7 @@ bool KPreviewProc::startPreview()
 
 void KPreviewProc::slotProcessExited(TDEProcess* proc)
 {
-	kapp->exit_loop();
+	tdeApp->exit_loop();
 	if ( proc->normalExit() && proc->exitStatus() == 0 )
 		m_bOk = true;
 	else
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 8d7bf0b37..aae4bbe03 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -224,7 +224,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
 	// is not self-contained. If the printer is removed (when
 	// changing printer name), the template would be also removed
 	TQString	origfilename = maticFile(entry);
-	TQString	filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	filename = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 	::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename)));
 	DrMain	*driver = Foomatic2Loader::loadDriver(filename);
 	if (driver)
@@ -246,7 +246,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 		return NULL;
 	}
 
-	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
+	TQString	tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
 	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
@@ -291,7 +291,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 
 bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*)
 {
-	TQFile	tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8)));
+	TQFile	tmpFile(locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)));
 	TQFile	inFile(driver->get("template"));
 	TQString	outFile = maticFile(entry);
 	bool	result(false);
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 720b213a3..50020aec9 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -51,7 +51,7 @@ KMDBCreator::~KMDBCreator()
 bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d)
 {
 	// don't block GUI
-	kapp->processEvents();
+	tdeApp->processEvents();
 
 	// first check current directory
 	TQFileInfo	dfi(dirname);
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 80c44a5a8..11c717ff4 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -177,7 +177,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
 	}
 
 	// don't block GUI
-	kapp->processEvents();
+	tdeApp->processEvents();
 }
 
 /*
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index c64f765a8..5f0c6756b 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -324,7 +324,7 @@ void KMJobViewer::initActions()
 	}
 	else
 	{// stand-alone application
-		KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection());
+		KStdAction::quit(tdeApp,TQ_SLOT(quit()),actionCollection());
 		KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection());
 		KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
 
@@ -674,7 +674,7 @@ void KMJobViewer::reload()
 
 void KMJobViewer::closeEvent(TQCloseEvent *e)
 {
-	if (m_standalone && !kapp->sessionSaving())
+	if (m_standalone && !tdeApp->sessionSaving())
 	{
 		hide();
 		e->ignore();
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 87f2e21f2..6d7b20399 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -244,7 +244,7 @@ void KMWizard::slotNext()
 
 void KMWizard::slotHelp()
 {
-	kapp->invokeHelp(TQString::null, "tdeprint");
+	tdeApp->invokeHelp(TQString::null, "tdeprint");
 }
 
 void KMWizard::enableWizard()
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 27c7bba47..7467440e8 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -178,7 +178,7 @@ bool KMWSocketUtil::scanNetwork(TQProgressBar *bar)
 		if (bar)
 		{
 			bar->setProgress(i);
-			kapp->flushX();
+			tdeApp->flushX();
 		}
 	}
 	return true;
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 1b0ecb183..a052c69d8 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -403,7 +403,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
 		TQString	namestr = git.current()->name();
 		if (namestr.isEmpty())
 		{
-			namestr = "group_"+kapp->randomString(4);
+			namestr = "group_"+tdeApp->randomString(4);
 		}
 		git.current()->setName(namestr);
 		item = new TQListViewItem(parent, item, git.current()->get("text"), git.current()->name());
@@ -420,7 +420,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
 		TQString	namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6);
 		if (namestr.isEmpty())
 		{
-			namestr = "option_"+kapp->randomString(4);
+			namestr = "option_"+tdeApp->randomString(4);
 		}
 		oit.current()->setName(namestr);
 		item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr);
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index ba3d69c8b..a676e1cd6 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -65,7 +65,7 @@ void MessageWindow::slotTimer()
 	if ( !isVisible() )
 	{
 		show();
-		kapp->processEvents();
+		tdeApp->processEvents();
 	}
 }
 
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 402f30824..fee09c62e 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -123,7 +123,7 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 		KURL url( re.cap( 1 ) );
 		if ( !url.isLocalFile() )
 		{
-			TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) );
+			TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + tdeApp->randomString( 8 ) );
 			command.replace( re, TDEProcess::quote( tmpFilename ) );
 			proc->setOutput( re.cap( 1 ) );
 			proc->setTempOutput( tmpFilename );
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index 0a234b518..3dfce4589 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -254,7 +254,7 @@ TDE_EXPORT bool RandRScreen::confirm()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                TDEApplication::kApplication()->mainWidget(),
+                tdeApp->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Setting Change"),
@@ -275,7 +275,7 @@ TDE_EXPORT bool RandRScreen::confirm()
 
 	m_shownDialog = &acceptDialog;
 	connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed()));
-	connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
+	connect( tdeApp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 
         return acceptDialog.exec();
 }
@@ -283,7 +283,7 @@ TDE_EXPORT bool RandRScreen::confirm()
 TDE_EXPORT void RandRScreen::shownDialogDestroyed()
 {
     m_shownDialog = NULL;
-    disconnect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
+    disconnect( tdeApp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 }
 
 TDE_EXPORT void RandRScreen::desktopResized()
@@ -846,7 +846,7 @@ TDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                TDEApplication::kApplication()->mainWidget(),
+                tdeApp->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Settings"),
@@ -867,7 +867,7 @@ TDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 
 	m_shownDialog = &acceptDialog;
 	connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed()));
-	connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
+	connect( tdeApp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 
         return acceptDialog.exec();
 }
diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp
index ee93fc8b0..e08c0bd87 100644
--- a/tderesources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -48,9 +48,9 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family )
   mId = TDEApplication::randomString( 8 );
 
   // Register with DCOP
-  if ( !kapp->dcopClient()->isRegistered() ) {
-    kapp->dcopClient()->registerAs( "TDEResourcesManager" );
-    kapp->dcopClient()->setDefaultObject( objId() );
+  if ( !tdeApp->dcopClient()->isRegistered() ) {
+    tdeApp->dcopClient()->registerAs( "TDEResourcesManager" );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
 
   kdDebug(5650) << "Connecting DCOP signals..." << endl;
@@ -69,7 +69,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family )
                            "dcopKResourceDeleted( TQString, TQString )", false ) )
     kdWarning(5650) << "Could not connect ResourceDeleted signal!" << endl;
 
-  kapp->dcopClient()->setNotifications( true );
+  tdeApp->dcopClient()->setNotifications( true );
 }
 
 ManagerImpl::~ManagerImpl()
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 00c55922f..e34053f55 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -113,7 +113,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
       mSyncAutoLogout(false)
 {
 #ifdef TQ_WS_X11
-    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
 
diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 5317c806c..0549af55f 100644
--- a/tdestyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -480,7 +480,7 @@ protected:
                            TQString *brdnames );
     /**
      * Makes a full color group based on the given foreground and background
-     * colors. This is the same code used by KDE (kapp.cpp) in previous
+     * colors. This is the same code used by KDE (tdeApp.cpp) in previous
      * versions.
      */
     TQColorGroup* makeColorGroup( const TQColor &fg, const TQColor &bg,
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index 8cde02067..3ccb30c65 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -447,7 +447,7 @@ int TDEsuClient::startServer()
     // connections.
     // We start it via tdeinit to make sure that it doesn't inherit
     // any fd's from the parent process.
-    int ret = kapp->tdeinitExecWait(d->daemon);
+    int ret = tdeApp->tdeinitExecWait(d->daemon);
     connect();
     return ret;
 }
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index 2e7af38c3..5f3362067 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -49,16 +49,16 @@ void KActiveLabel::init()
 
    connect(this, TQ_SIGNAL(linkClicked(const TQString &)),
            this, TQ_SLOT(openLink(const TQString &)));
-   if (kapp)
+   if (tdeApp)
    {
-      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+      connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
               this, TQ_SLOT(paletteChanged()));
    }
 }
 
 void KActiveLabel::paletteChanged()
 {
-   TQPalette p = kapp ? kapp->palette() : palette();
+   TQPalette p = tdeApp ? tdeApp->palette() : palette();
    p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
    p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
    setPalette(p);
@@ -74,7 +74,7 @@ void KActiveLabel::openLink(const TQString & link)
 
    TQStringList args;
    args << "exec" << link;
-   kapp->tdeinitExec("kfmclient", args);
+   tdeApp->tdeinitExec("kfmclient", args);
 }
 
 void KActiveLabel::virtual_hook( int, void* )
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 210f5f1ae..8cc107834 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -363,8 +363,8 @@ void KBugReport::slotSetFrom()
 
 void KBugReport::slotUrlClicked(const TQString &urlText)
 {
-  if ( kapp )
-    kapp->invokeBrowser( urlText );
+  if ( tdeApp )
+    tdeApp->invokeBrowser( urlText );
 
   // When using the web form, a click can also close the window, as there's
   // not much to do. It also gives the user a direct response to his click:
@@ -376,8 +376,8 @@ void KBugReport::slotUrlClicked(const TQString &urlText)
 void KBugReport::slotOk( void )
 {
     if ( d->submitBugButton ) {
-        if ( kapp )
-            kapp->invokeBrowser( d->url.url() );
+        if ( tdeApp )
+            tdeApp->invokeBrowser( d->url.url() );
         return;
     }
 
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index 8e6afbbe4..b403ff010 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -599,7 +599,7 @@ public:
      * You won't have the benefit of weighted completion though, so normally
      * you should do something like
      * \code
-     * TDEConfig *config = kapp->config();
+     * TDEConfig *config = tdeApp->config();
      * TQStringList list;
      *
      * // load the history and completion list after creating the history combo
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index 028c90883..2ce2fb4b4 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -94,7 +94,7 @@ TQMap<TQCString,DCOPRef> KDCOPActionProxy::actionMap( const TQCString &appId ) c
 
   TQCString id = appId;
   if ( id.isEmpty() )
-    id = kapp->dcopClient()->appId();
+    id = tdeApp->dcopClient()->appId();
 
   TQValueList<TDEAction *> lst = actions();
   TQValueList<TDEAction *>::ConstIterator it = lst.begin();
diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h
index 0bb80fec1..683a77177 100644
--- a/tdeui/kdcopactionproxy.h
+++ b/tdeui/kdcopactionproxy.h
@@ -73,7 +73,7 @@ public:
    * object id.
    *
    * You can construct a global DCOP object referenence using DCOPRef. For example like
-   * DCOPRef( kapp->dcopClient()->appId, actionProxy->actionObjectId( actionName ) );
+   * DCOPRef( tdeApp->dcopClient()->appId, actionProxy->actionObjectId( actionName ) );
    *
    * The action with the given name has to be available through the #action method.
    */
@@ -83,7 +83,7 @@ public:
    * Returns a map of all exported actions, with the action name as keys and a global DCOP reference
    * as data entries.
    * The appId argument is used to specify the appid component of the DCOP reference. By default the
-   * global application id is used ( kapp->dcopClient()->appId() ) .
+   * global application id is used ( tdeApp->dcopClient()->appId() ) .
    */
   virtual TQMap<TQCString,DCOPRef> actionMap( const TQCString &appId = TQCString() ) const;
 
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index 5a90b5af9..6791b4c38 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -39,7 +39,7 @@ KDETrayProxy::KDETrayProxy()
          it != module.windows().end();
          ++it )
         windowAdded( *it );
-    kapp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule
+    tdeApp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule
 //    kdDebug() << "Init done" << endl;
     }
 
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 68471847d..7846b9639 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -121,7 +121,7 @@ void KDialog::polish()
 
 void KDialog::setCaption( const TQString &_caption )
 {
-  TQString caption = kapp ? kapp->makeStdCaption( _caption ) : _caption;
+  TQString caption = tdeApp ? tdeApp->makeStdCaption( _caption ) : _caption;
   setPlainCaption( caption );
 }
 
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index d1cec7389..72ba5e450 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -1094,8 +1094,8 @@ void KDialogBase::setIconListAllVisible( bool state )
 void KDialogBase::slotHelp()
 {
   emit helpClicked();
-  if ( kapp ) // may be null when used inside designer
-      kapp->invokeHelp( mAnchor, mHelpApp );
+  if ( tdeApp ) // may be null when used inside designer
+      tdeApp->invokeHelp( mAnchor, mHelpApp );
 }
 
 
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index a274ec737..ac7eb4cf5 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -125,7 +125,7 @@ TDEPopupMenu* KHelpMenu::menu()
     connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed()));
 
     bool need_separator = false;
-    if (kapp->authorizeTDEAction("help_contents"))
+    if (tdeApp->authorizeTDEAction("help_contents"))
     {
       mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall),
                      TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents );
@@ -134,7 +134,7 @@ TDEPopupMenu* KHelpMenu::menu()
       need_separator = true;
     }
 
-    if( mShowWhatsThis && kapp->authorizeTDEAction("help_whats_this") )
+    if( mShowWhatsThis && tdeApp->authorizeTDEAction("help_whats_this") )
     {
       TQToolButton* wtb = TQWhatsThis::whatsThisButton(0);
       mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis);
@@ -144,7 +144,7 @@ TDEPopupMenu* KHelpMenu::menu()
       need_separator = true;
     }
 
-    if (kapp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
+    if (tdeApp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
     {
       if (need_separator)
         mMenu->insertSeparator();
@@ -153,7 +153,7 @@ TDEPopupMenu* KHelpMenu::menu()
       need_separator = true;
     }
 
-    if (kapp->authorizeTDEAction("switch_application_language"))
+    if (tdeApp->authorizeTDEAction("switch_application_language"))
     {
       if (need_separator)
         mMenu->insertSeparator();
@@ -165,14 +165,14 @@ TDEPopupMenu* KHelpMenu::menu()
     if (need_separator)
       mMenu->insertSeparator();
 
-    if (kapp->authorizeTDEAction("help_about_app"))
+    if (tdeApp->authorizeTDEAction("help_about_app"))
     {
-      mMenu->insertItem( kapp->miniIcon(),
+      mMenu->insertItem( tdeApp->miniIcon(),
         TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp );
       mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) );
     }
     
-    if (kapp->authorizeTDEAction("help_about_kde"))
+    if (tdeApp->authorizeTDEAction("help_about_kde"))
     {
       mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE );
       mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) );
@@ -186,7 +186,7 @@ TDEPopupMenu* KHelpMenu::menu()
 
 void KHelpMenu::appHelpActivated()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 
@@ -221,11 +221,11 @@ void KHelpMenu::aboutApplication()
       hbox->setMargin(KDialog::marginHint()*1);
 
       TQLabel *label1 = new TQLabel(hbox);
-      label1->setPixmap( kapp->icon() );
+      label1->setPixmap( tdeApp->icon() );
       TQLabel *label2 = new TQLabel(hbox);
       label2->setText( mAboutAppText );
 
-      mAboutApp->setPlainCaption( i18n("About %1").arg(kapp->caption()) );
+      mAboutApp->setPlainCaption( i18n("About %1").arg(tdeApp->caption()) );
       mAboutApp->disableResize();
     }
 
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 517730b9c..284cc3386 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -66,9 +66,9 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f )
     connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
              this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) );
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
-    if ( kapp ) { // maybe null when used inside designer
-        connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
-        kapp->addKipcEventMask( KIPC::SettingsChanged );
+    if ( tdeApp ) { // maybe null when used inside designer
+        connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+        tdeApp->addKipcEventMask( KIPC::SettingsChanged );
     }
 
     m_pCurrentItem = 0L;
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index a17afc59c..5344e83ca 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -196,8 +196,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
     topLayout->addWidget( mPlainPage, 10 );
   }
 
-  if ( kapp )
-    connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
+  if ( tdeApp )
+    connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
   mValid = true;
 
   setSwallowedWidget(0); // Set default size if 'mFace' is Swallow.
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 052710d89..15c8ef78e 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   //d->stdDict->setAutoDelete( true );
   //if (type == Application || type == ApplicationGlobal)
   //  readStdKeys();
-  connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int )));
+  connect( tdeApp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int )));
   if( allChoosers == NULL )
         allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > );
   allChoosers->append( this );
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index c1fc7d8f0..c19d22058 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -161,7 +161,7 @@ void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode )
     if ( echoMode() != TQLineEdit::Normal )
         mode = TDEGlobalSettings::CompletionNone; // Override the request.
 
-    if ( kapp && !kapp->authorize("lineedit_text_completion") )
+    if ( tdeApp && !tdeApp->authorize("lineedit_text_completion") )
         mode = TDEGlobalSettings::CompletionNone;
 
     if ( mode == TDEGlobalSettings::CompletionPopupAuto ||
@@ -876,7 +876,7 @@ TQPopupMenu *KLineEdit::createPopupMenu()
     // If a completion object is present and the input
     // widget is not read-only, show the Text Completion
     // menu item.
-    if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") )
+    if ( compObj() && !isReadOnly() && tdeApp->authorize("lineedit_text_completion") )
     {
         TQPopupMenu *subMenu = new TQPopupMenu( popup );
         connect( subMenu, TQ_SIGNAL( activated( int ) ),
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 22ca4428c..69483d71c 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
   }
   setBackgroundOrigin( AncestorOrigin );
 
-  d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
+  d->sharedConfig = TDESharedConfig::openConfig(configFile, tdeApp && tdeApp->config()->isImmutable());
   _config = d->sharedConfig;
 }
 
diff --git a/tdeui/kpanelappmenu.cpp b/tdeui/kpanelappmenu.cpp
index 247d844de..e8eb6faa9 100644
--- a/tdeui/kpanelappmenu.cpp
+++ b/tdeui/kpanelappmenu.cpp
@@ -60,7 +60,7 @@ KPanelAppMenu::KPanelAppMenu(TQObject *parent, const char *name)
 
 void KPanelAppMenu::init(const TQPixmap &icon, const TQString &title)
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if(!client->isAttached())
 	client->attach();
     TQByteArray sendData, replyData;
@@ -86,7 +86,7 @@ void KPanelAppMenu::init(const TQPixmap &icon, const TQString &title)
 
 KPanelAppMenu::~KPanelAppMenu()
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray sendData;
     TQDataStream stream(sendData, IO_WriteOnly);
     stream << realObjId;
@@ -97,7 +97,7 @@ int KPanelAppMenu::insertItem(const TQPixmap &icon, const TQString &text, int id
 {
     if ( id < 0 )
 	id = panelmenu_get_seq_id();
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray sendData;
     TQDataStream stream(sendData, IO_WriteOnly);
     stream << icon << text << id;
@@ -110,7 +110,7 @@ KPanelAppMenu *KPanelAppMenu::insertMenu(const TQPixmap &icon, const TQString &t
 {
     if ( id < 0 )
         id = panelmenu_get_seq_id();
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray sendData, replyData;
     TQCString replyType;
     TQDataStream stream(sendData, IO_WriteOnly);
@@ -135,7 +135,7 @@ int KPanelAppMenu::insertItem(const TQString &text, int id )
 {
     if ( id < 0 )
 	id = panelmenu_get_seq_id();
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray sendData;
     TQDataStream stream(sendData, IO_WriteOnly);
     stream << text << id;
@@ -146,7 +146,7 @@ int KPanelAppMenu::insertItem(const TQString &text, int id )
 
 void KPanelAppMenu::clear()
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray sendData;
     client->send("kicker", realObjId, "clear()", sendData);
 }
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 701b1f7f7..5b947cadf 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -180,7 +180,7 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name,
       d(new KProgressDialogPrivate)
 {
 #ifdef TQ_WS_X11
-    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
     
@@ -215,7 +215,7 @@ void KProgressDialog::slotAutoShow()
     }
 
     show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void KProgressDialog::slotCancel()
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 02b60afe4..3c88b2aa5 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -68,7 +68,7 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
       d(new KProgressBoxDialogPrivate)
 {
 #ifdef TQ_WS_X11
-    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
     
@@ -105,7 +105,7 @@ void KProgressBoxDialog::slotAutoShow()
     }
 
     show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void KProgressBoxDialog::slotCancel()
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 3c73de83e..e4efcf5e2 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -104,11 +104,11 @@ void KPushButton::init( const KGuiItem &item )
 
     TQWhatsThis::add( this, item.whatsThis() );
 
-    if (kapp)
+    if (tdeApp)
     {
-       connect( kapp, TQ_SIGNAL( settingsChanged(int) ),
+       connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ),
                TQ_SLOT( slotSettingsChanged(int) ) );
-       kapp->addKipcEventMask( KIPC::SettingsChanged );
+       tdeApp->addKipcEventMask( KIPC::SettingsChanged );
     }
 }
 
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 5a0923566..ac54511f4 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -67,7 +67,7 @@ void KRootPixmap::init()
     m_bActive = false;
     m_bCustomPaint = 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)));
@@ -277,7 +277,7 @@ void KRootPixmap::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/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index 8256ad72a..8a43a5e82 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -974,7 +974,7 @@ void KSpellConfig::activateHelp( void )
 
 void KSpellConfig::sHelp( void )
 {
-  kapp->invokeHelp("configuration", "tdespell");
+  tdeApp->invokeHelp("configuration", "tdespell");
 }
 
 /*
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e0bcca2eb..8152a885b 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -60,7 +60,7 @@ TDEAction* create( StdAction id, const char *name, const TQObject *recvr, const
 
 		 case Home: sLabel = i18n("beginning (of line)", "&Home"); break;
 		 case Help: sLabel = i18n("show help", "&Help"); break;
-		 case AboutApp: iconName = kapp->miniIconName();
+		 case AboutApp: iconName = tdeApp->miniIconName();
 		 case Preferences:
 		 case HelpContents:
 			{
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 096d9637c..192b378b5 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -75,7 +75,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     setBackgroundOrigin(WindowOrigin);
     hasQuit = 0;
     menu = new TDEPopupMenu( this );
-    menu->insertTitle( kapp->miniIcon(), kapp->caption() );
+    menu->insertTitle( tdeApp->miniIcon(), tdeApp->caption() );
     move( -1000, -1000 );
     KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection);
 
@@ -193,12 +193,12 @@ void KSystemTray::minimizeRestoreAction()
 void KSystemTray::maybeQuit()
 {
     TQString query = i18n("<qt>Are you sure you want to quit <b>%1</b>?</qt>")
-                        .arg(kapp->caption());
+                        .arg(tdeApp->caption());
     if (KMessageBox::warningContinueCancel(this, query,
                                      i18n("Confirm Quit From System Tray"),
                                      KStdGuiItem::quit(),
                                      TQString("systemtrayquit%1")
-                                            .arg(kapp->caption())) !=
+                                            .arg(tdeApp->caption())) !=
         KMessageBox::Continue)
     {
         return;
@@ -314,7 +314,7 @@ TDEActionCollection* KSystemTray::actionCollection()
 
 TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
 {
-    TDEConfig *appCfg = kapp->config();
+    TDEConfig *appCfg = tdeApp->config();
     TDEConfigGroupSaver configSaver(appCfg, "System Tray");
     int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
     return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index f53973352..b602570be 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -64,7 +64,7 @@ void KTextBrowser::setSource( const TQString& name )
   {
     if( !mNotifyClick )
     {
-      kapp->invokeMailer( KURL( name ) );
+      tdeApp->invokeMailer( KURL( name ) );
     }
     else
     {
@@ -75,7 +75,7 @@ void KTextBrowser::setSource( const TQString& name )
   {
     if( !mNotifyClick )
     {
-      kapp->invokeBrowser( name );
+      tdeApp->invokeBrowser( name );
     }
     else
     {
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 2c8a8ef08..f9202bd30 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -64,7 +64,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile)
     loadTips(tipFile);
 
     if (!mTips.isEmpty())
-	mCurrent = kapp->random() % mTips.count();
+	mCurrent = tdeApp->random() % mTips.count();
 }
 
 
@@ -80,7 +80,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles )
            addTips( *it );
    }
     if (!mTips.isEmpty())
-	mCurrent = kapp->random() % mTips.count();
+	mCurrent = tdeApp->random() % mTips.count();
 
 }
 
@@ -301,7 +301,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     ok->setDefault(true);
     hbox2->addWidget(ok);
 
-    TDEConfigGroup config(kapp->config(), "TipOfDay");
+    TDEConfigGroup config(tdeApp->config(), "TipOfDay");
     mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
 
     connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip()));
@@ -322,7 +322,7 @@ KTipDialog::~KTipDialog()
 
 void KTipDialog::showTip(const TQString &tipFile, bool force)
 {
-    showTip(kapp->mainWidget(), tipFile, force);
+    showTip(tdeApp->mainWidget(), tipFile, force);
 }
 
 void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force)
@@ -332,7 +332,7 @@ void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force)
 
 void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bool force)
 {
-    TDEConfigGroup configGroup(kapp->config(), "TipOfDay");
+    TDEConfigGroup configGroup(tdeApp->config(), "TipOfDay");
 
     const bool runOnStart = configGroup.readBoolEntry("RunOnStart", true);
 
@@ -347,11 +347,11 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo
            const int oneDay = 24*60*60;
            TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown");
            // Show tip roughly once a week
-           if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
+           if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (tdeApp->random() % (10*oneDay))))
                return;
         }
         configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime());
-        kapp->config()->sync();
+        tdeApp->config()->sync();
         if (!hasLastShown)
            return; // Don't show tip on first start
     }
@@ -418,7 +418,7 @@ static TQString fixTip(TQString tip)
 
   void KTipDialog::setShowOnStart(bool on)
   {
-      TDEConfigGroup config(kapp->config(), "TipOfDay");
+      TDEConfigGroup config(tdeApp->config(), "TipOfDay");
       config.writeEntry("RunOnStart", on);
       config.sync();
   }
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index 46643f6f0..e3a2fdf2e 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -84,7 +84,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
         body . append ("\nPlease type in your what's this help between these lines: "
                 "\n--%-----------------------------------------------------------------------\n"
                 "\n--%-----------------------------------------------------------------------");
-        kapp -> invokeMailer ("quality-whatsthis@kde.org", "", "", subj, body);
+        tdeApp -> invokeMailer ("quality-whatsthis@kde.org", "", "", subj, body);
     }
     return TRUE;
 }
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index c3dd1c233..404df80e5 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -150,7 +150,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
     TQCString name = element.attribute( d->attrName ).utf8();
 
-    if (!kapp->authorizeTDEAction(name))
+    if (!tdeApp->authorizeTDEAction(name))
        return 0;
 
     TDEPopupMenu *popup = new TDEPopupMenu( p, name);
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index de015b5a4..e52cc31bc 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -292,7 +292,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
     {
       TQCString name =  e.attribute( attrName ).utf8(); // WABA
       if ( !actionCollection->action( name.data() ) ||
-           (kapp && !kapp->authorizeTDEAction(name)))
+           (tdeApp && !tdeApp->authorizeTDEAction(name)))
       {
         // remove this child as we aren't using it
         base.removeChild( e );
diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index 636d336f2..8995b01b4 100644
--- a/tdeui/tdeaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -36,7 +36,7 @@
 TDEAboutApplication::TDEAboutApplication( TQWidget *parent, const char *name,
               bool modal )
   :TDEAboutDialog( AbtTabbed|AbtProduct,
-                 kapp ? kapp->caption() : TQString::null,
+                 tdeApp ? tdeApp->caption() : TQString::null,
                  Close, Close,
      parent, name, modal )
 {
@@ -60,7 +60,7 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
     //
 
     //i18n "??" is displayed as (pseudo-)version when no data is known about the application
-    setProduct( kapp ? kapp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null );
+    setProduct( tdeApp ? tdeApp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null );
     TDEAboutContainer *appPage = addContainerPage( i18n("&About"));
 
     TQString appPageText =
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index 57bc84d24..fddcffde4 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -693,13 +693,13 @@ void TDEAboutContainerBase::setProduct( const TQString &appName,
     return;
   }
 
-  if ( kapp )
+  if ( tdeApp )
   {
-    mIconLabel->setPixmap( kapp->icon() );
-    kdDebug(291) << "setPixmap (iconName): " << kapp->iconName() << endl;
+    mIconLabel->setPixmap( tdeApp->icon() );
+    kdDebug(291) << "setPixmap (iconName): " << tdeApp->iconName() << endl;
   }
   else
-    kdDebug(291) << "no kapp" << endl;
+    kdDebug(291) << "no tdeApp" << endl;
 
   const TQString msg1 = i18n("%1 %2 (Using Trinity %3)").arg(appName).arg(version).
     arg(TQString::fromLatin1(TDE_VERSION_STRING));
@@ -1615,8 +1615,8 @@ void TDEAboutDialog::setVersion(const TQString &_name)
 
 void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email)
 {
-  if ( kapp )
-      kapp->invokeMailer( email, TQString::null );
+  if ( tdeApp )
+      tdeApp->invokeMailer( email, TQString::null );
   /*
   kdDebug() << "TDEAboutDialog::sendEmailSlot: request to send an email to "
 	<< name << ", " << email << endl;
@@ -1626,8 +1626,8 @@ void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& ema
 
 void TDEAboutDialog::openURLSlot(const TQString& url)
 {
-  if ( kapp )
-      kapp->invokeBrowser( url );
+  if ( tdeApp )
+      tdeApp->invokeBrowser( url );
   //kdDebug() << "TDEAboutDialog::openURLSlot: request to open URL " << url << endl;
   //emit(openURL(url));
 }
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index d63e71feb..bd6f6d83d 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -452,7 +452,7 @@ bool TDEAction::setShortcut( const TDEShortcut& cut )
 bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel )
 {
   // Check if action is permitted
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return false;
 
   bool b = true;
@@ -644,7 +644,7 @@ int TDEAction::plug( TQWidget *w, int index )
 #endif
 
   // Check if action is permitted
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   plugShortcut();
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index ad9c4d102..eaa9f244a 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -142,7 +142,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index )
     kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl;
     return -1;
   }
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   int _index = TDEAction::plug( widget, index );
@@ -638,7 +638,7 @@ void TDESelectAction::updateItems( int id )
 
 int TDESelectAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqt_cast<TQPopupMenu *>( widget) )
@@ -1268,7 +1268,7 @@ void TDERecentFilesAction::menuAboutToShow()
 
 int TDERecentFilesAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
@@ -1524,7 +1524,7 @@ void TDEFontAction::setFont( const TQString &family )
 
 int TDEFontAction::plug( TQWidget *w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
@@ -1793,7 +1793,7 @@ void TDEActionMenu::setStickyMenu(bool sticky) {
 
 int TDEActionMenu::plug( TQWidget* widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqt_cast<TQPopupMenu *>( widget ) )
@@ -1939,7 +1939,7 @@ void TDEToolBarPopupAction::setStickyMenu(bool sticky) {
 
 int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
@@ -2018,7 +2018,7 @@ TDEToggleToolBarAction::~TDEToggleToolBarAction()
 
 int TDEToggleToolBarAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
       return -1;
 
   if ( !m_toolBar ) {
@@ -2150,7 +2150,7 @@ void KWidgetAction::setAutoSized( bool autoSized )
 
 int KWidgetAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
       return -1;
 
   if ( !::tqt_cast<TDEToolBar *>( w ) ) {
@@ -2283,7 +2283,7 @@ void TDEPasteTextAction::setMixedMode(bool mode)
 
 int TDEPasteTextAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
@@ -2320,7 +2320,7 @@ void TDEPasteTextAction::menuAboutToShow()
 {
     m_popup->clear();
     TQStringList list;
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (client->isAttached() && client->isApplicationRegistered("klipper")) {
       DCOPRef klipper("klipper","klipper");
       DCOPReply reply = klipper.call("getClipboardHistoryMenu");
@@ -2346,7 +2346,7 @@ void TDEPasteTextAction::menuAboutToShow()
 
 void TDEPasteTextAction::menuItemActivated( int id)
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (client->isAttached() && client->isApplicationRegistered("klipper")) {
       DCOPRef klipper("klipper","klipper");
       DCOPReply reply = klipper.call("getClipboardHistoryItem(int)", m_popup->indexOf(id));
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index 256e1669d..186987836 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -35,10 +35,10 @@ TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f )
     connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ),
 	     this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) );
     slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
-    if (kapp)
+    if (tdeApp)
     {
-        connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
-        kapp->addKipcEventMask( KIPC::SettingsChanged );
+        connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+        tdeApp->addKipcEventMask( KIPC::SettingsChanged );
     }
 
     m_pCurrentItem = 0L;
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index 868be813d..cf986b538 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -470,10 +470,10 @@ TDEListView::TDEListView( TQWidget *parent, const char *name )
                    this, TQ_SLOT(cleanItemHighlighter()));
 
   slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
-  if (kapp)
+  if (tdeApp)
   {
-    connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
-    kapp->addKipcEventMask( KIPC::SettingsChanged );
+    connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+    tdeApp->addKipcEventMask( KIPC::SettingsChanged );
   }
 
   connect(&d->autoSelect, TQ_SIGNAL( timeout() ),
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 817c14423..33eb53676 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -93,7 +93,7 @@ public:
     }
     bool saveState( TQSessionManager& )
     {
-        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
+        TDEConfig* config = tdeApp->sessionConfig();
         if ( TDEMainWindow::memberList->first() ){
             // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this
             // hook is useful for better document orientation
@@ -182,9 +182,9 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     KWhatsThisManager::init ();
     setDockMenuEnabled( false );
     mHelpMenu = 0;
-    kapp->setTopWidget( this );
+    tdeApp->setTopWidget( this );
     actionCollection()->setWidget( this );
-    connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
+    connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
     if( !memberList )
         memberList = new TQPtrList<TDEMainWindow>;
 
@@ -196,7 +196,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     int unusedNumber;
     if ( !name )
         { // no name given
-        objname = kapp->instanceName() + "-mainwindow#";
+        objname = tdeApp->instanceName() + "-mainwindow#";
         s = objname + '1'; // start adding number immediately
         unusedNumber = 1;
         }
@@ -213,7 +213,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
         unusedNumber = 0; // add numbers only when needed
         }
     for(;;) {
-        TQWidgetList* list = kapp->topLevelWidgets();
+        TQWidgetList* list = tdeApp->topLevelWidgets();
         TQWidgetListIt it( *list );
         bool found = false;
         for( TQWidget* w = it.current();
@@ -246,13 +246,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     d->shuttingDown = false;
     if ((d->care_about_geometry = being_first)) {
         being_first = false;
-        if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter
+        if ( tdeApp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter
             d->care_about_geometry = false;
         else
             parseGeometry(false);
     }
 
-    setCaption( kapp->caption() );
+    setCaption( tdeApp->caption() );
     if ( cflags & NoDCOPObject)
         d->m_interface = 0;
     else
@@ -260,13 +260,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
 
     if ( cflags & NewRefCountMode ) {
         d->newStyleRefCounting = true;
-        kapp->ref();
+        tdeApp->ref();
     }
     else {
         d->newStyleRefCounting = false;
     }
 
-    if (!kapp->authorize("movable_toolbars"))
+    if (!tdeApp->authorize("movable_toolbars"))
         setDockWindowsMovable(false);
 }
 
@@ -287,13 +287,13 @@ void TDEMainWindow::setupToolbarMenuActions()
 
 void TDEMainWindow::parseGeometry(bool parsewidth)
 {
-    assert ( !kapp->geometryArgument().isNull() );
+    assert ( !tdeApp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
 
 #if defined TQ_WS_X11
     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 (parsewidth) {
         TQSize minSize = minimumSize();
         TQSize maxSize = maximumSize();
@@ -360,9 +360,9 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis )
 
 bool TDEMainWindow::canBeRestored( int number )
 {
-    if ( !kapp->isRestored() )
+    if ( !tdeApp->isRestored() )
         return false;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( !config )
         return false;
     config->setGroup( TQString::fromLatin1("Number") );
@@ -372,9 +372,9 @@ bool TDEMainWindow::canBeRestored( int number )
 
 const TQString TDEMainWindow::classNameOfToplevel( int number )
 {
-    if ( !kapp->isRestored() )
+    if ( !tdeApp->isRestored() )
         return TQString::null;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( !config )
         return TQString::null;
     TQString s;
@@ -421,7 +421,7 @@ bool TDEMainWindow::restore( int number, bool show )
 {
     if ( !canBeRestored( number ) )
         return false;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( readPropertiesInternal( config, number ) ){
         if ( show )
             TDEMainWindow::show();
@@ -589,12 +589,12 @@ bool TDEMainWindow::isHelpMenuEnabled()
 
 void TDEMainWindow::setCaption( const TQString &caption )
 {
-    setPlainCaption( kapp->makeStdCaption(caption) );
+    setPlainCaption( tdeApp->makeStdCaption(caption) );
 }
 
 void TDEMainWindow::setCaption( const TQString &caption, bool modified )
 {
-    setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
+    setPlainCaption( tdeApp->makeStdCaption(caption, true, modified) );
 }
 
 void TDEMainWindow::setPlainCaption( const TQString &caption )
@@ -657,11 +657,11 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e )
         }
 
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
-            if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
+            if ( queryExit() && !tdeApp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
                 // don't call queryExit() twice
-                disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
+                disconnect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
                 d->shuttingDown = true;
-                kapp->deref();             // ...and quit application.
+                tdeApp->deref();             // ...and quit application.
             }  else {
                 // cancel closing, it's stupid to end up with no windows at all....
                 e->ignore();
@@ -1216,7 +1216,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
             break;
 
           case TDEToolBar::Flat:
-            size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+            size += TQSize(0, 3+tdeApp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
             break;
 
           default:
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index 0a624b040..82b29e548 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -235,7 +235,7 @@ public:
      *
      * That means clients could simply do the following:
      * \code
-     * if (kapp->isRestored()){
+     * if (tdeApp->isRestored()){
      *   int n = 1;
      *   while (TDEMainWindow::canBeRestored(n)){
      *     (new childMW)->restore(n);
@@ -260,7 +260,7 @@ public:
      * for backwards compatibility with 3.1 and 3.0 branches:
      *
      * \code
-     * if (kapp->isRestored())
+     * if (tdeApp->isRestored())
      *   RESTORE(childMW)
      * else {
      *   // create default application as usual
@@ -275,7 +275,7 @@ public:
      * use the templated kRestoreMainWindows global functions:
      *
      * \code
-     * if (kapp->isRestored())
+     * if (tdeApp->isRestored())
      *   kRestoreMainWindows< childMW1, childMW2, childMW3 >();
      * else {
      *   // create default application as usual
diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index a18fb80ed..a3c6c2282 100644
--- a/tdeui/tdemainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -122,7 +122,7 @@ TQCString TDEMainWindowInterface::actionToolTip( TQCString action)
 
 DCOPRef TDEMainWindowInterface::action( const TQCString &name )
 {
-	return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
+	return DCOPRef( tdeApp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
 }
 
 TQMap<TQCString,DCOPRef> TDEMainWindowInterface::actionMap()
diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp
index e7c901d56..c64e2c188 100644
--- a/tdeui/tdemenubar.cpp
+++ b/tdeui/tdemenubar.cpp
@@ -142,9 +142,9 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name)
 
     connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize()));
 
-    if ( kapp )
+    if ( tdeApp )
         // toolbarAppearanceChanged(int) is sent when changing macstyle
-        connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)),
+        connect( tdeApp, TQ_SIGNAL(toolbarAppearanceChanged(int)),
             this, TQ_SLOT(slotReadConfig()));
 
     slotReadConfig();
@@ -333,10 +333,10 @@ void KMenuBar::selectionTimeout()
         int screen = xineramaConfig.readNumEntry("MenubarScreen",
             TQApplication::desktop()->screenNumber(TQPoint(0,0)) );
         TQRect area;
-        if (kapp->desktop()->numScreens() < 2)
-            area = kapp->desktop()->geometry();
+        if (tdeApp->desktop()->numScreens() < 2)
+            area = tdeApp->desktop()->geometry();
         else
-            area = kapp->desktop()->screenGeometry(screen);
+            area = tdeApp->desktop()->screenGeometry(screen);
         int margin = 0;
 	move(area.left() - margin, area.top() - margin); 
         setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) );
diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp
index 49648a74d..b92e32488 100644
--- a/tdeui/tdemessagebox.cpp
+++ b/tdeui/tdemessagebox.cpp
@@ -972,7 +972,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text,
 {
     TQString _caption = caption;
     if (_caption.isEmpty())
-        _caption = i18n("About %1").arg(kapp->caption());
+        _caption = i18n("About %1").arg(tdeApp->caption());
 
     KDialogBase *dialog = new KDialogBase(
                                 caption,
@@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text,
                                 parent, "about", true, true,
                                 KStdGuiItem::ok() );
     
-    TQPixmap ret = TDEApplication::kApplication()->icon();
+    TQPixmap ret = tdeApp->icon();
     if (ret.isNull())
         ret = TQMessageBox::standardIcon(TQMessageBox::Information);
     dialog->setIcon(ret);
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 5195c64a8..7c024e31a 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -86,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *)
 {
     TQRect r(rect());
     TQPainter p(this);
-    kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
+    tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
 
     if (!miniicon.isNull())
         p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index be0386dea..f808cd5b3 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -122,7 +122,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort
 	updateDetails();
 
 	#ifdef TQ_WS_X11
-	kapp->installX11EventFilter( this );	// Allow button to capture X Key Events.
+	tdeApp->installX11EventFilter( this );	// Allow button to capture X Key Events.
 	#endif
 }
 
@@ -219,7 +219,7 @@ void TDEShortcutDialog::updateDetails()
 		m_simple->m_txtShortcut->setFocus();
 		m_adv->m_btnMultiKey->setChecked( false );
 	}
-	kapp->processEvents();
+	tdeApp->processEvents();
 	adjustSize();
 }
 
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 0e47a172c..a7792eaf7 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -381,7 +381,7 @@ KSpell::setUpDialog( bool reallyuseprogressbar )
 	   ksdlg, TQ_SLOT(slotProgress(unsigned int)) );
 
 #ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded
-  KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( ksdlg->winId(), tdeApp->icon(), tdeApp->miniIcon() );
 #endif
   if ( modaldlg )
     ksdlg->setFocus();
@@ -1403,7 +1403,7 @@ KSpell::modalCheck( TQString& text, KSpellConfig* _kcs )
                               0, _kcs, true, true );
 
   while (spell->status()!=Finished)
-    kapp->processEvents();
+    tdeApp->processEvents();
 
   text = modaltext;
 
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 817af5007..6f93db4fc 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -237,11 +237,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle )
     connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ),
              this, TQ_SLOT( slotRepaint() ) );
 
-    if ( kapp ) { // may be null when started inside designer
-        connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged()));
+    if ( tdeApp ) { // may be null when started inside designer
+        connect(tdeApp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged()));
         // request notification of changes in icon style
-        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)));
     }
 
     // finally, read in our configurable settings
@@ -1133,7 +1133,7 @@ void TDEToolBar::setXMLGUIClient( KXMLGUIClient *client )
 
 void TDEToolBar::setText( const TQString & txt )
 {
-    setLabel( txt + " (" + kapp->caption() + ") " );
+    setLabel( txt + " (" + tdeApp->caption() + ") " );
 }
 
 
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index 37540ae92..aff328aca 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -181,7 +181,7 @@ void ToolBarHandler::setupActions()
                  this, TQ_SLOT( setupActions() ) );
                  */
 
-    if (kapp && kapp->authorizeTDEAction("options_show_toolbar"))
+    if (tdeApp && tdeApp->authorizeTDEAction("options_show_toolbar"))
 	plugActionList( actionListName, m_actions );
 
     connectToActionContainers();
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 7e51396c1..9a8a2b3ed 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -212,7 +212,7 @@ void KComboBoxTest::slotReturnPressed(const TQString& item)
 
 void KComboBoxTest::quitApp()
 {
-  kapp->closeAllWindows();
+  tdeApp->closeAllWindows();
 }
 
 int main ( int argc, char **argv)
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index ba3f97d74..e1583fa4a 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -81,7 +81,7 @@ static const char *preview_xpm[] = {
 SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const char* name )
 :TQDialog(0L,name,true)
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
   if ( initially.isNull() ){
     initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
@@ -166,7 +166,7 @@ void SFileDialog::dockChange()
 
 SFileDialog::~SFileDialog()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup( TQString("SFileDialogData:") + name() );
   config->writeEntry( "Bookmarks", fd->getBookmark() );
 
@@ -188,7 +188,7 @@ void SFileDialog::setDockDefaultPos( KDockWidget* d )
 void SFileDialog::changeDir( const TQString& f )
 {
   if ( !f.isEmpty() ){
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup( TQString("SFileDialogData:") + name() );
     config->writePathEntry( "InitiallyDir", f );
   }
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index e9601ccec..e22ea882e 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -65,7 +65,7 @@ KLineEditTest::~KLineEditTest()
 
 void KLineEditTest::quitApp()
 {
-    kapp->closeAllWindows();
+    tdeApp->closeAllWindows();
 }
 
 void KLineEditTest::show()
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index a2bb2b6e8..47b432a37 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -22,7 +22,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     menuBar = new KMenuBar (this);
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
-    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", tdeApp,
                           TQ_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
@@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name)
 
     setCentralWidget(widget);
 
-    setCaption( TDEApplication::kApplication()->caption() );
+    setCaption( tdeApp->caption() );
 
     smenu = new TQPopupMenu;
   
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 559348ec0..453550b16 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -16,7 +16,7 @@ int main( int argc, char * argv[] ) {
 
   TDEApplication app( argc, argv, "tdemainwindowrestoretest" );
 
-  if ( kapp->isRestored() ) {
+  if ( tdeApp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
     kRestoreMainWindows< MainWin4, MainWin5 >();
     RESTORE(MainWin6);
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 8fd5170e0..2f43c15d8 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -55,7 +55,7 @@ setAutoSaveSettings();
     menuBar->insertItem ("&File", fileMenu);
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
-    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", tdeApp,
                           TQ_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
@@ -148,7 +148,7 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("system-log-out");
-    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp,
                           TQ_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
@@ -291,7 +291,7 @@ void testWindow::slotGoGoGoo()
 
 void testWindow::slotSave()
 {
-  kapp->beep();
+  tdeApp->beep();
   statusBar->changeItem("Saving properties...", 0);
 }
 
@@ -408,7 +408,7 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("system-log-out");
-     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp,
                            TQ_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index 0e070f79b..5c1f977bb 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -121,7 +121,7 @@ void KWindowListMenu::init()
 
     // Make sure the popup is not too wide, otherwise clicking in the middle of kdesktop
     // wouldn't leave any place for the popup, and release would activate some menu entry.    
-    int maxwidth = kapp->desktop()->screenGeometry( this ).width() / 2 - 100;
+    int maxwidth = tdeApp->desktop()->screenGeometry( this ).width() / 2 - 100;
 
     clear();
     map.clear();
@@ -242,12 +242,12 @@ void KWindowListMenu::selectActiveWindow()
 
 void KWindowListMenu::slotUnclutterWindows()
 {
-    kapp->dcopClient()->send(twinName(), "KWinInterface", "unclutterDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twinName(), "KWinInterface", "unclutterDesktop()", TQString(""));
 }
 
 void KWindowListMenu::slotCascadeWindows()
 {
-    kapp->dcopClient()->send(twinName(), "KWinInterface", "cascadeDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twinName(), "KWinInterface", "cascadeDesktop()", TQString(""));
 }
 
 void KWindowListMenu::virtual_hook( int id, void* data )
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 74ba93f14..3cc3c70ae 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -250,7 +250,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo,
     if( !moduleinfo.service() )
         return;
 
-    if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() ))
+    if ( !tdeApp->authorizeControlModule( moduleinfo.service()->menuId() ))
             return;
 
     if( !TDECModuleLoader::testModule( moduleinfo ))
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 65f5d024c..85724a0a3 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -377,7 +377,7 @@ void TDECModuleProxy::runAsRoot()
 		else
 		{
 			d->rootMode = true;
-			kapp->dcopClient();
+			tdeApp->dcopClient();
 			d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this );
 		}
 
@@ -452,7 +452,7 @@ void TDECModuleProxy::deleteClient()
 	delete d->dcopClient;
 	d->dcopClient = 0;
 
-	kapp->syncX();
+	tdeApp->syncX();
 
 }
 
@@ -543,7 +543,7 @@ void TDECModuleProxy::callRootModule( const TQCString& function )
 
 	/* Note, we don't use d->dcopClient here, because it's used for 
 	 * the loaded module(and it's not "us" when this function is called) */
-	if( !kapp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData,
+	if( !tdeApp->dcopClient()->call( d->dcopName, d->dcopName, function, sendData,
 			replyType, replyData, true, -1 ))
 		kdDebug(711) << "Calling function '" << function << "' failed." << endl;
 
@@ -567,7 +567,7 @@ TQString TDECModuleProxy::quickHelp() const
 		TQByteArray data, replyData;
 		TQCString replyType;
 
-		if (kapp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()",
+		if (tdeApp->dcopClient()->call(d->dcopName, d->dcopName, "quickHelp()",
 				  data, replyType, replyData))
 			kdDebug(711) << "Calling DCOP function bool changed() failed." << endl;
 		else
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 6e6f1b286..77291bd3e 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
@@ -61,7 +61,7 @@ void TDECModuleProxyIfaceImpl::defaults()
 
 TQString TDECModuleProxyIfaceImpl::applicationName()
 {
-	return kapp->caption();
+	return tdeApp->caption();
 }
 
 TQString TDECModuleProxyIfaceImpl::quickHelp()
@@ -106,10 +106,10 @@ TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl
 	 */
 
 	/* Note, we don't use TDECModuleProxy::d->dcopClient */
-	kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
+	tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
 			"changed(bool)", objId(), "changed(bool)", false );
 
-	kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
+	tdeApp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
 			"quickHelpChanged()", objId(), "quickHelpChanged()", false );
 }
 
diff --git a/tdewidgets/README b/tdewidgets/README
index 72ab6ee46..e14b2fe5a 100644
--- a/tdewidgets/README
+++ b/tdewidgets/README
@@ -18,7 +18,7 @@ Don't expect it to work with any other versions of Qt.
 Known Bugs:
 ===========
 
-Designer crashes when using widgets that use the kapp pointer.
+Designer crashes when using widgets that use the tdeApp pointer.
 
 HOWTO Add Widgets:
 ==================