diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index cada938..33f54ff 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -120,7 +120,7 @@ MainWindow::setupActions()
     closeAction = KStdAction::close(this, TQ_SLOT(file_close()), actionCollection(), "file_close");
 
     recent = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection());
-    recent->loadEntries(kapp->config());
+    recent->loadEntries(tdeApp->config());
 
     createStandardStatusBarAction();
 
@@ -340,7 +340,7 @@ MainWindow::file_quit()
 void
 MainWindow::slotSaveProperties()
 {
-    recent->saveEntries(kapp->config());
+    recent->saveEntries(tdeApp->config());
 }
 
 void
@@ -365,14 +365,14 @@ void
 MainWindow::slotAddRecentURL( const KURL & url )
 {
     recent->addURL( url );
-    recent->saveEntries(kapp->config());
+    recent->saveEntries(tdeApp->config());
 }
 
 void
 MainWindow::slotRemoveRecentURL( const KURL & url )
 {
     recent->removeURL( url );
-    recent->saveEntries(kapp->config());
+    recent->saveEntries(tdeApp->config());
 }
 
 void
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 8d06d30..9bf79da 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -89,7 +89,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	TDEAcceleratorManager::setNoAccel( central );
 
 	// Detect color change
-	connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(set_colors()));
+	connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(set_colors()));
 
 	calc_display = new DispLogic(central, "display", actionCollection());
 
@@ -2113,7 +2113,7 @@ void KCalculator::updateSettings()
 	//
 	// 1999-10-31 Espen Sand: Don't ask me why ;)
 	//
-	kapp->processOneEvent();
+	tdeApp->processOneEvent();
 	setFixedHeight(minimumHeight());
 }
 
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index f098654..e04ac56 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -18,7 +18,7 @@
     </entry>
     <entry name="NumberButtonsColor" type="Color">
       <label>The color of number buttons.</label>
-      <code>TQColor defaultButtonColor = kapp->palette().active().background();</code>
+      <code>TQColor defaultButtonColor = tdeApp->palette().active().background();</code>
       <default code="true">defaultButtonColor</default>
     </entry>
     <entry name="FunctionButtonsColor" type="Color">
diff --git a/kcharselect/kcharselectdia.cpp b/kcharselect/kcharselectdia.cpp
index f3caed8..d5232a8 100644
--- a/kcharselect/kcharselectdia.cpp
+++ b/kcharselect/kcharselectdia.cpp
@@ -262,7 +262,7 @@ void KCharSelectDia::lineEditChanged()
 //==================================================================
 void KCharSelectDia::_exit()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
 
   config->setGroup("General");
   config->writeEntry("selectedFont",vFont);
@@ -284,6 +284,6 @@ void KCharSelectDia::clear()
 //==================================================================
 void KCharSelectDia::help()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
diff --git a/kcharselect/main.cpp b/kcharselect/main.cpp
index cb74af5..a863e5e 100644
--- a/kcharselect/main.cpp
+++ b/kcharselect/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 
   TDEApplication app;
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
 
   config->setGroup("General");
   TQString font(config->readEntry("selectedFont", TDEGlobalSettings::generalFont().family()));
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 8927f0a..d487a37 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -59,7 +59,7 @@ DiskList::DiskList(TQObject *parent, const char *name)
       this, TQ_SLOT(dfDone() ) );
 
    readingDFStdErrOut=FALSE;
-   config = kapp->config();
+   config = tdeApp->config();
    loadSettings();
 }
 
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index b3fef55..1e5946c 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -156,13 +156,13 @@ KDFConfigWidget::~KDFConfigWidget()
 void KDFConfigWidget::closeEvent(TQCloseEvent *)
 {
   applySettings();
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
 void KDFConfigWidget::applySettings( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("KDFConfig");
 
   if( GUI )
@@ -196,7 +196,7 @@ void KDFConfigWidget::applySettings( void )
 
 void KDFConfigWidget::loadSettings( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("KDFConfig");
 
   if( GUI )
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index ce68715..13ad92c 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -186,7 +186,7 @@ void KDFWidget::makeColumns( void )
 void KDFWidget::closeEvent(TQCloseEvent *)
 {
   applySettings();
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
@@ -202,7 +202,7 @@ void KDFWidget::settingsChanged( void )
 **/
 void KDFWidget::applySettings( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
 
   config.setGroup("KDiskFree");
   if( GUI )
@@ -231,7 +231,7 @@ void KDFWidget::loadSettings( void )
 
   if(GUI)
   {
-    TDEConfig &config = *kapp->config();
+    TDEConfig &config = *tdeApp->config();
     config.setGroup("KDiskFree");
     for( uint i=0; i<mTabProp.size(); i++ )
     {
@@ -645,7 +645,7 @@ void KDFWidget::columnSizeChanged( int, int, int )
 
 void KDFWidget::invokeHelp()
 {
-  kapp->invokeHelp("", "kcontrol/kdf");
+  tdeApp->invokeHelp("", "kcontrol/kdf");
 }
 
 #include "kdfwidget.moc"
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index aba455b..1420a11 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -312,7 +312,7 @@ void KwikDisk::startKDF()
 
 void KwikDisk::invokeHelp()
 {
-   kapp->invokeHelp("", "kdf");
+   tdeApp->invokeHelp("", "kdf");
 }
 
 /*****************************************************************************/
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index dc9a771..732cba8 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -179,7 +179,7 @@ void MntConfigWidget::applySettings( void )
 {
   mDiskList.applySettings();
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("MntConfig");
   if(GUI )
   {
@@ -192,7 +192,7 @@ void MntConfigWidget::applySettings( void )
 
 void MntConfigWidget::loadSettings( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   if( mInitializing == false && GUI )
   {
     config.setGroup("MntConfig");
diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp
index 297274b..96920a8 100644
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@@ -47,7 +47,7 @@ CStdOption::~CStdOption( void )
 
 void CStdOption::updateConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("KDFConfig");
   mFileManager = config.readPathEntry(
     "FileManagerCommand", mDefaultFileManager );
@@ -62,7 +62,7 @@ void CStdOption::updateConfiguration( void )
 
 void CStdOption::writeConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("KDFConfig");
   config.writeEntry( "UpdateFrequency", mUpdateFrequency );
   config.writePathEntry( "FileManagerCommand", mFileManager );
@@ -74,7 +74,7 @@ void CStdOption::writeConfiguration( void )
 
 void CStdOption::writeDefaultFileManager( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("KDFConfig");
   config.writePathEntry( "FileManagerCommand", mDefaultFileManager );
   config.sync();
diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp
index ff806f9..ad9bf6f 100644
--- a/kdf/tdeconftest.cpp
+++ b/kdf/tdeconftest.cpp
@@ -50,7 +50,7 @@ main(int argc, char ** argv)
  TDECmdLineArgs::init(argc, argv, "test", description, version);
  
  TDEApplication app;
- TDEConfig * cfg = kapp->config();
+ TDEConfig * cfg = tdeApp->config();
 
  TQDict<char> dict;
 
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index ddb185e..c027328 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -74,7 +74,7 @@ TopLevel::TopLevel (TQWidget *, const char *name)
   statusbar_timer = new TQTimer(this);
   connect(statusbar_timer, TQ_SIGNAL(timeout()),this,TQ_SLOT(timer_slot()));
 
-  connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
+  connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
 
   setupStatusBar();
   setupActions();
@@ -264,7 +264,7 @@ void TopLevel::saveProperties(TDEConfig* config)
     TQString name = m_url.url();
     if (name.isEmpty())
        name = TQString("kedit%1-%2").arg(getpid()).arg((long)this);
-    TQString tmplocation = kapp->tempSaveName(m_url.url());
+    TQString tmplocation = tdeApp->tempSaveName(m_url.url());
     config->writeEntry("saved_to",tmplocation);
     saveFile(tmplocation, false, m_url.fileEncoding());
   }
@@ -577,7 +577,7 @@ void TopLevel::file_insert()
 bool TopLevel::queryExit()
 {
   // save recent files menu
-  config = kapp->config();
+  config = tdeApp->config();
   recent->saveEntries( config );
   config->sync();
 
@@ -764,7 +764,7 @@ void TopLevel::mail()
   if( index != -1)
     defaultsubject = defaultsubject.right(defaultsubject.length() - index - 1 );
 
-  kapp->invokeMailer( TQString(), TQString(), TQString(),
+  tdeApp->invokeMailer( TQString(), TQString(), TQString(),
        defaultsubject, eframe->text() );
 }
 
@@ -805,7 +805,7 @@ void TopLevel::fancyprint(){
 
 void TopLevel::helpselected(){
 
-  kapp->invokeHelp( );
+  tdeApp->invokeHelp( );
 
 }
 
@@ -1233,7 +1233,7 @@ void TopLevel::updateSettings( void )
 
 void TopLevel::readSettings( void )
 {
-  recent->loadEntries( kapp->config() );
+  recent->loadEntries( tdeApp->config() );
 }
 
 
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index e7d005a..b5356cc 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -335,7 +335,7 @@ void FloppyData::keyPressEvent(TQKeyEvent *e)
 {
 	switch(e->key()) {
 	case TQt::Key_F1:
-		kapp->invokeHelp();
+		tdeApp->invokeHelp();
 		break;
 	default:
 		KDialog::keyPressEvent(e);
@@ -424,7 +424,7 @@ bool FloppyData::setInitialDevice(const TQString& dev)
 void FloppyData::quit(){
   if (formatActions) formatActions->quit();
   writeSettings();
-  kapp->quit();
+  tdeApp->quit();
   delete this;
 }
 
@@ -664,7 +664,7 @@ void FloppyData::formatStatus(const TQString &s,int p)
 
 void FloppyData::writeSettings(){
 
-        config = kapp->config();
+        config = tdeApp->config();
 	config->setGroup("GeneralData");
 
 	densityconfig = densityComboBox->currentText().stripWhiteSpace();
@@ -694,7 +694,7 @@ void FloppyData::writeSettings(){
 
 void FloppyData::readSettings(){
 
-        config = kapp->config();
+        config = tdeApp->config();
 	config->setGroup("GeneralData");
 
 	verifyconfig = config->readNumEntry("Verify", 1);
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 5273fcf..1957b96 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -125,13 +125,13 @@ void  MyView::clipEncrypt()
 
 void  MyView::clipDecrypt()
 {
-        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace();
 	droppedtext(clippie,false);
 }
 
 void  MyView::clipSign(bool openEditor)
 {
-        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace();
         if (!clippie.isEmpty()) {
                 KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
 		connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont)));
@@ -213,7 +213,7 @@ pop = new KPassivePopup();
 	pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop));
 	pop->setAutoDelete(false);
 	pop->show();
-	kapp->processEvents();
+	tdeApp->processEvents();
 	dialogue->slotAccept();
 	dialogue=0L;
 
@@ -573,7 +573,7 @@ void  MyView::dropEvent (TQDropEvent *o)
 void  MyView::readOptions()
 {
 	clipboardMode=TQClipboard::Clipboard;
-        if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection())
+        if ( KGpgSettings::useMouseSelection() && tdeApp->clipboard()->supportsSelection())
                 clipboardMode=TQClipboard::Selection;
 
 	if (KGpgSettings::firstRun()) {
@@ -823,13 +823,13 @@ void  MyView::slotGenKey()
 
 void  MyView::about()
 {
-        TDEAboutApplication dialog(kapp->aboutData());//_aboutData);
+        TDEAboutApplication dialog(tdeApp->aboutData());//_aboutData);
         dialog.exec();
 }
 
 void  MyView::help()
 {
-        kapp->invokeHelp(0,"kgpg");
+        tdeApp->invokeHelp(0,"kgpg");
 }
 
 kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
@@ -865,7 +865,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
 void kgpgapplet::checkMenu()
 {
 	KgpgDecryptClipboard->setEnabled(false);
-	if ((kapp->clipboard()->text(w->clipboardMode).isEmpty()))
+	if ((tdeApp->clipboard()->text(w->clipboardMode).isEmpty()))
 	{
 		KgpgEncryptClipboard->setEnabled(false);
 		KgpgSignClipboard->setEnabled(false);
@@ -873,7 +873,7 @@ void kgpgapplet::checkMenu()
 	else
 	{
 		KgpgEncryptClipboard->setEnabled(true);
-		if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
+		if (tdeApp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
 		KgpgDecryptClipboard->setEnabled(true);
 		KgpgSignClipboard->setEnabled(true);
 	}
@@ -882,21 +882,21 @@ void kgpgapplet::checkMenu()
 void kgpgapplet::showOptions()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
 void kgpgapplet::slotOpenKeyManager()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
 void kgpgapplet::slotOpenServerDialog()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
@@ -1069,7 +1069,7 @@ int KgpgAppletApp::newInstance()
 
 void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
 {
-        if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
+        if (tdeApp->clipboard()->text(clipboardMode).isEmpty()) {
 	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this);
 	return;
 	}
@@ -1081,12 +1081,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
                 KgpgInterface *txtEncrypt=new KgpgInterface();
                 connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString)));
 		connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip()));
-                txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
+                txtEncrypt->KgpgEncryptText(tdeApp->clipboard()->text(clipboardMode),selec,encryptOptions);
 }
 
 void MyView::slotPassiveClip()
 {
-TQString newtxt=kapp->clipboard()->text(clipboardMode);
+TQString newtxt=tdeApp->clipboard()->text(clipboardMode);
 if (newtxt.length()>300)
                         newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace());
 
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 405005e..1c7aa8d 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -78,14 +78,14 @@ delete view;
 void KgpgApp::slotOptions()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
 void KgpgApp::slotKeyManager()
 {
 TQByteArray data;
-if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
+if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data))
 kdDebug(2100) <<"there was some error using DCOP."<<endl;
 }
 
@@ -93,7 +93,7 @@ void KgpgApp::closeEvent ( TQCloseEvent * e )
 {
         if (!isMainWindow)
 	{
-	 kapp->ref();
+	 tdeApp->ref();
 	TDEMainWindow::closeEvent( e );
 	}
   else e->accept();
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 38f80ad..2d95b6e 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -1180,7 +1180,7 @@ void listKeys::addToKAB()
         }
 
 	TDEABC::Addressee::List addresseeList = ab->findByEmail(email);
-  	kapp->startServiceByDesktopName( "kaddressbook" );
+  	tdeApp->startServiceByDesktopName( "kaddressbook" );
   	DCOPRef call( "kaddressbook", "KAddressBookIface" );
   	if( !addresseeList.isEmpty() ) {
     	call.send( "showContactEditor(TQString)", addresseeList.first().uid() );
@@ -1230,7 +1230,7 @@ void listKeys::allToKAB()
 
 void listKeys::slotManpage()
 {
-        kapp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), 0, 0, 0, "", true);
+        tdeApp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), 0, 0, 0, "", true);
 }
 
 void listKeys::slotTip()
@@ -1240,7 +1240,7 @@ void listKeys::slotTip()
 
 void listKeys::closeEvent ( TQCloseEvent * e )
 {
-        //kapp->ref(); // prevent TDEMainWindow from closing the app
+        //tdeApp->ref(); // prevent TDEMainWindow from closing the app
         //TDEMainWindow::closeEvent( e );
         e->accept();
         //	hide();
@@ -1319,7 +1319,7 @@ void listKeys::readOptions()
 
 //	kdDebug(2100) << k_funcinfo << endl;
         clipboardMode=TQClipboard::Clipboard;
-        if (KGpgSettings::useMouseSelection() && (kapp->clipboard()->supportsSelection()))
+        if (KGpgSettings::useMouseSelection() && (tdeApp->clipboard()->supportsSelection()))
                 clipboardMode=TQClipboard::Selection;
 
         ///////  re-read groups in case the config file location was changed
@@ -1638,7 +1638,7 @@ void listKeys::slotexport()
 void listKeys::slotProcessExportMail(TQString keys)
 {
         ///   start default Mail application
-        kapp->invokeMailer(TQString(), TQString(), TQString(), TQString(),
+        tdeApp->invokeMailer(TQString(), TQString(), TQString(), TQString(),
                            keys, //body
                            TQString(),
                            TQString()); // attachments
@@ -1646,7 +1646,7 @@ void listKeys::slotProcessExportMail(TQString keys)
 
 void listKeys::slotProcessExportClip(TQString keys)
 {
-        kapp->clipboard()->setText(keys,clipboardMode);
+        tdeApp->clipboard()->setText(keys,clipboardMode);
 }
 
 
@@ -2103,7 +2103,7 @@ void listKeys::dcopImportFinished()
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
    stream << true;
-    kapp->dcopClient()->emitDCOPSignal("keyImported(bool)", params);
+    tdeApp->dcopClient()->emitDCOPSignal("keyImported(bool)", params);
     refreshkey();
 }
 
@@ -2598,7 +2598,7 @@ void listKeys::slotPreImportKey()
                                 connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned()));
                         }
                 } else {
-                        TQString keystr = kapp->clipboard()->text(clipboardMode);
+                        TQString keystr = tdeApp->clipboard()->text(clipboardMode);
                         if (!keystr.isEmpty()) {
                                 changeMessage(i18n("Importing..."),0,true);
                                 KgpgInterface *importKeyProcess=new KgpgInterface();
@@ -2833,7 +2833,7 @@ void KeyView::refreshkeylist()
 {
 //	kdDebug(2100) << k_funcinfo << endl;
         emit statusMessage(i18n("Loading Keys..."),0,true);
-        kapp->processEvents();
+        tdeApp->processEvents();
         ////////   update display of keys in main management window
 //	kdDebug(2100)<<"Refreshing key list"<<endl;
 
diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp
index 76f48bc..a26ed0e 100644
--- a/khexedit/dialog.cpp
+++ b/khexedit/dialog.cpp
@@ -78,7 +78,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckVisible, 2, 0 );
   gbox->setRowStretch( 3, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Goto Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", false ) );
   mCheckVisible->setChecked( config.readBoolEntry( "StayVisible", true ) );
@@ -89,7 +89,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
 
 CGotoDialog::~CGotoDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Goto Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "StayVisible", mCheckVisible->isChecked() );
@@ -232,7 +232,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Find Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -248,7 +248,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
 
 CFindDialog::~CFindDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Find Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -573,7 +573,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Replace Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -592,7 +592,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
 
 CReplaceDialog::~CReplaceDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Replace Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -1146,7 +1146,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
   connect( mCheckOnCursor, TQ_SIGNAL(clicked()), TQ_SLOT(cursorCheck()) );
   gbox->setRowStretch( 3, 10 );
 
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Insert Pattern Dialog");
   mCheckPattern->setChecked( config.readBoolEntry( "RepeatPattern", false ) );
   mCheckOnCursor->setChecked( config.readBoolEntry( "InsertOnCursor", false) );
@@ -1159,7 +1159,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
 
 CInsertDialog::~CInsertDialog( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup("Insert Pattern Dialog");
   config.writeEntry( "RepeatPattern", mCheckPattern->isChecked() );
   config.writeEntry( "InsertOnCursor", mCheckOnCursor->isChecked() );
diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp
index 5638576..d066738 100644
--- a/khexedit/hexeditorwidget.cpp
+++ b/khexedit/hexeditorwidget.cpp
@@ -64,8 +64,8 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name )
   connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )),
 	   TQ_SLOT( open(const TQString&, bool, uint)) );
   connect( mHexView, TQ_SIGNAL(pleaseStepFile(bool)), TQ_SLOT( stepFile(bool)) );
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) );
-  connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) );
   connect( mHexView, TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
 	   TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) );
   connect( mHexView, TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
@@ -453,26 +453,26 @@ void CHexEditorWidget::setColor( const SDisplayColor &color )
   //
   // The selection colors can not be chosen.
   //
-  mDisplayState.color.selectBg = kapp->palette().active().highlight();
-  mDisplayState.color.selectFg = kapp->palette().active().highlightedText();
+  mDisplayState.color.selectBg = tdeApp->palette().active().highlight();
+  mDisplayState.color.selectFg = tdeApp->palette().active().highlightedText();
 
   if( mDisplayState.color.useSystemColor == true )
   {
     SDisplayColor c = mDisplayState.color;
-    c.textBg           = kapp->palette().active().base();
-    c.secondTextBg     = kapp->palette().active().base();
-    c.offsetBg         = kapp->palette().active().base();
-    c.inactiveBg       = kapp->palette().active().base();
-    c.primaryFg[0]     = kapp->palette().active().text();
-    c.primaryFg[1]     = kapp->palette().active().text();
-    c.nonPrintFg       = kapp->palette().active().text();
-    c.offsetFg         = kapp->palette().active().text();
-    c.secondaryFg      = kapp->palette().active().text();
-    c.leftSeparatorFg  = kapp->palette().active().text();
-    c.rightSeparatorFg = kapp->palette().active().text();
-    c.cursorBg         = kapp->palette().active().text();
-    c.cursorFg         = kapp->palette().active().base();
-    c.gridFg           = kapp->palette().active().text();
+    c.textBg           = tdeApp->palette().active().base();
+    c.secondTextBg     = tdeApp->palette().active().base();
+    c.offsetBg         = tdeApp->palette().active().base();
+    c.inactiveBg       = tdeApp->palette().active().base();
+    c.primaryFg[0]     = tdeApp->palette().active().text();
+    c.primaryFg[1]     = tdeApp->palette().active().text();
+    c.nonPrintFg       = tdeApp->palette().active().text();
+    c.offsetFg         = tdeApp->palette().active().text();
+    c.secondaryFg      = tdeApp->palette().active().text();
+    c.leftSeparatorFg  = tdeApp->palette().active().text();
+    c.rightSeparatorFg = tdeApp->palette().active().text();
+    c.cursorBg         = tdeApp->palette().active().text();
+    c.cursorFg         = tdeApp->palette().active().base();
+    c.gridFg           = tdeApp->palette().active().text();
     SDisplayColor defaultColor;
     c.bookmarkBg       = defaultColor.bookmarkBg;
     c.bookmarkFg       = defaultColor.bookmarkFg;
@@ -2347,20 +2347,20 @@ int CHexEditorWidget::progressParse( const SProgressData &pd )
     emit operationChanged( false );
     mProgressBusy = false;
     enableInputLock( false );
-    kapp->processEvents();
+    tdeApp->processEvents();
     return( Err_Success );
   }
   else if( pd.useFraction == 1 )
   {
     emit enableProgressText( true );
     emit setProgress( (int)(100.0 * pd.fraction ) );
-    kapp->processEvents();
+    tdeApp->processEvents();
   }
   else
   {
     emit enableProgressText( true );
     emit setProgress( pd.curPage, pd.maxPage );
-    kapp->processEvents();
+    tdeApp->processEvents();
   }
 
   if( mProgressStop == false )
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 47ace2c..51d72bc 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -382,8 +382,8 @@ class SDisplayColor
       textBg           = TQt::white;
       secondTextBg     = TQt::white;
       inactiveBg       = TQt::gray;
-      selectBg         = kapp->palette().active().highlight();
-      selectFg         = kapp->palette().active().highlightedText();
+      selectBg         = tdeApp->palette().active().highlight();
+      selectFg         = tdeApp->palette().active().highlightedText();
       markBg           = TQt::blue;
       markFg           = TQt::white;
       primaryFg[0]     = TQt::black;
diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp
index a9a018f..361c8c8 100644
--- a/khexedit/hexmanagerwidget.cpp
+++ b/khexedit/hexmanagerwidget.cpp
@@ -133,7 +133,7 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position )
     p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2);
     mConverter->resize( mConverter->minimumSize() );
     mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true );
-    mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion")));
+    mConverter->setCaption(tdeApp->makeStdCaption(i18n("Conversion")));
   }
   else
   {
diff --git a/khexedit/hextoolwidget.cpp b/khexedit/hextoolwidget.cpp
index d6f51ed..84d3033 100644
--- a/khexedit/hextoolwidget.cpp
+++ b/khexedit/hextoolwidget.cpp
@@ -141,7 +141,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
 
   mUtilBox->activate();
 
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ),
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ),
 	   TQ_SLOT( fontChanged() ) );
 
   mCursorState.valid = false;
diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp
index 19a1d54..bcdca2f 100644
--- a/khexedit/hexviewwidget.cpp
+++ b/khexedit/hexviewwidget.cpp
@@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e )
     if( mPending == true )
     {
       mPending = false;
-      emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
+      emit startDrag( ( tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
     }
   }
 }
@@ -451,7 +451,7 @@ void CHexViewWidget::paletteChanged( void )
 
 void CHexViewWidget::fontChanged( void )
 {
-  //setFont( kapp->fixedFont, true );
+  //setFont( tdeApp->fixedFont, true );
 }
 
 void CHexViewWidget::filter( SFilterControl &fc )
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index 1b73ec1..99db8cf 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -312,7 +312,7 @@ class CHexViewWidget : public TQFrame
 
 inline bool CHexViewWidget::shiftButtonState( void )
 {
-  return kapp->keyboardModifiers() & TDEApplication::ShiftModifier;
+  return tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier;
 }
 
 
diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp
index 4d4c9dd..aa7ef6b 100644
--- a/khexedit/stringdialog.cpp
+++ b/khexedit/stringdialog.cpp
@@ -150,7 +150,7 @@ void CStringDialog::showEvent( TQShowEvent *e )
 
 void CStringDialog::readConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup( "String Dialog" );
 
   mLengthSpin->setValue( config.readNumEntry("MinimumLength", 4)  );
@@ -163,7 +163,7 @@ void CStringDialog::readConfiguration( void )
 
 void CStringDialog::writeConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   config.setGroup( "String Dialog" );
 
   config.writeEntry( "MinimumLength", mLengthSpin->value() );
diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp
index 474faa3..8f3650a 100644
--- a/khexedit/toplevel.cpp
+++ b/khexedit/toplevel.cpp
@@ -375,7 +375,7 @@ void KHexEdit::initialize( bool openFiles )
   {
     // Code modified from tdelibs/tdeui/tdeactionclasses.cpp TDERecentFilesAction::loadEntries
       
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     const TQString oldGroup = config->group();
     
@@ -608,7 +608,7 @@ void KHexEdit::closeProgram( void )
       mWindowList.removeRef( mWindowList.first() );
     }
 
-    kapp->quit();
+    tdeApp->quit();
   }
   else
   {
@@ -641,14 +641,14 @@ bool KHexEdit::queryExit( void )
 
 void KHexEdit::readConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   readConfiguration( config );
 }
 
 
 void KHexEdit::writeConfiguration( void )
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
   writeConfiguration( config );
 }
 
@@ -1351,7 +1351,7 @@ void KHexEdit::resizeTest()
   for( int i=0; i<loop; i+=4 )
   {
     resize( i+400, i+400 );
-    //kapp->processOneEvent();
+    //tdeApp->processOneEvent();
   }
 
   gettimeofday( &t2, 0 );
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 1e58f8f..a1cdc75 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -1032,7 +1032,7 @@ void KJotsMain::updateCaption()
         }
     }
 
-    setCaption(kapp->makeStdCaption(caption));
+    setCaption(tdeApp->makeStdCaption(caption));
     return;
 }
 
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 61ea63d..88d2ad9 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -245,7 +245,7 @@ void KJotsBook::init()
     m_open = false;
     m_saveProgressDialog = 0;
     setExpandable(true);
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
+    setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
 }
 
 /*!
@@ -501,7 +501,7 @@ void KJotsBook::rename()
     {
         setSubject(name);
 
-        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+        KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget());
 
         if (m)
             m->updateCaption();
@@ -849,7 +849,7 @@ KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
 {
     m_isBook = false;
     m_paraPos = m_indexPos = 0;
-    setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
+    setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
 }
 
 KJotsPage::~KJotsPage()
@@ -913,7 +913,7 @@ void KJotsPage::rename()
     {
         setSubject(name);
 
-        KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget());
+        KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget());
 
         if (m)
             m->updateCaption();
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index ff7530b..88af254 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -517,7 +517,7 @@ void laptop_dock::invokeSuspend()
 
 void laptop_dock::invokeLockSuspend()
 {
-  DCOPClient* client = kapp->dcopClient();
+  DCOPClient* client = tdeApp->dcopClient();
   if (client)
       client->send("kdesktop", "KScreensaverIface", "lock()", TQString(""));
   laptop_portable::invoke_suspend();
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 1649fc8..c585868 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -70,7 +70,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
 {
 	xwidget = new XWidget(this);
 	xwidget->hide();
-	kapp->installX11EventFilter(xwidget);
+	tdeApp->installX11EventFilter(xwidget);
 
         mLavEnabled = false;
 	backoffTimer = 0;
@@ -314,7 +314,7 @@ void laptop_daemon::setBlankSaver(bool blanked)
 	TQByteArray ba;
 	TQDataStream ds(ba, IO_WriteOnly);
 	ds << bool(blanked);
-	// can't use kapp->dcopClient() because it breaks TDEUniqueApplication
+	// can't use tdeApp->dcopClient() because it breaks TDEUniqueApplication
 	DCOPClient c;
 	c.attach();
 	c.send("kdesktop", "KScreensaverIface", "setBlankOnly(bool)", ba);
@@ -496,7 +496,7 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type)
 	// beep if we are allowed to
 	if (s.systemBeep[t]) {
 		//KNotifyClient::beep();
-		(void)kapp->beep();
+		(void)tdeApp->beep();
 	}
 
 	// run a command if we have to
@@ -820,14 +820,14 @@ void laptop_daemon::invokeHibernate()
 
 void laptop_daemon::invokeLogout()
 {
-	bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow);
+	bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow);
 	if (!rc)
 		KMessageBox::sorry(0, i18n("Logout failed."));
 }
 
 void laptop_daemon::invokeShutdown()
 {
-	bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow);
+	bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow);
 	if (!rc)
 		KMessageBox::sorry(0, i18n("Shutdown failed."));
 }
diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp
index 019542c..4473f1b 100644
--- a/klaptopdaemon/wake_laptop.cpp
+++ b/klaptopdaemon/wake_laptop.cpp
@@ -29,7 +29,7 @@
 TDE_EXPORT void
 wake_laptop_daemon()
 {
-	DCOPClient      *dclient = kapp->dcopClient();
+	DCOPClient      *dclient = tdeApp->dcopClient();
         if (!dclient || (!dclient->isAttached() && !dclient->attach())) 
 		return;
 
diff --git a/klaptopdaemon/xautolock.cpp b/klaptopdaemon/xautolock.cpp
index 93834af..0c7d724 100644
--- a/klaptopdaemon/xautolock.cpp
+++ b/klaptopdaemon/xautolock.cpp
@@ -69,7 +69,7 @@ XAutoLock::XAutoLock()
 #endif
     if( !xautolock_useXidle && !xautolock_useMit )
     {
-        kapp->installX11EventFilter( this );
+        tdeApp->installX11EventFilter( this );
         int (*oldHandler)(Display *, XErrorEvent *);
         oldHandler = XSetErrorHandler(catchFalseAlarms);
         XSync(tqt_xdisplay(), False );
diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp
index e647d89..2bcb9ed 100644
--- a/kmilo/delli8k/delli8k.cpp
+++ b/kmilo/delli8k/delli8k.cpp
@@ -145,7 +145,7 @@ bool DellI8kMonitor::retrieveVolume()
     if (kmix_error)
     {
         // maybe the error occurred because kmix wasn't running
-        if( kapp->startServiceByDesktopName( "kmix" ) == 0 )            // trying to start kmix
+        if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 )            // trying to start kmix
         {
             // trying again
             reply = kmixClient->call( "masterVolume");
@@ -210,7 +210,7 @@ bool DellI8kMonitor::retrieveMute()
     if (kmix_error)
     {
         // maybe the error occurred because kmix wasn't running
-        if( kapp->startServiceByDesktopName( "kmix" ) == 0 )            // trying to start kmix
+        if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 )            // trying to start kmix
         {
             // trying again
             reply = kmixClient->call( "masterVolume" );
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index e1933c9..2c15ad5 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -147,7 +147,7 @@ bool GenericMonitor::retrieveVolume(int &volume)
 
 	// maybe the error occurred because kmix wasn't running. Try to start it
 	_interface->displayText(i18n("Starting KMix..."));
-	if (kapp->startServiceByDesktopName("kmix") == 0)
+	if (tdeApp->startServiceByDesktopName("kmix") == 0)
 	{
 		// trying again
 		reply = kmixClient->call("volume");
@@ -215,7 +215,7 @@ bool GenericMonitor::retrieveMute(bool &muted)
 
 	// maybe the error occurred because kmix wasn't running. Try to start it
 	_interface->displayText(i18n("Starting KMix..."));
-	if (kapp->startServiceByDesktopName("kmix") == 0)
+	if (tdeApp->startServiceByDesktopName("kmix") == 0)
 	{
 		// trying again
 		reply = kmixClient->call("mute");
@@ -324,12 +324,12 @@ void GenericMonitor::launch(TQString configKey, TQString defaultApplication)
 void GenericMonitor::launchMail()
 {
 	kdDebug() << "launchMail" << endl;
-	kapp->invokeMailer("", "", "", "", "", "", "", "");
+	tdeApp->invokeMailer("", "", "", "", "", "", "", "");
 }
 
 void GenericMonitor::launchBrowser()
 {
-	kapp->invokeBrowser("");
+	tdeApp->invokeBrowser("");
 }
 
 void GenericMonitor::launchSearch()
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 004f15e..c9b114d 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -478,7 +478,7 @@ bool KVaio::retrieveVolume() {
         {
 //                _interface->displayText
 		showTextMsg(i18n("Starting KMix..."));
-                if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
+                if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix
                 {
                         // trying again
                         reply = kmixClient->call("masterVolume");
@@ -545,7 +545,7 @@ bool KVaio::retrieveMute()
                 // maybe the error occurred because kmix wasn't running
                 //_interface->displayText
 		showTextMsg(i18n("Starting KMix..."));
-                if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
+                if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix
                 {
                         // trying again
                         reply = kmixClient->call("masterMute");
diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp
index 16e22a9..50bc532 100644
--- a/kmilo/thinkpad/thinkpad.cpp
+++ b/kmilo/thinkpad/thinkpad.cpp
@@ -461,7 +461,7 @@ bool ThinkPadMonitor::retrieveVolume() {
 	}
 
 	if (kmix_error) { // maybe the error occurred because kmix wasn't running
-		if (kapp->startServiceByDesktopName("kmix")==0) { // trying to start kmix
+		if (tdeApp->startServiceByDesktopName("kmix")==0) { // trying to start kmix
 			// trying again
 			reply = kmixClient->call("masterVolume");
 			if (reply.isValid())  {
diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp
index 0afa3ea..cb21ca9 100644
--- a/kregexpeditor/infopage.cpp
+++ b/kregexpeditor/infopage.cpp
@@ -88,7 +88,7 @@ void InfoPage::setSource ( const TQString& name )
     TQTextBrowser::setSource( nm );
 #else
   if ( name.startsWith( TQString::fromLocal8Bit("doc://") ) ) {
-    kapp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") );
+    tdeApp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") );
   }
   else {
     KTextBrowser::setSource( name ); // handle mailto and other links
diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp
index e16e16a..5f89df3 100644
--- a/kregexpeditor/kregexpeditorgui.cpp
+++ b/kregexpeditor/kregexpeditorgui.cpp
@@ -150,7 +150,7 @@ void KRegExpEditorGUI::showHelp()
 #ifdef TQT_ONLY
     _editor->showHelp();
 #else
-    kapp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) );
+    tdeApp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) );
 #endif
 }
 
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 445ba8c..544c12e 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -110,7 +110,7 @@ void KSim::PanelExtension::about()
 
 void KSim::PanelExtension::help()
 {
-  kapp->invokeHelp(TQString::null, "ksim");
+  tdeApp->invokeHelp(TQString::null, "ksim");
 }
 
 void KSim::PanelExtension::preferences()
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 91fd84c..e112ece 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -278,7 +278,7 @@ void KSim::MainView::reparseConfig(bool emitReload,
 
     if (!(*plugin).isDifferent() && (*plugin).isEnabled()) {
       kdDebug(2003) << "Recreating " << (*plugin).name() << "'s view" << endl;
-      kapp->processEvents();
+      tdeApp->processEvents();
       // Make sure the plugins background color is
       // set to the correct theme color
       if (themeChanged && (*plugin).view())
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 150a2ba..18aff4a 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -50,7 +50,7 @@ KSim::PluginObject::~PluginObject()
 
 const char *KSim::PluginObject::instanceName() const
 {
-  return kapp->aboutData()->appName();
+  return tdeApp->aboutData()->appName();
 }
 
 const TQCString &KSim::PluginObject::name() const
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 68d720b..c3eca2a 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -94,7 +94,7 @@ KSim::PluginPage *CpuPlugin::createConfigPage(const char *className)
 
 void CpuPlugin::showAbout()
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim CPU Plugin"), version.latin1(),
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index fe278b5..47b478a 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -90,7 +90,7 @@ KSim::PluginPage *DiskPlugin::createConfigPage(const char *className)
 
 void DiskPlugin::showAbout()
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Disk Plugin"), version.latin1(),
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 262ae93..1f95a08 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -64,7 +64,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className)
 
 void PluginModule::showAbout()
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim FileSystem Plugin"), version.latin1(),
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 556f15c..1b6c0b3 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -59,7 +59,7 @@ KSim::PluginPage *I8KPlugin::createConfigPage(const char *className)
 
 void I8KPlugin::showAbout()
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim I8K Plugin"), version.latin1(),
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index e920df9..d696c92 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -58,7 +58,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className)
 
 void PluginModule::showAbout()  
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Sensors Plugin"), version.latin1(),
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 2167abe..20c0c9d 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -84,7 +84,7 @@ KSim::PluginPage *NetPlugin::createConfigPage(const char *className)
 
 void NetPlugin::showAbout()
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Net Plugin"), version.latin1(),
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 39ea761..5066541 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -53,7 +53,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
    : TQTabDialog(parent, name, true)
 {
   m_clicked = false;
-  setCaption(kapp->makeStdCaption(i18n("Network Interface")));
+  setCaption(tdeApp->makeStdCaption(i18n("Network Interface")));
 
   m_generalTab = new TQWidget(this);
   m_generalLayout = new TQGridLayout(m_generalTab);
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index b39d02c..ece303f 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -178,7 +178,7 @@ void KSim::ThemePrefs::setThemeAlts(int alternatives)
 
 void KSim::ThemePrefs::openURL(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 void KSim::ThemePrefs::insertItems(const ThemeInfoList &itemList)
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index fb047f3..9d11c4c 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -120,7 +120,7 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name )
     connect( m_help, TQ_SIGNAL(clicked()), TQ_SLOT(help()) );
     connect( m_list, TQ_SIGNAL(currentChanged(TQListViewItem*)),
              TQ_SLOT(currentChanged(TQListViewItem*)) );
-    loadJobs( kapp->config() );
+    loadJobs( tdeApp->config() );
 
     show();
 }
@@ -128,7 +128,7 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name )
 
 KTimerPref::~KTimerPref()
 {
-    saveJobs( kapp->config() );
+    saveJobs( tdeApp->config() );
     delete d;
 }
 
@@ -169,7 +169,7 @@ void KTimerPref::remove()
 
 void KTimerPref::help()
 {
-    kapp->invokeHelp();
+    tdeApp->invokeHelp();
 }
 
 
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index d828411..eab94db 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -144,7 +144,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
 
   connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this,
            TQ_SLOT(currentDesktopChanged(int)) );
-  connect( kapp, TQ_SIGNAL(backgroundChanged(int)), this,
+  connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), this,
            TQ_SLOT(currentWallpaperChanged(int)));
 
   // Setup of the Task Manager Callbacks
@@ -249,7 +249,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   menuList = new TQObjectList();
   menuList->setAutoDelete( true );
 
-  client = kapp->dcopClient();
+  client = tdeApp->dcopClient();
   if (!client->isAttached())
     client->attach();
   appId = client->registerAs(tqApp->name());
@@ -1268,9 +1268,9 @@ void karamba::setIncomingData(TQString theme, TQString obj)
    //dataStream << theme;
    //dataStream << txt;
 
-   //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data );
+   //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data );
 
-  DCOPClient *c = kapp->dcopClient();
+  DCOPClient *c = tdeApp->dcopClient();
   if (!c->isAttached())
     c->attach();
 
@@ -1288,9 +1288,9 @@ void karamba::callTheme(TQString theme, TQString txt)
    //dataStream << theme;
    //dataStream << txt;
 
-   //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data );
+   //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data );
 
-  DCOPClient *c = kapp->dcopClient();
+  DCOPClient *c = tdeApp->dcopClient();
   if (!c->isAttached())
     c->attach();
 
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 6d3c46c..fed4bb9 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -28,7 +28,7 @@
 
 bool KarambaSessionManaged::saveState(TQSessionManager&)
 {
-  TDEConfig* config = kapp->sessionConfig();
+  TDEConfig* config = tdeApp->sessionConfig();
 
   config->setGroup("General Options");
 
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 327b4cb..e4563da 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -53,7 +53,7 @@ bool SKNewStuff::install( const TQString &fileName )
   TDEStandardDirs myStdDir;
   TQFileInfo fi(fileName);
   TQString base = fi.baseName();
-  TQString baseDestDir =myStdDir.saveLocation("data", kapp->instanceName() + "/themes/", true);
+  TQString baseDestDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/themes/", true);
   const TQString destDir = baseDestDir + base + "/";
   TDEStandardDirs::makeDir( destDir );
 
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index 84e1590..98f3134 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -209,7 +209,7 @@ bool ThemeFile::set(const KURL &url)
 {
   if(!url.isLocalFile() && !url.protocol().isEmpty())
   {
-    if(KMessageBox::warningContinueCancel(kapp->activeWindow(),
+    if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(),
        i18n("You are about to install and run %1 SuperKaramba theme. Since "
             "themes can contain executable code you should only install themes "
             "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install")
@@ -224,7 +224,7 @@ bool ThemeFile::set(const KURL &url)
 
     if(localFile.exists())
     {
-      if(KMessageBox::warningContinueCancel(kapp->activeWindow(),
+      if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(),
          i18n("%1 already exists. Do you want to overwrite it?")
              .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
          == KMessageBox::Cancel)
@@ -233,7 +233,7 @@ bool ThemeFile::set(const KURL &url)
       }
     }
     if(!TDEIO::NetAccess::file_copy(url, localFile.filePath(), -1, true,
-      false, kapp->mainWidget()))
+      false, tdeApp->mainWidget()))
     {
       return false;
     }
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 4d79048..4ed7afb 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -76,7 +76,7 @@ void ThemesDlg::saveUserAddedThemes()
 {
   TDEStandardDirs ksd;
   TQStringList t = themes();
-  TQStringList dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes");
+  TQStringList dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes");
   TQStringList::Iterator it = t.begin();
   bool remove;
 
@@ -152,7 +152,7 @@ void ThemesDlg::populateListbox()
           this, TQ_SLOT(openLocalTheme()));
   tableThemes->insertItem(item);
 
-  dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes");
+  dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes");
   // Get custom dirs from config here?
   TQStringList::Iterator itend( dirs.end() );
   for(TQStringList::Iterator it = dirs.begin(); it != itend; ++it )
@@ -485,12 +485,12 @@ void ThemesDlg::uninstall()
     {
       kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" 
                 << endl;
-      kapp->config()->deleteEntry(tempPath);
+      tdeApp->config()->deleteEntry(tempPath);
       config->setGroup("TDENewStuffStatus");
       kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" 
                 << endl;
-      kapp->config()->deleteEntry(name);
-      kapp->config()->sync();
+      tdeApp->config()->deleteEntry(name);
+      tdeApp->config()->sync();
     }
 #endif
     
@@ -514,11 +514,11 @@ void ThemesDlg::uninstall()
     if(!name.isEmpty())
     {
       kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;
-      kapp->config()->deleteEntry(theme.path());
+      tdeApp->config()->deleteEntry(theme.path());
       config->setGroup("TDENewStuffStatus");
       kdDebug() << "removing " << name << " from superkarambarc" << endl;
-      kapp->config()->deleteEntry(name);
-      kapp->config()->sync();
+      tdeApp->config()->deleteEntry(name);
+      tdeApp->config()->sync();
     }
 #endif
   }
diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index 70f4f4e..996abdf 100644
--- a/tdefilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -244,7 +244,7 @@ void KAddStringDlg::slotDeleteStringFromView()
 
 void KAddStringDlg::slotHelp()
 {
-  kapp->invokeHelp(TQString(), "tdefilereplace");
+  tdeApp->invokeHelp(TQString(), "tdefilereplace");
 }
 
 #include "kaddstringdlg.moc"
diff --git a/tdefilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h
index 6f23b77..08a307e 100644
--- a/tdefilereplace/knewprojectdlg.h
+++ b/tdefilereplace/knewprojectdlg.h
@@ -58,7 +58,7 @@ class KNewProjectDlg : public KNewProjectDlgS
     void slotEnableChbUser(bool b);
     void slotEnableChbGroup(bool b);
     void slotEnableChbBackup(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); }
+    void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); }
 
   private:
     void initGUI();
diff --git a/tdefilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h
index 718ccb5..f2289ba 100644
--- a/tdefilereplace/koptionsdlg.h
+++ b/tdefilereplace/koptionsdlg.h
@@ -48,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS
     void slotChbBackup(bool b);
     void slotChbConfirmStrings(bool b);
     void slotChbShowConfirmDialog(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); }
+    void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); }
 
   private:
     void initGUI();
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index ce98154..4686894 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -143,7 +143,7 @@ void TDEFileReplacePart::slotSearchingOperation()
 
   m_view->showSemaphore("yellow");
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   //disabling and enabling sorting... don't ask me why, but it works!
   rv->setSorting(0);
@@ -377,7 +377,7 @@ void TDEFileReplacePart::showAboutApplication()
 
 void TDEFileReplacePart::appHelpActivated()
 {
-  kapp->invokeHelp(TQString(), "tdefilereplace");
+  tdeApp->invokeHelp(TQString(), "tdefilereplace");
 }
 
 void TDEFileReplacePart::reportBug()
@@ -493,7 +493,7 @@ void TDEFileReplacePart::initGUI()
 
   actionCollection()->setHighlightingEnabled(true);
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   QCStringList appList = client->registeredApplications();
   bool quantaFound = false;
   for(QCStringList::Iterator it = appList.begin(); it != appList.end(); ++it)
@@ -904,7 +904,7 @@ void TDEFileReplacePart::fileReplace()
       // Avoids files that not match requirements
       if(!TDEFileReplaceLib::isAnAccessibleFile(d.canonicalPath(), fileName, m_option))
         continue;
-      kapp->processEvents();
+      tdeApp->processEvents();
       if(m_option->m_backup)
         replaceAndBackup(d.canonicalPath(), fileName);
       else
@@ -960,7 +960,7 @@ void TDEFileReplacePart::recursiveFileReplace(const TQString &directoryName, int
       TQFileInfo qi(filePath);
 
       m_view->displayScannedFiles(foldersNumber, filesNumber);
-      kapp->processEvents();
+      tdeApp->processEvents();
       
       // Replace recursively if "filePath" is a directory and we have not reached the max depth level
       if (qi.isDir())
@@ -1245,7 +1245,7 @@ void TDEFileReplacePart::fileSearch(const TQString& directoryName, const TQStrin
       TQFileInfo fileInfo(filePath+"/"+fileName);
       if(fileInfo.isDir())
         continue;
-      kapp->processEvents();
+      tdeApp->processEvents();
       search(filePath, fileName);
       filesNumber++;
       m_view->displayScannedFiles(0, filesNumber);
@@ -1297,7 +1297,7 @@ void TDEFileReplacePart::recursiveFileSearch(const TQString &directoryName, cons
 
       m_view->displayScannedFiles(foldersNumber, filesNumber);
 
-      kapp->processEvents();
+      tdeApp->processEvents();
       // Searchs recursively if "filePath" is a directory and we have not reached the max depth level
       if (fileInfo.isDir())
         { 
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 5861eb1..616b3e3 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -283,7 +283,7 @@ void TDEFileReplaceView::slotResultEdit()
 
   while (lvi)
     {
-      DCOPClient *client = kapp->dcopClient();
+      DCOPClient *client = tdeApp->dcopClient();
       DCOPRef quanta(client->appId(),"WindowManagerIf");
       TQString path = TQString(lvi->text(1)+"/"+lvi->text(0));
       TQListViewItem *lviChild = lvi;
@@ -747,7 +747,7 @@ void TDEFileReplaceView::initGUI()
   m_stackStrings->addWidget(m_lvStrings);
   m_stackStrings->addWidget(m_lvStrings_2);
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   QCStringList appList = client->registeredApplications();
   bool quantaFound = false;
 
diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp
index cf4827a..af72da7 100644
--- a/tdelirc/irkick/irkick.cpp
+++ b/tdelirc/irkick/irkick.cpp
@@ -49,7 +49,7 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e)
 
 IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString())
 {
-    kapp->dcopClient()->setDefaultObject(obj);
+    tdeApp->dcopClient()->setDefaultObject(obj);
 	theClient = new KLircClient();
 
 	theTrayIcon = new IRKTrayIcon();
@@ -120,7 +120,7 @@ void IRKick::doQuit()
 		case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break;
 		case KMessageBox::Cancel: return;
 	}
-	TDEApplication::kApplication()->quit();
+	tdeApp->quit();
 }
 
 void IRKick::resetModes()
diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp
index 3a3e6bd..0ebf472 100644
--- a/tdelirc/kcmlirc/addaction.cpp
+++ b/tdelirc/kcmlirc/addaction.cpp
@@ -143,7 +143,7 @@ void AddAction::updateButtonStates()
 const TQStringList AddAction::getFunctions(const TQString app, const TQString obj)
 {
 	TQStringList ret;
-	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = tdeApp->dcopClient();
 	QCStringList theApps = theClient->remoteFunctions(app.utf8(), obj.utf8());
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 		if(	*i != "QCStringList interfaces()" &&
@@ -335,7 +335,7 @@ void AddAction::updateObjects()
 	uniqueProgramMap.clear();
 	nameProgramMap.clear();
 
-	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = tdeApp->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
diff --git a/tdelirc/kcmlirc/editaction.cpp b/tdelirc/kcmlirc/editaction.cpp
index 8d8a0cb..1b44eb7 100644
--- a/tdelirc/kcmlirc/editaction.cpp
+++ b/tdelirc/kcmlirc/editaction.cpp
@@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications()
 	TQStringList names;
 
 	theDCOPApplications->clear();
-	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = tdeApp->dcopClient();
 	QCStringList theApps = theClient->registeredApplications();
 	for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
 	{
@@ -337,7 +337,7 @@ void EditAction::updateDCOPApplications()
 void EditAction::updateDCOPObjects()
 {
 	theDCOPObjects->clear();
-	DCOPClient *theClient = TDEApplication::kApplication()->dcopClient();
+	DCOPClient *theClient = tdeApp->dcopClient();
 	if(theDCOPApplications->currentText().isNull() || theDCOPApplications->currentText().isEmpty()) return;
 	QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8());
 	if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object());
diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp
index a22508c..3b2a870 100644
--- a/tdelirc/kcmlirc/kcmlirc.cpp
+++ b/tdelirc/kcmlirc/kcmlirc.cpp
@@ -57,7 +57,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 	setButtons(TDECModule::Help);
 	setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
 	bool ok;
-	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	if(!ok)
 		if(KMessageBox::questionYesNo(this, i18n("The Infrared Remote Control software is not currently running. This configuration module will not work properly without it. Would you like to start it now?"), i18n("Software Not Running"), i18n("Start"), i18n("Do Not Start")) == KMessageBox::Yes)
 		{	kdDebug() << "S" << TDEApplication::startServiceByDesktopName("irkick") << endl;
@@ -68,7 +68,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
 					theConfig.writeEntry("AutoStart", true);
 		}
 
-	TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
+	tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok);
 	kdDebug() << "OK" << ok << endl;
 
 
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 4b7563f..37077b2 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -299,7 +299,7 @@ void TDEWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& l
 		delete _wallet;
 
 		//delete the folder from the source if we were moving
-		TQt::ButtonState state = kapp->keyboardMouseState();
+		TQt::ButtonState state = tdeApp->keyboardMouseState();
 		if (e->source() && e->source()->parent() &&
 			!strcmp(e->source()->parent()->className(), "TDEWalletEntryList") &&
 			!(state & TQt::ControlButton)) {
@@ -468,7 +468,7 @@ void TDEWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		e->ignore();
 		return;
 	}
-	TQt::ButtonState state = kapp->keyboardMouseState();
+	TQt::ButtonState state = tdeApp->keyboardMouseState();
 	if (isEntry) {
 		if (!item) {
 			e->ignore();
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 37608c2..6e27aca 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -73,10 +73,10 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
 				break;
 			}
 		}
-		if (!isOpen && kapp->isRestored()) {
+		if (!isOpen && tdeApp->isRestored()) {
 			delete _tray;
 			_tray = 0L;
-			TQTimer::singleShot( 0, kapp, TQ_SLOT( quit()));
+			TQTimer::singleShot( 0, tdeApp, TQ_SLOT( quit()));
 			return;
 		}
 	} else {
@@ -141,7 +141,7 @@ actionCollection());
 		show();
 	}
 
-	kapp->setName("tdewallet"); // hack to fix docs
+	tdeApp->setName("tdewallet"); // hack to fix docs
 }
 
 
@@ -158,9 +158,9 @@ void TDEWalletManager::tdewalletdLaunch() {
 
 
 bool TDEWalletManager::queryClose() {
-	if (!_shuttingDown && !kapp->sessionSaving()) {
+	if (!_shuttingDown && !tdeApp->sessionSaving()) {
 		if (!_tray) {
-			kapp->quit();
+			tdeApp->quit();
 		} else {
 			hide();
 		}
@@ -332,7 +332,7 @@ void TDEWalletManager::possiblyQuit() {
 			!isVisible() &&
 			!cfg.readBoolEntry("Leave Manager Open", false) &&
 			_tdewalletdLaunch) {
-		kapp->quit();
+		tdeApp->quit();
 	}
 }
 
@@ -394,7 +394,7 @@ void TDEWalletManager::createWallet() {
 
 void TDEWalletManager::shuttingDown() {
 	_shuttingDown = true;
-	kapp->quit();
+	tdeApp->quit();
 }
 
 
@@ -412,10 +412,10 @@ TQPixmap TDEWalletManager::loadSystemTrayIcon(const TQString &icon) {
 #if KDE_IS_VERSION(3, 1, 90)
 	return KSystemTray::loadIcon(icon);
 #else
-	TDEConfig *appCfg = kapp->config();
+	TDEConfig *appCfg = tdeApp->config();
 	TDEConfigGroupSaver configSaver(appCfg, "System Tray");
 	int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
-	return kapp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
+	return tdeApp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
 #endif
 }