Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

174 files changed, 462 insertions, 462 deletions

diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index a7b88a11f..1e09dc716 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -42,7 +42,7 @@ namespace Akregator {
 AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
    : AddFeedWidgetBase(parent, name)
 {
-    pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true));
+    pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true));
     statusLabel->setText(TQString());
 }
 
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 52b46a051..36afe37c4 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -220,11 +220,11 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
         NotificationManager::self()->setWidget(getMainWindow(), instance());
 
     connect( trayIcon, TQ_SIGNAL(quitSelected()),
-            kapp, TQ_SLOT(quit())) ;
+            tdeApp, TQ_SLOT(quit())) ;
 
     connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) );
 
-    connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown()));
+    connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown()));
 
     m_autosaveTimer = new TQTimer(this);
     connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList()));
@@ -530,7 +530,7 @@ TQWidget* Part::getMainWindow()
 {
     // this is a dirty fix to get the main window used for the tray icon
     
-    TQWidgetList *l = kapp->topLevelWidgets();
+    TQWidgetList *l = tdeApp->topLevelWidgets();
     TQWidgetListIt it( *l );
     TQWidget *wid;
 
@@ -721,7 +721,7 @@ void Part::fileSendArticle(bool attach)
     title = m_view->currentFrame()->title();
 
     if(attach) {
-        kapp->invokeMailer("",
+        tdeApp->invokeMailer("",
                            "",
                            "",
                            title,
@@ -730,7 +730,7 @@ void Part::fileSendArticle(bool attach)
                            text);
     }
     else {
-        kapp->invokeMailer("",
+        tdeApp->invokeMailer("",
                            "",
                            "",
                            title,
@@ -946,12 +946,12 @@ static TQString getMyHostName()
 bool Part::tryToLock(const TQString& backendName)
 {
 // Check and create a lock file to prevent concurrent access to metakit archive
-    TQString appName = kapp->instanceName();
+    TQString appName = tdeApp->instanceName();
     if ( appName.isEmpty() )
         appName = "akregator";
 
     TQString programName;
-    const TDEAboutData *about = kapp->aboutData();
+    const TDEAboutData *about = tdeApp->aboutData();
     if ( about )
         programName = about->programName();
     if ( programName.isEmpty() )
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 073a638ff..cf195cd5c 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -175,8 +175,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name)
     
     connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
-    connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
+    connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) );
     
     m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/"));
     m_htmlFooter = "</body></html>";
@@ -370,7 +370,7 @@ void ArticleViewer::displayAboutPage()
     TQString location = locate("data", "akregator/about/main.html");
     TQString content = KPIM::kFileToString(location);
     content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
         content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
     else
         content = content.arg( "" );
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index 513f845fa..a6890e2be 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -95,7 +95,7 @@ void FeedIconManager::loadIcon(const TQString & url)
         TQByteArray data;
         TQDataStream ds(data, IO_WriteOnly);
         ds << u;
-        kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)",
+        tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)",
                                  data);
     }
     else
@@ -116,7 +116,7 @@ TQString FeedIconManager::iconLocation(const KURL & url) const
 
     ds << url;
 
-    kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
+    tdeApp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data,
                              replyType, reply);
 
     if (replyType == "TQString") {
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 4515cf7e0..a6e970e2c 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -53,7 +53,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
 	if ( status != Success )
 		kdDebug() << "ERROR " << loader->errorCode() << endl;
 
-	kapp->quit();
+	tdeApp->quit();
 }
 
 int main( int argc, char **argv )
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index e5c138679..27fa8560f 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -154,7 +154,7 @@ void MainWindow::setupActions()
 {
     connectActionCollection(actionCollection());
 
-    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
     setStandardToolBarMenuEnabled(true);
     createStandardStatusBarAction();
@@ -235,7 +235,7 @@ void MainWindow::connectActionCollection( TDEActionCollection *coll )
 bool MainWindow::queryExit()
 {
     kdDebug() << "MainWindow::queryExit()" << endl;
-    if ( !kapp->sessionSaving() )
+    if ( !tdeApp->sessionSaving() )
     {
         delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache
         m_part = 0;
@@ -250,12 +250,12 @@ void MainWindow::slotQuit()
 {
     if (TrayIcon::getInstance())
         TrayIcon::getInstance()->hide();
-    kapp->quit();
+    tdeApp->quit();
 }
 
 bool MainWindow::queryClose()
 {
-    if (kapp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() )
+    if (tdeApp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() )
     {
         return true;
     }
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index b1cbf9c52..f1f1bb895 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -269,7 +269,7 @@ void TabWidget::slotDetachTab()
 
     url = view->part()->url();
 
-    kapp->invokeBrowser(url.url(), "0");
+    tdeApp->invokeBrowser(url.url(), "0");
     slotCloseTab();
 }
 
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
 
     url = view->part()->url();
     
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+    tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+    tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
 }
 
 void TabWidget::slotCloseTab()
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index 728bf0abc..b4a252a5f 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -86,7 +86,7 @@ int TagAction::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;
     
    TagMenuItem* item = new TagMenuItem(d->tag);
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 5d04d549c..fe816d19c 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -85,8 +85,8 @@ void TrayIcon::mousePressEvent(TQMouseEvent *e) {
 TQPixmap TrayIcon::takeScreenshot() const
 {
     TQPoint g = mapToGlobal(pos());
-    int desktopWidth  = kapp->desktop()->width();
-    int desktopHeight = kapp->desktop()->height();
+    int desktopWidth  = tdeApp->desktop()->width();
+    int desktopHeight = tdeApp->desktop()->height();
     int tw = width();
     int th = height();
     int w = desktopWidth / 4;
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index f5d326e95..da06562d0 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -104,7 +104,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
    if (Settings::externalBrowserUseTdeDefault())
    {
        if (mimetype.isEmpty()) 
-           kapp->invokeBrowser(url.url(), "0");
+           tdeApp->invokeBrowser(url.url(), "0");
        else
            KRun::runURL(url, mimetype, false, false);
    }
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index ae14bf36d..7e7c18b00 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -290,7 +290,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 
 void CertificateWizardImpl::slotHelpClicked()
 {
-  kapp->invokeHelp( "newcert" );
+  tdeApp->invokeHelp( "newcert" );
 }
 
 void CertificateWizardImpl::slotSetValuesFromWhoAmI()
@@ -441,16 +441,16 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQCString dummy;
   // OK, so kmail (or kontact) is running. Now ensure the object we want is available.
   // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
-  if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+  if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
     DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
     DCOPReply reply = ref.call( "load()" );
     if ( reply.isValid() && (bool)reply ) {
-      Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+      Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
     } else
       kdWarning() << "Error loading " << dcopService << endl;
   }
 
-  DCOPClient* dcopClient = kapp->dcopClient();
+  DCOPClient* dcopClient = tdeApp->dcopClient();
   TQByteArray data;
   TQDataStream arg( data, IO_WriteOnly );
   arg << email;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 74b845578..33960cccb 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -405,7 +405,7 @@ void CertManager::slotConfigureGpgME() {
     if ( result == TQDialog::Accepted )
     {
       // Tell other apps (e.g. kmail) that the gpgconf data might have changed
-      kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
+      tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
     }
   }
 }
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 4d0d1e682..cf6923f01 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -41,7 +41,7 @@
 ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
   : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )
 {
-  KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
   showButton( User1, true );
 
   addModule( "kleopatra_config_dirserv", false );
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index 9c88491e6..2db64ebb9 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -47,7 +47,7 @@ LabelAction::LabelAction( const TQString & text,  TDEActionCollection * parent,
 }
 
 int LabelAction::plug( TQWidget * widget, int index ) {
-  if ( kapp && !kapp->authorizeTDEAction( name() ) )
+  if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
     return -1;
   if ( widget->inherits( "TDEToolBar" ) ) {
     TDEToolBar * bar = (TDEToolBar *)widget;
@@ -71,7 +71,7 @@ LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * par
 }
 
 int LineEditAction::plug( TQWidget * widget, int index ) {
-  if ( kapp && !kapp->authorizeTDEAction( name() ) )
+  if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
     return -1;
   if ( widget->inherits( "TDEToolBar" ) ) {
     TDEToolBar *bar = (TDEToolBar *)widget;
@@ -118,7 +118,7 @@ ComboAction::ComboAction( const TQStringList & lst,  TDEActionCollection * paren
 }
 
 int ComboAction::plug( TQWidget * widget, int index ) {
-  if ( kapp && !kapp->authorizeTDEAction( name() ) )
+  if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
     return -1;
   if ( widget->inherits( "TDEToolBar" ) ) {
     TDEToolBar *bar = (TDEToolBar *)widget;
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 25b7dc065..f92960bbe 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
 
 void KWatchGnuPGConfig::loadConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
   mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
 
 void KWatchGnuPGConfig::saveConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   config->writeEntry( "Executable", mExeED->url() );
   config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 55043c569..647056ab6 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -132,13 +132,13 @@ void KWatchGnuPGMainWindow::startWatcher()
   if( mWatcher->isRunning() ) {
 	mWatcher->kill();
 	while( mWatcher->isRunning() ) {
-	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+	  tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(i18n("[%1] Log stopped")
 						   .arg( TQDateTime::currentDateTime().toString(TQt::ISODate)));
   }
   mWatcher->clearArguments();
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
   if ( !cconfig )
     return;
   //Q_ASSERT( cconfig );
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("WatchGnuPG");
   TQStringList comps = cconfig->componentList();
   for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -254,7 +254,7 @@ void KWatchGnuPGMainWindow::slotQuit()
   disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
 			  this, TQ_SLOT( slotWatcherExited() ) );
   mWatcher->kill();
-  kapp->quit();
+  tdeApp->quit();
 }
 
 void KWatchGnuPGMainWindow::slotConfigure()
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
 
 void KWatchGnuPGMainWindow::slotReadConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("LogWindow");
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
 							   ?TQTextEdit::WidgetWidth
@@ -282,7 +282,7 @@ void KWatchGnuPGMainWindow::slotReadConfig()
 
 bool KWatchGnuPGMainWindow::queryClose()
 {
-  if ( !kapp->sessionSaving() ) {
+  if ( !tdeApp->sessionSaving() ) {
     hide();
     return false;
   }
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 5bd5675b3..f1246f39c 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -569,7 +569,7 @@ bool CryptPlugWrapper::checkMessageSignature( char** cleartext,
                                               int signatureLen,
                                               CryptPlug::SignatureMetaData* sigmeta )
 {
-  DNBeautifier dnBeautifier( kapp->config(),
+  DNBeautifier dnBeautifier( tdeApp->config(),
                              "DN",
                              "AttributeOrder",
                              "UnknownAttributes" );
@@ -607,7 +607,7 @@ bool CryptPlugWrapper::decryptAndCheckMessage(
                             int*   errId,
                             char** errTxt )
 {
-  DNBeautifier dnBeautifier( kapp->config(),
+  DNBeautifier dnBeautifier( tdeApp->config(),
                              "DN",
                              "AttributeOrder",
                              "UnknownAttributes" );
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index d4ed13018..d6db7d183 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
 
 Kleo::DNAttributeMapper::DNAttributeMapper() {
   d = new Private();
-  const TDEConfigGroup config( kapp->config(), "DN" );
+  const TDEConfigGroup config( tdeApp->config(), "DN" );
   d->attributeOrder = config.readListEntry( "AttributeOrder" );
   if ( d->attributeOrder.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   if ( order.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
 	       std::back_inserter( d->attributeOrder ) );
-  TDEConfigGroup config( kapp->config(), "DN" );
+  TDEConfigGroup config( tdeApp->config(), "DN" );
   config.writeEntry( "AttributeOrder", order );
 }
 
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 82db7d7aa..43b1c13f5 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -304,7 +304,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() {
     int result = dlg.exec();
     if ( result == TQDialog::Accepted ) {
       // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed
-      kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
+      tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
       // and schedule a rescan, in case the updates make a backend valid
       TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) );
     }
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 7e652cd8f..78bb441d8 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -449,8 +449,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   slotRereadKeys();
   mTopLayout->activate();
 
-  if ( kapp ) {
-    KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  if ( tdeApp ) {
+    KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
     TQSize dialogSize( 500, 400 );
 
     TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 0f6bcdb86..63ed10ac1 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -58,7 +58,7 @@ void LocationMap::showAddress( const TDEABC::Address &addr )
   if ( url.isEmpty() )
     return;
 
-  kapp->invokeBrowser( url.url() );
+  tdeApp->invokeBrowser( url.url() );
 }
 
 TQString LocationMap::createUrl( const TDEABC::Address &addr )
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index beedc3b6e..100c62681 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -53,7 +53,7 @@ ContactEditorWidgetManager::~ContactEditorWidgetManager()
 
 ContactEditorWidgetManager *ContactEditorWidgetManager::self()
 {
-  kdWarning( !kapp, 7520 ) << "No TQApplication object available!" << endl;
+  kdWarning( !tdeApp, 7520 ) << "No TQApplication object available!" << endl;
 
   if ( !mSelf )
     mSelf = new ContactEditorWidgetManager();
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 684fe1e69..5873ae181 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -158,7 +158,7 @@ void FilterEditDialog::filterNameTextChanged( const TQString &text )
 
 void FilterEditDialog::slotHelp()
 {
-  kapp->invokeHelp( "using-filters" );
+  tdeApp->invokeHelp( "using-filters" );
 }
 
 FilterDialog::FilterDialog( TQWidget *parent, const char *name )
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 85b08976b..ace5600d0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -192,7 +192,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
 
   TDEAcceleratorManager::manage( mWidget );
 
-  mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+  mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
 }
 
 KABCore::~KABCore()
@@ -453,7 +453,7 @@ void KABCore::sendMail()
 
 void KABCore::sendMail( const TQString& email )
 {
-  kapp->invokeMailer( email, "" );
+  tdeApp->invokeMailer( email, "" );
 }
 
 void KABCore::mailVCard()
@@ -477,7 +477,7 @@ void KABCore::startChat()
 
 void KABCore::browse( const TQString& url )
 {
-  kapp->invokeBrowser( url );
+  tdeApp->invokeBrowser( url );
 }
 
 void KABCore::selectAllContacts()
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index ddebac13e..6fd38387e 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -97,7 +97,7 @@ void KABTools::mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab )
     }
   }
 
-  kapp->invokeMailer( TQString(), TQString(), TQString(),
+  tdeApp->invokeMailer( TQString(), TQString(), TQString(),
                       TQString(),
                       TQString(),
                       TQString(),
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 890bf6446..f2682261f 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -175,7 +175,7 @@ void KeyWidget::exportKey()
   (*s) << key.textData();
   tempFile.close();
 
-  TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
+  TDEIO::NetAccess::upload( tempFile.name(), url, tdeApp->mainWidget() );
 }
 
 void KeyWidget::updateKeyCombo()
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 07668b710..8b5b62e09 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -468,7 +468,7 @@ TQString LDAPSearchDialog::selectedEMails() const
 
 void LDAPSearchDialog::slotHelp()
 {
-  kapp->invokeHelp( "ldap-queries" );
+  tdeApp->invokeHelp( "ldap-queries" );
 }
 
 void LDAPSearchDialog::slotUnselectAll()
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index d4f6c7767..22af385de 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -101,7 +101,7 @@ int KAddressBookApp::newInstance()
   static bool firstInstance = true;
 
   if ( !firstInstance )
-    TDEStartupInfo::setNewStartupId( mMainWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( mMainWin, tdeApp->startupId() );
 
   firstInstance = false;
 #endif
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 6d90324ac..122de2508 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -315,7 +315,7 @@ void NameEditDialog::initTypeCombo()
 
 void NameEditDialog::slotHelp()
 {
-  kapp->invokeHelp( "managing-contacts-automatic-nameparsing" );
+  tdeApp->invokeHelp( "managing-contacts-automatic-nameparsing" );
 }
 
 #include "nameeditdialog.moc"
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 55ac89ca9..73dc515e9 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -79,7 +79,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
 
   addPage( mPageAppearance, i18n( "Detailed Print Style - Appearance" ) );
 
-  config = kapp->config();
+  config = tdeApp->config();
   config->setGroup( ConfigSectionName );
 
   kdeFonts = config->readBoolEntry( UseKDEFonts, true );
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintP
   TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
 
   // store the configuration settings:
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( ConfigSectionName );
   useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
   config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 25b2e02e9..e9ac5979f 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -78,7 +78,7 @@ void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *
 
   for ( it = contacts.begin(); it != contacts.end(); ++it ) {
     progress->setProgress( (count++ * 100) / contacts.count() );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Get the total height so we know if it will fit on the current page
     height = calcHeight( *it, mFont, mBoldFont );
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index a9375e3cb..85bbb6d0b 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -62,7 +62,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
   mSelectionPage->setUseSelection( !selection.isEmpty() );
   insertPage( mSelectionPage, i18n("Choose Contacts to Print"), -1 );
 
-  mFilters = Filter::restore( kapp->config(), "Filter" );
+  mFilters = Filter::restore( tdeApp->config(), "Filter" );
   TQStringList filters;
   for ( Filter::List::ConstIterator it = mFilters.begin(); it != mFilters.end(); ++it )
     filters.append( (*it).name() );
@@ -153,7 +153,7 @@ void PrintingWizard::print()
   PrintProgress *progress = new PrintProgress( this );
   insertPage( progress, i18n( "Print Progress" ), -1 );
   showPage( progress );
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   // prepare list of contacts to print:
 
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 459cfbee1..edc9b479b 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -71,13 +71,13 @@ void PrintProgress::addMessage( const TQString &msg )
     body.append( TQString( "<li>" ) + (*it) + TQString( "</li>" ) );
 
   mLogBrowser->setText( head + body + foot );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void PrintProgress::setProgress( int step )
 {
   mProgressBar->setProgress( step );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 #include "printprogress.moc"
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index aff63dd31..f8163df89 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -262,7 +262,7 @@ void CutCommand::unexecute()
   mAddresseeList.clear();
 
   TQClipboard *cb = TQApplication::clipboard();
-  kapp->processEvents();
+  tdeApp->processEvents();
   cb->setText( mOldText );
 }
 
@@ -291,7 +291,7 @@ void CutCommand::execute()
 
   TQClipboard *cb = TQApplication::clipboard();
   mOldText = cb->text();
-  kapp->processEvents();
+  tdeApp->processEvents();
 #if defined(KABC_VCARD_ENCODING_FIX)
   cb->setText( TQString::fromUtf8( mClipText.data() ) );
 #else
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index cc60ce539..c1b3b85b3 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -110,7 +110,7 @@ void ViewConfigureDialog::saveSettings( TDEConfig *config )
 
 void ViewConfigureDialog::slotHelp()
 {
-  kapp->invokeHelp( "using-views" );
+  tdeApp->invokeHelp( "using-views" );
 }
 
 #include "viewconfigurewidget.moc"
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 6b6333035..a7d0d38b0 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -186,7 +186,7 @@ void KAddressBookTableView::readConfig( TDEConfig *config )
 
   if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) {
     if ( !mIMProxy ) {
-      mIMProxy = KIMProxy::instance( kapp->dcopClient() );
+      mIMProxy = KIMProxy::instance( tdeApp->dcopClient() );
       connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
                this, TQ_SLOT( updatePresence( const TQString& ) ) );
     }
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 589bfb243..b77de93f7 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -166,7 +166,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
   progressDialog.setLabel( i18n( "Importing contacts" ) );
   progressDialog.show();
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   for ( int row = 1; row < mTable->numRows(); ++row ) {
     TDEABC::Addressee a;
@@ -344,7 +344,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
       }
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if ( progressDialog.wasCancelled() )
       return TDEABC::AddresseeList();
@@ -792,7 +792,7 @@ void CSVImportDialog::applyTemplate()
   TQStringList templates;
 
   // load all template files
-  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) +
       "/csv-templates/*.desktop", true, true );
 
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
@@ -848,7 +848,7 @@ void CSVImportDialog::applyTemplate()
 void CSVImportDialog::saveTemplate()
 {
   TQString fileName = KFileDialog::getSaveFileName(
-                     locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+                     locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
                      "*.desktop", this );
 
   if ( fileName.isEmpty() )
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 6c09db006..797c31d7d 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -264,7 +264,7 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
         } else {
           TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
           text = text.arg( (*it).url() );
-          text = text.arg( kapp->translate( "TQFile",
+          text = text.arg( tdeApp->translate( "TQFile",
                                             TQString(file.errorString()).latin1() ) );
           KMessageBox::error( parentWidget(), text, caption );
           anyFailures = true;
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 3424e98ea..12e6ae9f2 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -151,7 +151,7 @@ void XXPortManager::loadPlugins()
       connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ),
                this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) );
 
-      obj->setTDEApplication( kapp );
+      obj->setTDEApplication( tdeApp );
     }
   }
 }
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 449ea60df..2d7229bfb 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -57,7 +57,7 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
            TQ_SLOT( categoryClicked( TQListViewItem* ) ) );
 
   // setup filters
-  mFilters = Filter::restore( kapp->config(), "Filter" );
+  mFilters = Filter::restore( tdeApp->config(), "Filter" );
   Filter::List::ConstIterator filterIt;
   TQStringList filters;
   for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt )
@@ -172,7 +172,7 @@ void XXPortSelectDialog::categoryClicked( TQListViewItem *i )
 
 void XXPortSelectDialog::slotHelp()
 {
-  kapp->invokeHelp( "import-and-export" );
+  tdeApp->invokeHelp( "import-and-export" );
 }
 
 void XXPortSelectDialog::initGUI()
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index f47e962cf..9379ea07d 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 */
 bool AlarmCalendar::initialiseCalendars()
 {
-	TDEConfig* config = kapp->config();
+	TDEConfig* config = tdeApp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	TQString activeKey   = TQString::fromLatin1("Calendar");
 	TQString expiredKey  = TQString::fromLatin1("ExpiredCalendar");
@@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 		// Save the change in the config file.
 		if (!mConfigKey.isNull())
 		{
-			TDEConfig* config = kapp->config();
+			TDEConfig* config = tdeApp->config();
 			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
@@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal()
 	{
 		if (!mConfigKey.isNull())
 		{
-			TDEConfig* config = kapp->config();
+			TDEConfig* config = tdeApp->config();
 			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 0a1cd1576..6ebe07a67 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -80,7 +80,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	// Prefix and suffix to the name in the alarm text
 	// Get default prefix and suffix texts from config file
-	TDEConfig* config = kapp->config();
+	TDEConfig* config = tdeApp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
 	mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
@@ -343,7 +343,7 @@ TQValueList<KAEvent> BirthdayDlg::events() const
 void BirthdayDlg::slotOk()
 {
 	// Save prefix and suffix texts to use as future defaults
-	TDEConfig* config = kapp->config();
+	TDEConfig* config = tdeApp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
 	config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index 9a5aca37a..cc7431f99 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -86,7 +86,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
 	{
 		// Older versions used KAlarm's translated name in the product ID, which
 		// could have created problems using a calendar in different locales.
-		progname = TQString(" ") + kapp->aboutData()->programName() + ' ';
+		progname = TQString(" ") + tdeApp->aboutData()->programName() + ' ';
 		i = prodid.find(progname, 0, false);
 		if (i < 0)
 			return 0;    // calendar wasn't created by KAlarm
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 06206cc93..1614b8614 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -188,12 +188,12 @@ bool Daemon::registerWith(bool reregister)
 
 	bool disabledIfStopped = theApp()->alarmsDisabledIfStopped();
 	kdDebug(5950) << (reregister ? "Daemon::reregisterWith(): " : "Daemon::registerWith(): ") << (disabledIfStopped ? "NO_START" : "COMMAND_LINE") << endl;
-	TQCString appname  = kapp->aboutData()->appName();
+	TQCString appname  = tdeApp->aboutData()->appName();
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
 	if (reregister)
 		s.registerChange(appname, !disabledIfStopped);
 	else
-		s.registerApp(appname, kapp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
+		s.registerApp(appname, tdeApp->aboutData()->programName(), TQCString(NOTIFY_DCOP_OBJECT), AlarmCalendar::activeCalendar()->urlString(), !disabledIfStopped);
 	if (!s.ok())
 	{
 		kdError(5950) << "Daemon::registerWith(" << reregister << "): DCOP error" << endl;
@@ -233,11 +233,11 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				// We've successfully registered with the daemon, but the daemon can't
 				// find the KAlarm executable so won't be able to restart KAlarm if
 				// KAlarm exits.
-				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
+				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n";
 				KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
 							   "(Installation or configuration error: %1 cannot locate %2 executable.)")
 							   .arg(TQString::fromLatin1(DAEMON_APP_NAME))
-							   .arg(kapp->aboutData()->appName()));
+							   .arg(tdeApp->aboutData()->appName()));
 				break;
 			case KAlarmd::FAILURE:
 			default:
@@ -314,7 +314,7 @@ void Daemon::checkIfStarted()
 */
 void Daemon::updateRegisteredStatus(bool timeout)
 {
-	if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 	{
 		mStatus = STOPPED;
 		mRegisterFailMsg = false;
@@ -350,7 +350,7 @@ void Daemon::updateRegisteredStatus(bool timeout)
 bool Daemon::stop()
 {
 	kdDebug(5950) << "Daemon::stop()" << endl;
-	if (kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 	{
 		AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
 		s.quit();
@@ -371,10 +371,10 @@ bool Daemon::stop()
 bool Daemon::reset()
 {
 	kdDebug(5950) << "Daemon::reset()" << endl;
-	if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
+	if (!tdeApp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME))
 		return false;
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.resetCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+	s.resetCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
 	if (!s.ok())
 		kdError(5950) << "Daemon::reset(): resetCalendar dcop send failed" << endl;
 	return true;
@@ -387,7 +387,7 @@ void Daemon::reload()
 {
 	kdDebug(5950) << "Daemon::reload()\n";
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.reloadCalendar(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
+	s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString());
 	if (!s.ok())
 		kdError(5950) << "Daemon::reload(): reloadCalendar dcop send failed" << endl;
 }
@@ -635,7 +635,7 @@ void Daemon::notifyEventHandled(const TQString& eventId, bool reloadCal)
 {
 	kdDebug(5950) << "Daemon::notifyEventHandled(" << eventId << (reloadCal ? "): reload" : ")") << endl;
 	AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT);
-	s.eventHandled(TQCString(kapp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
+	s.eventHandled(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString(), eventId, reloadCal);
 	if (!s.ok())
 		kdError(5950) << "Daemon::notifyEventHandled(): eventHandled dcop send failed" << endl;
 }
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index d91d65ae0..d3e85a623 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -718,7 +718,7 @@ TQString runKMail(bool minimise)
 */
 bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
 {
-	if (!kapp->dcopClient()->isApplicationRegistered(program))
+	if (!tdeApp->dcopClient()->isApplicationRegistered(program))
 	{
 		// KOrganizer is not already running, so start it
 		if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName))
@@ -729,7 +729,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 		// Minimise its window - don't use hide() since this would remove all
 		// trace of it from the panel if it is not configured to be docked in
 		// the system tray.
-		kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString());
+		tdeApp->dcopClient()->send(dcopName, windowName, "minimize()", TQString());
 	}
 	else if (dcopName.isEmpty())
 		dcopName = program;
@@ -981,7 +981,7 @@ kdDebug(5950)<<"Korg->"<<iCal<<endl;
 	TQCString    replyType;
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << iCal;
-	if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData)
+	if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
 		bool result;
@@ -1009,7 +1009,7 @@ bool deleteFromKOrganizer(const TQString& eventID)
 	TQCString    replyType;
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << newID << true;
-	if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData)
+	if (tdeApp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
 		bool result;
@@ -1042,7 +1042,7 @@ bool runKOrganizer()
 	// to load KOrganizer into Kontact. But if KOrganizer is running independently,
 	// the load() method doesn't exist.
 	TQCString dummy;
-	if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+	if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 	{
 		DCOPRef ref(dcopService, dcopService); // talk to the TDEUniqueApplication or its Kontact wrapper
 		DCOPReply reply = ref.call("load()");
@@ -1051,7 +1051,7 @@ bool runKOrganizer()
 			kdWarning(5950) << "Error loading " << dcopService << endl;
 			return false;
 		}
-		if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+		if (!tdeApp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 		{
 			kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl;
 			return false;
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 0d93b94f2..ed367f2e0 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -120,7 +120,7 @@ KAlarmApp::KAlarmApp()
 	{
 		connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged()));
 
-		TDEConfig* config = kapp->config();
+		TDEConfig* config = tdeApp->config();
 		config->setGroup(TQString::fromLatin1("General"));
 		mNoSystemTray           = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
 		mSavedNoSystemTray      = mNoSystemTray;
@@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray()
 		// daemon with the correct NOTIFY type. If that happened when there was no system
 		// tray and alarms are disabled when KAlarm is not running, registering with
 		// NO_START_NOTIFY could result in alarms never being seen.
-		TDEConfig* config = kapp->config();
+		TDEConfig* config = tdeApp->config();
 		config->setGroup(TQString::fromLatin1("General"));
 		config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
 		config->sync();
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 5f4fbba81..4f8066610 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -89,7 +89,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		if (autostart)
 		{
 			bool done = false;
-			DCOPClient* client = kapp->dcopClient();
+			DCOPClient* client = tdeApp->dcopClient();
 			if (client->isApplicationRegistered("ksmserver"))
 			{
 				TQByteArray callData;
@@ -98,7 +98,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 				for (int i=0; !done && i<KALARM_AUTOSTART_TIMEOUT; ++i)
 				{
 					// Check if the session has been fully created/restored. If not, wait a little and try again
-					if (!kapp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
+					if (!tdeApp->dcopClient()->call("ksmserver", "ksmserver", "startupCompleted()", callData, replyType, replyData) ||
 							replyType != "bool")
 					{
 						done = true;	// In case of DCOP call error, just continue normally
@@ -512,12 +512,12 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 	TQString id = TQString::fromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
 
 	// Check if the client application is running and ready to receive notification
-	bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
+	bool registered = tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
 	bool ready = registered;
 	if (registered)
 	{
 		// It's running, but check if it has created our DCOP interface yet
-		QCStringList objects = kapp->dcopClient()->remoteObjects(appname);
+		QCStringList objects = tdeApp->dcopClient()->remoteObjects(appname);
 		if (objects.find(client->dcopObject()) == objects.end())
 			ready = false;
 	}
@@ -606,7 +606,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 	if (!client)
 		return;
 	TQCString appname = client->appName();
-	if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
+	if (tdeApp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)))
 	{
 		KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
 		                                                  : KAlarmd::CALENDAR_UNAVAILABLE;
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 82eb008b4..862160be0 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -242,7 +242,7 @@ TQString KAMail::sendKMail(const KAMailData& data)
 	// KMail is now running. Determine which DCOP call to use.
 	bool useSend = false;
 	TQCString sendFunction = "sendMessage(TQString,TQString,TQString,TQString,TQString,TQString,KURL::List)";
-	QCStringList funcs = kapp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface");
+	QCStringList funcs = tdeApp->dcopClient()->remoteFunctions("kmail", "MailTransportServiceIface");
 	for (QCStringList::Iterator it=funcs.begin();  it != funcs.end() && !useSend;  ++it)
 	{
 		TQCString func = DCOPClient::normalizeFunctionSignature(*it);
@@ -337,7 +337,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons
 {
 	TQCString   replyType;
 	TQByteArray replyData;
-	if (!kapp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData)
+	if (!tdeApp->dcopClient()->call("kmail", iface, function, callData, replyType, replyData)
 	||  replyType != funcType)
 	{
 		TQCString funcname = function;
@@ -394,7 +394,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
 	if (!data.bcc.isEmpty())
 		message += TQString::fromLatin1("\nBcc: ") + data.bcc;
 	message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject();
-	message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
+	message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(tdeApp->aboutData()->programName());
 	return message;
 }
 
@@ -943,7 +943,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
 	arg << serialNumber;
 	arg << (int)0;
 	TQString body;
-	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
+	if (tdeApp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
 	&&  replyType == "TQString")
 	{
 		TQDataStream reply_stream(replyData, IO_ReadOnly);
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 0fe0159bd..97d89fee8 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -201,7 +201,7 @@ bool ShellProcess::authorised()
 {
 	if (!mInitialised)
 	{
-		mAuthorised = kapp->authorize("shell_access");
+		mAuthorised = tdeApp->authorize("shell_access");
 		mInitialised = true;
 	}
 	return mAuthorised;
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 66a93a9ca..77d86e09b 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -124,7 +124,7 @@ MainWindow::MainWindow(bool restored)
 {
 	kdDebug(5950) << "MainWindow::MainWindow()\n";
 	setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME));    // save window sizes etc.
-	setPlainCaption(kapp->aboutData()->programName());
+	setPlainCaption(tdeApp->aboutData()->programName());
 	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(VIEW_GROUP);
 	mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false);
diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp
index 3d30a5ba1..78dac9fad 100644
--- a/kalarm/mainwindowbase.cpp
+++ b/kalarm/mainwindowbase.cpp
@@ -43,7 +43,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce)
 bool MainWindowBase::queryExit()
 {
 #if KDE_IS_VERSION(3,1,90)
-	if (kapp->sessionSaving())
+	if (tdeApp->sessionSaving())
 		return true;
 #endif
 	return disableQuit ? false : TDEMainWindow::queryExit();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index ef83847db..5c15fcd6e 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -576,7 +576,7 @@ void MessageWin::initView()
 		mKMailButton = 0;
 
 	// KAlarm button
-	TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), TDEIcon::MainToolbar);
+	TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(tdeApp->aboutData()->appName()), TDEIcon::MainToolbar);
 	mKAlarmButton = new TQPushButton(topWidget);
 	mKAlarmButton->setPixmap(pixmap);
 	mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
@@ -813,12 +813,12 @@ void MessageWin::playAudio()
 */
 void MessageWin::slotSpeak()
 {
-	DCOPClient* client = kapp->dcopClient();
+	DCOPClient* client = tdeApp->dcopClient();
 	if (!client->isApplicationRegistered("kttsd"))
 	{
 		// kttsd is not running, so start it
 		TQString error;
-		if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+		if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error))
 		{
 			kdDebug(5950) << "MessageWin::slotSpeak(): failed to start kttsd: " << error << endl;
 			if (!haveErrorMessage(ErrMsg_Speak))
@@ -1117,7 +1117,7 @@ int MessageWin::getKMixVolume()
 	TQByteArray  data, replyData;
 	TQCString    replyType;
 	TQDataStream arg(data, IO_WriteOnly);
-	if (!kapp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData)
+	if (!tdeApp->dcopClient()->call(mKMixName, KMIX_DCOP_OBJECT, "masterVolume()", data, replyType, replyData)
 	||  replyType != "int")
 		return -1;
 	int result;
@@ -1138,7 +1138,7 @@ void MessageWin::setKMixVolume(int percent)
 	TQByteArray  data;
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << percent;
-	if (!kapp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data))
+	if (!tdeApp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data))
 		kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed\n";
 }
 #endif
@@ -1438,7 +1438,7 @@ void MessageWin::slotShowKMailMessage()
 	TQByteArray  data, replyData;
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << (TQ_UINT32)mKMailSerialNumber << TQString();
-	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
+	if (tdeApp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
 		bool result;
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 38cd56034..59b903dc5 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -159,7 +159,7 @@ void KAlarmPrefDlg::slotDefault()
 
 void KAlarmPrefDlg::slotHelp()
 {
-	kapp->invokeHelp("preferences");
+	tdeApp->invokeHelp("preferences");
 }
 
 // Apply the preferences that are currently selected
@@ -399,7 +399,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		mXtermType->insert(radio, mXtermCount);
 		if (mXtermFirst < 0)
 			mXtermFirst = mXtermCount;   // note the id of the first button
-		cmd.replace("%t", kapp->aboutData()->programName());
+		cmd.replace("%t", tdeApp->aboutData()->programName());
 		cmd.replace("%c", "<command>");
 		cmd.replace("%w", "<command; sleep>");
 		cmd.replace("%C", "[command]");
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 90bd92edd..77b964d20 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -351,9 +351,9 @@ void TrayTooltip::maybeTip(const TQPoint&)
 	TrayWindow* parent = (TrayWindow*)parentWidget();
 	TQString text;
 	if (Daemon::monitoringAlarms())
-		text = kapp->aboutData()->programName();
+		text = tdeApp->aboutData()->programName();
 	else
-		text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
+		text = i18n("%1 - disabled").arg(tdeApp->aboutData()->programName());
 	kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
 	if (Preferences::tooltipAlarmCount())
 		parent->tooltipAlarmText(text);
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 38d152c79..1e6d3b0f1 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -207,7 +207,7 @@ Undo::List  Undo::mRedoList;
 Undo* Undo::instance()
 {
 	if (!mInstance)
-		mInstance = new Undo(kapp);
+		mInstance = new Undo(tdeApp);
 	return mInstance;
 }
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index eb1f79a76..3816ab413 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -240,7 +240,7 @@ void MobileGui::exit()
   mComingFromExit = true;
   if ( !warnMobState( UNLOADED ) ) {
     mComingFromExit = false;
-    kapp->quit();
+    tdeApp->quit();
   }
 }
 
@@ -455,7 +455,7 @@ void MobileGui::writePhonebookPostProcessing()
   } else
   if ( mComingFromExit ) {
     mComingFromExit = false;
-    kapp->quit();
+    tdeApp->quit();
   }
 }
 
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 48d3fae96..27359e5b8 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -473,7 +473,7 @@ TQString karmPart::taskIdFromName( const TQString &taskname ) const
 
 void karmPart::quit()
 {
-  // TODO: write something for kapp->quit();
+  // TODO: write something for tdeApp->quit();
 }
 
 bool karmPart::save()
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 92f69ff6d..84ac89302 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 #include "incidence.h"
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include <kdebug.h>
 #include <tdeemailsettings.h>
 #include <tdelocale.h>            // i18n
@@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   while ( tasknr < taskview->count() && !dialog.wasCancelled() )
   {
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow
+    if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // repainting is slow
     if ( taskview->item_at_index(tasknr)->depth() > maxdepth )
       maxdepth = taskview->item_at_index(tasknr)->depth();
     tasknr++;
@@ -620,7 +620,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   {
     task = taskview->item_at_index( tasknr );
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents();
+    if ( tasknr % 15 == 0 ) tdeApp->processEvents();
 
     // indent the task in the csv-file:
     for ( int i=0; i < task->depth(); ++i ) retval += delim;
@@ -1069,7 +1069,7 @@ bool KarmStorage::bookTime(const Task* task,
   e->setDtEnd( startDateTime.addSecs( durationInSeconds ) );
 
   // Use a custom property to keep a record of negative durations
-  e->setCustomProperty( kapp->instanceName(),
+  e->setCustomProperty( tdeApp->instanceName(),
       TQCString("duration"),
       TQString::number(durationInSeconds));
 
@@ -1095,7 +1095,7 @@ void KarmStorage::changeTime(const Task* task, const long deltaSeconds)
   e->setDtEnd(end);
 
   // Use a custom property to keep a record of negative durations
-  e->setCustomProperty( kapp->instanceName(),
+  e->setCustomProperty( tdeApp->instanceName(),
       TQCString("duration"),
       TQString::number(deltaSeconds));
 
@@ -1175,7 +1175,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from,
         // an easy fix for a (hopefully) rare situation.
         processed.append( (*event)->uid());
 
-        duration = (*event)->customProperty(kapp->instanceName(),
+        duration = (*event)->customProperty(tdeApp->instanceName(),
             TQCString("duration"));
         if ( ! duration.isNull() )
         {
diff --git a/karm/main.cpp b/karm/main.cpp
index ef4326dc0..cdc43e9d5 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -15,7 +15,7 @@ namespace
   void cleanup( int )
   {
     kdDebug(5970) << i18n("Just caught a software interrupt.") << endl;
-    kapp->exit();
+    tdeApp->exit();
   }
 }
 
@@ -79,7 +79,7 @@ int main( int argc, char *argv[] )
 
   myApp.setMainWidget( mainWindow );
 
-  if (kapp->isRestored() && TDEMainWindow::canBeRestored( 1 ))
+  if (tdeApp->isRestored() && TDEMainWindow::canBeRestored( 1 ))
     mainWindow->restore( 1, false );
   else
     mainWindow->show();
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6edc6b2df..26cab9b57 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -9,7 +9,7 @@
 #include <dcopclient.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <tdeapplication.h>       // kapp
+#include <tdeapplication.h>       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
@@ -93,10 +93,10 @@ MainWindow::MainWindow( const TQString &icsfile )
   slotSelectionChanged();
 
   // Register with DCOP
-  if ( !kapp->dcopClient()->isRegistered() ) 
+  if ( !tdeApp->dcopClient()->isRegistered() ) 
   {
-    kapp->dcopClient()->registerAs( "karm" );
-    kapp->dcopClient()->setDefaultObject( objId() );
+    tdeApp->dcopClient()->registerAs( "karm" );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
 
   // Set up DCOP error messages
@@ -161,7 +161,7 @@ void MainWindow::exportcsvHistory()
 
 void MainWindow::quit()
 {
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
@@ -440,7 +440,7 @@ void MainWindow::loadGeometry()
   if (initialGeometrySet()) setAutoSaveSettings();
   else
   {
-    TDEConfig &config = *kapp->config();
+    TDEConfig &config = *tdeApp->config();
 
     config.setGroup( TQString::fromLatin1("Main Window Geometry") );
     int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
@@ -463,7 +463,7 @@ void MainWindow::saveGeometry()
 
 bool MainWindow::queryClose()
 {
-  if ( !kapp->sessionSaving() ) {
+  if ( !tdeApp->sessionSaving() ) {
     hide();
     return false;
   }
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index e8a437ef5..1663af377 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -5,7 +5,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 
-#include <tdeapplication.h>       // kapp
+#include <tdeapplication.h>       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeemailsettings.h>
@@ -252,7 +252,7 @@ TQString Preferences::userRealName()                  const { return _userRealNa
 //---------------------------------------------------------------------------
 void Preferences::load()
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
 
   config.setGroup( TQString::fromLatin1("Idle detection") );
   _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
diff --git a/karm/task.cpp b/karm/task.cpp
index 88c0e099b..6b4d32839 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -5,7 +5,7 @@
 
 #include <kiconloader.h>
 
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include "kdebug.h"
 
 #include "event.h"
@@ -306,15 +306,15 @@ KCal::Todo* Task::asTodo(KCal::Todo* todo) const
   // time the file is opened.
   // todo->setDtStart( current );
 
-  todo->setCustomProperty( kapp->instanceName(),
+  todo->setCustomProperty( tdeApp->instanceName(),
       TQCString( "totalTaskTime" ), TQString::number( _time ) );
-  todo->setCustomProperty( kapp->instanceName(),
+  todo->setCustomProperty( tdeApp->instanceName(),
       TQCString( "totalSessionTime" ), TQString::number( _sessionTime) );
 
   if (getDesktopStr().isEmpty())
-    todo->removeCustomProperty(kapp->instanceName(), TQCString("desktopList"));
+    todo->removeCustomProperty(tdeApp->instanceName(), TQCString("desktopList"));
   else
-    todo->setCustomProperty( kapp->instanceName(),
+    todo->setCustomProperty( tdeApp->instanceName(),
         TQCString( "desktopList" ), getDesktopStr() );
 
   todo->setOrganizer( Preferences::instance()->userRealName() );
@@ -336,18 +336,18 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
   _comment = incident->description();
 
   ok = false;
-  minutes = incident->customProperty( kapp->instanceName(),
+  minutes = incident->customProperty( tdeApp->instanceName(),
       TQCString( "totalTaskTime" )).toInt( &ok );
   if ( !ok )
     minutes = 0;
 
   ok = false;
-  sessionMinutes = incident->customProperty( kapp->instanceName(),
+  sessionMinutes = incident->customProperty( tdeApp->instanceName(),
       TQCString( "totalSessionTime" )).toInt( &ok );
   if ( !ok )
     sessionMinutes = 0;
 
-  TQString desktopList = incident->customProperty( kapp->instanceName(),
+  TQString desktopList = incident->customProperty( tdeApp->instanceName(),
       TQCString( "desktopList" ) );
   TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
       desktopList );
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index ad0877f13..6fb09c38f 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -10,7 +10,7 @@
 #include <tqtimer.h>
 #include <tqxml.h>
 
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index c8ac7e29d..8565091d4 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -457,7 +457,7 @@ void AccountDialog::makeLocalAccountPage()
   mLocal.identityLabel->setBuddy( mLocal.identityCombo );
   topLayout->addWidget( mLocal.identityCombo, 10, 1 );
 
-  connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
+  connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
 }
 
 void AccountDialog::makeMaildirAccountPage()
@@ -557,7 +557,7 @@ void AccountDialog::makeMaildirAccountPage()
   mMaildir.identityLabel->setBuddy( mMaildir.identityCombo );
   topLayout->addWidget( mMaildir.identityCombo, 9, 1 );
 
-  connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
+  connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
 }
 
 
@@ -823,7 +823,7 @@ void AccountDialog::makePopAccountPage()
 
   vlay->addStretch();
 
-  connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
+  connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
 }
 
 
@@ -1130,7 +1130,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
   tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
 
-  connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
+  connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
 }
 
 
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 4f05eb165..8e4565c81 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -203,7 +203,7 @@ void AccountManager::processNextCheck( bool _newMail )
     TQDataStream stream( params, IO_WriteOnly );
     stream << static_cast<NetworkAccount*>( curAccount )->host();
 
-    if ( kapp->dcopClient()->call( "kded", "networkstatus", "status(TQString)",
+    if ( tdeApp->dcopClient()->call( "kded", "networkstatus", "status(TQString)",
                             params, replyType, reply ) && ( replyType == "int" ) )
     {
       int result;
@@ -416,7 +416,7 @@ uint AccountManager::createId()
   int newId;
   do
   {
-    newId = kapp->random();
+    newId = tdeApp->random();
   } while ( usedIds.find(newId) != usedIds.end() );
 
   return newId;
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 0627403ba..6c5373342 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability()
     }
     else {
       // check the availability of the application
-      TDEApplication::kApplication()->processEvents( 200 );
+      tdeApp->processEvents( 200 );
       if ( !checkForProgram( (*it).getExecutable() ) ) {
         mInfoPage->addAvailableTool( (*it).getVisibleName() );
         found = true;
@@ -540,9 +540,9 @@ void AntiSpamWizard::checkToolAvailability()
 void AntiSpamWizard::slotHelpClicked()
 {
   if ( mMode == AntiSpam )
-    kapp->invokeHelp( "the-anti-spam-wizard", "kmail" );
+    tdeApp->invokeHelp( "the-anti-spam-wizard", "kmail" );
   else
-    kapp->invokeHelp( "the-anti-virus-wizard", "kmail" );
+    tdeApp->invokeHelp( "the-anti-virus-wizard", "kmail" );
 }
 
 
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 2c5830abd..822da2c78 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -219,7 +219,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
                    KGuiItem(), User2, i18n( "Configure" ), parent, name, modal )
   , mProfileDialog( 0 )
 {
-  KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
   showButton( User1, true );
 
   addModule ( "kmail_config_identity", false );
@@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() {
   mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() );
 
   static const TQColor defaultColor[ numColorNames ] = {
-    kapp->palette().active().base(), // bg
+    tdeApp->palette().active().base(), // bg
     TDEGlobalSettings::alternateBackgroundColor(), // alt bg
-    kapp->palette().active().text(), // fg
+    tdeApp->palette().active().text(), // fg
     TQColor( 0x00, 0x80, 0x00 ), // quoted l1
     TQColor( 0x00, 0x70, 0x00 ), // quoted l2
     TQColor( 0x00, 0x60, 0x00 ), // quoted l3
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 543ea18fd..6e6c56bf5 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -222,7 +222,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti )
       TQByteArray arg;
       TQDataStream s( arg, IO_WriteOnly );
       s << TQString( "kontact_knotesplugin" );
-      kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
+      tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
       break;
     }
     case KMail::ContentsTypeCalendar:
@@ -241,7 +241,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti )
           s << TQString( "kontact_journalplugin" ); break;
         default: assert( false );
       }
-      kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
+      tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
       break;
     }
     default: break;
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 10d7af2f1..7415591ee 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -74,7 +74,7 @@ void FolderTreeBase::contentsDropEvent(TQDropEvent * e)
 int FolderTreeBase::dndMode(bool alwaysAsk)
 {
   int action = -1;
-  int keybstate = kapp->keyboardModifiers();
+  int keybstate = tdeApp->keyboardModifiers();
   if ( keybstate & TDEApplication::ControlModifier ) {
     action = DRAG_COPY;
   } else if ( keybstate & TDEApplication::ShiftModifier ) {
@@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig()
   TDEConfig* conf = KMKernel::config();
   // Custom/System color support
   TDEConfigGroupSaver saver(conf, "Reader");
-  TQColor c1=TQColor(kapp->palette().active().text());
+  TQColor c1=TQColor(tdeApp->palette().active().text());
   TQColor c2=TQColor("blue");
-  TQColor c4=TQColor(kapp->palette().active().base());
+  TQColor c4=TQColor(tdeApp->palette().active().base());
   TQColor c5=TQColor("red");
 
   if (!conf->readBoolEntry("defaultColors",true)) {
@@ -125,7 +125,7 @@ void FolderTreeBase::readColorConfig()
     mPaintInfo.colBack = c4;
     mPaintInfo.colCloseToQuota = c5;
   }
-  TQPalette newPal = kapp->palette();
+  TQPalette newPal = tdeApp->palette();
   newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack );
   newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore );
   setPalette( newPal );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 47d169f9b..527ad334b 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -958,7 +958,7 @@ namespace KMail {
         if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
           msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
             arg( name() );
-          KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
+          KMessageBox::information( tdeApp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
             KPIM::BroadcastStatus::instance()->setStatusMsg(
@@ -968,9 +968,9 @@ namespace KMail {
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
-              KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
+              KMessageBox::detailedError( tdeApp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
           else
-              KMessageBox::error( kapp->activeWindow(), msg, caption );
+              KMessageBox::error( tdeApp->activeWindow(), msg, caption );
           }
       } else { // i.e. we have a chance to continue, ask the user about it
         if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
@@ -978,7 +978,7 @@ namespace KMail {
           msg = TQString( "<qt>") + context + error + '\n' + errors[2];
           caption = errors[0];
         }
-        int ret = KMessageBox::warningContinueCancel( kapp->activeWindow(), msg, caption );
+        int ret = KMessageBox::warningContinueCancel( tdeApp->activeWindow(), msg, caption );
         if ( ret == KMessageBox::Cancel ) {
           jobsKilled = true;
           killAllJobs( false );
diff --git a/kmail/index.cpp b/kmail/index.cpp
index c21e15d5b..f9b157d2f 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -264,7 +264,7 @@ void KMMsgIndex::clear() {
 
 void KMMsgIndex::maintenance() {
 #ifdef HAVE_INDEXLIB
-	if ( mState != s_idle || kapp->hasPendingEvents() ) {
+	if ( mState != s_idle || tdeApp->hasPendingEvents() ) {
 		TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) );
 		return;
 	}
@@ -305,7 +305,7 @@ int KMMsgIndex::addMessage( TQ_UINT32 serNum ) {
 
 void KMMsgIndex::act() {
 	kdDebug( 5006 ) << "KMMsgIndex::act()" << endl;
-	if ( kapp->hasPendingEvents() ) {
+	if ( tdeApp->hasPendingEvents() ) {
 		//nah, some other time..
 		mTimer->start( 500 );
 		mSlowDown = true;
@@ -561,7 +561,7 @@ void KMMsgIndex::Search::act() {
 			mState = s_emitting;
 			// fall throu
 		case s_emitting:
-			if ( kapp->hasPendingEvents() ) {
+			if ( tdeApp->hasPendingEvents() ) {
 				//nah, some other time..
 				mTimer->start( 250 );
 				mState = s_emitstopped;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index a15def1f9..0d36844af 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -386,7 +386,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
   kdDebug(5006) << "Running precommand " << precommand << endl;
   if (!precommandProcess.start()) return false;
 
-  kapp->eventLoop()->enterLoop();
+  tdeApp->eventLoop()->enterLoop();
 
   return mPrecommandSuccess;
 }
@@ -395,7 +395,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 void KMAccount::precommandExited(bool success)
 {
   mPrecommandSuccess = success;
-  kapp->eventLoop()->exitLoop();
+  tdeApp->eventLoop()->exitLoop();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index e42407e6c..fc045a330 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -88,7 +88,7 @@ void KMAcctLocal::processNewMail(bool)
       break;
 
     if (t.elapsed() >= 200) { //hardwired constant
-      kapp->processEvents();
+      tdeApp->processEvents();
       t.start();
     }
   }
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 52b398e86..1770480de 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -181,7 +181,7 @@ void KMAcctMaildir::processNewMail(bool)
     }
 
     if (t.elapsed() >= 200) { //hardwired constant
-      kapp->processEvents();
+      tdeApp->processEvents();
       t.start();
     }
 
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 922e295c2..e12b04b32 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -557,10 +557,10 @@
        <default>true</default>
      </entry>
      <entry name="ForegroundColor" type="Color" key="ForegroundColor">
-       <default code="true">kapp->palette().active().text()</default>
+       <default code="true">tdeApp->palette().active().text()</default>
      </entry>
      <entry name="BackgroundColor" type="Color" key="BackgroundColor">
-       <default code="true">kapp->palette().active().base()</default>
+       <default code="true">tdeApp->palette().active().base()</default>
      </entry>
      <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding">
        <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default>
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 55722c3c4..1add4e7ae 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -65,12 +65,12 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   mParentWidget( parentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
-  kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5006) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   setInstance(KMailFactory::instance());
 
   kdDebug(5006) << "KMailPart()..." << endl;
-  kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5006) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   // import i18n data and icons from libraries:
   KMail::insertLibraryCataloguesAndIcons();
@@ -81,7 +81,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 
   KMail::lockOrDie();
 
-  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
+  tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet
 
   //local, do the init
   KMKernel *mKMailKernel = new KMKernel();
@@ -95,7 +95,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   mKMailKernel->recoverDeadLetters();
 
   kmsetSignalHandler(kmsignalHandler);
-  kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
+  tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget(parentWidget, widgetName);
@@ -121,7 +121,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kmkernel->inboxFolder()->close();
 #else
   mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(),
-                                 kapp->config());
+                                 tdeApp->config());
   TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
   topLayout->addWidget(mainWidget);
   mainWidget->setFocusPolicy(TQWidget::ClickFocus);
@@ -153,7 +153,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 KMailPart::~KMailPart()
 {
   kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-  // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
+  // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them
   // if they are only about checking mail (not important stuff like moving messages)
   kmkernel->abortMailCheck();
   kmkernel->acctMgr()->cancelMailCheck();
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 833144a86..ed706defc 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1705,7 +1705,7 @@ KMCommand::Result KMSeStatusCommand::execute()
      f->setStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
-  //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
+  //tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
 
   return OK;
 }
@@ -1755,7 +1755,7 @@ KMCommand::Result KMFilterActionCommand::execute()
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
       KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-      TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+      tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
     int filterResult = kmkernel->filterMgr()->process( serNum, mFilter );
@@ -3586,7 +3586,7 @@ KMCommand::Result CreateTodoCommand::execute()
   tf.file()->writeBlock( msg->asDwString().c_str(), msg->asDwString().length() );
   tf.close();
 
-  KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
+  KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" );
   iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri,
                          tf.name(), TQStringList(), "message/rfc822", true );
   delete iface;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index f83ac714f..f4ead799a 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -647,15 +647,15 @@ bool KMComposeWin::event(TQEvent *e)
 void KMComposeWin::readColorConfig(void)
 {
   if ( GlobalSettings::self()->useDefaultColors() ) {
-    mForeColor = TQColor(kapp->palette().active().text());
-    mBackColor = TQColor(kapp->palette().active().base());
+    mForeColor = TQColor(tdeApp->palette().active().text());
+    mBackColor = TQColor(tdeApp->palette().active().base());
   } else {
     mForeColor = GlobalSettings::self()->foregroundColor();
     mBackColor = GlobalSettings::self()->backgroundColor();
   }
 
   // Color setup
-  mPalette = kapp->palette();
+  mPalette = tdeApp->palette();
   TQColorGroup cgrp  = mPalette.active();
   cgrp.setColor( TQColorGroup::Base, mBackColor);
   cgrp.setColor( TQColorGroup::Text, mForeColor);
@@ -2240,7 +2240,7 @@ bool KMComposeWin::queryClose ()
 {
   if ( !mEditor->checkExternalEditorFinished() )
     return false;
-  if ( kmkernel->shuttingDown() || kapp->sessionSaving() )
+  if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() )
     return true;
   if ( mComposer && mComposer->isPerformingSignOperation() ) // since the non-gpg-agent gpg plugin gets a passphrase using TQDialog::exec()
     return false;                                            // the user can try to close the window, which destroys mComposer mid-call.
@@ -3830,7 +3830,7 @@ void KMComposeWin::slotCopy()
 #endif
 
   TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton);
-  kapp->notify(fw, &k);
+  tdeApp->notify(fw, &k);
 }
 
 
@@ -4576,7 +4576,7 @@ void KMComposeWin::insertSignature( SignaturePlacement placement )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotHelp()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 //-----------------------------------------------------------------------------
@@ -4998,7 +4998,7 @@ void KMComposeWin::slotSpellcheckConfig()
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
 
-  twin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon());
+  twin.setIcons (qtd.winId(), tdeApp->icon(), tdeApp->miniIcon());
   qtd.setCancelButton(KStdGuiItem::cancel().text());
   qtd.setOkButton(KStdGuiItem::ok().text());
 
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 3f6b5d8ff..e19b0f46b 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -250,7 +250,7 @@ void KMEdit::initializeAutoSpellChecking()
   TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp
   TQColor defaultColor2( 0x00, 0x70, 0x00 );
   TQColor defaultColor3( 0x00, 0x60, 0x00 );
-  TQColor defaultForeground( kapp->palette().active().text() );
+  TQColor defaultForeground( tdeApp->palette().active().text() );
 
   TQColor c = TQt::red;
   TDEConfigGroup readerConfig( KMKernel::config(), "Reader" );
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index e6d1668f1..51fd8ac9a 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -134,7 +134,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
 		 Ok /* default btn */,  false  /* separator */),
   bPopFilter(popFilter)
 {
-  KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
   setHelp( (bPopFilter)? KMPopFilterDlgHelpAnchor: KMFilterDlgHelpAnchor );
   setButtonText( User1, i18n("Import") );
   setButtonText( User2, i18n("Export") );
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 9b60b25ce..42b5d0c5b 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -363,14 +363,14 @@ bool KMFolderIndex::readIndexHeader(int *gv)
       createIndexFromContents();
       return false;
   } else if(indexVersion > INDEX_VERSION) {
-      kapp->setOverrideCursor(KCursor::arrowCursor());
+      tdeApp->setOverrideCursor(KCursor::arrowCursor());
       int r = KMessageBox::questionYesNo(0,
 					 i18n(
 					    "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 					    "This index can be regenerated from your mail folder, but some "
 					    "information, including status flags, may be lost. Do you wish "
 					    "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
-      kapp->restoreOverrideCursor();
+      tdeApp->restoreOverrideCursor();
       if (r == KMessageBox::Yes)
 	  createIndexFromContents();
       return false;
@@ -524,11 +524,11 @@ KMMsgInfo* KMFolderIndex::setIndexEntry( int idx, KMMessage *msg )
 
 void KMFolderIndex::recreateIndex( bool readIndexAfterwards )
 {
-  kapp->setOverrideCursor(KCursor::arrowCursor());
+  tdeApp->setOverrideCursor(KCursor::arrowCursor());
   KMessageBox::information(0,
        i18n("The mail index for '%1' is corrupted and will be regenerated now, "
             "but some information, like status flags, might get lost.").arg(name()));
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
   createIndexFromContents();
   if ( readIndexAfterwards ) {
     readIndex();
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 94bbc2b94..a0c4ee2c0 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -561,7 +561,7 @@ uint KMFolderMgr::createId()
   int newId;
   do
   {
-    newId = kapp->random();
+    newId = tdeApp->random();
   } while ( findById( newId ) != 0 );
 
   return newId;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index fe5531bee..06de88fbc 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -428,10 +428,10 @@ void KMHeaders::readColorConfig (void)
   TDEConfig* config = KMKernel::config();
   // Custom/System colors
   TDEConfigGroupSaver saver(config, "Reader");
-  TQColor c1=TQColor(kapp->palette().active().text());
+  TQColor c1=TQColor(tdeApp->palette().active().text());
   TQColor c2=TQColor("red");
   TQColor c3=TQColor("blue");
-  TQColor c4=TQColor(kapp->palette().active().base());
+  TQColor c4=TQColor(tdeApp->palette().active().base());
   TQColor c5=TQColor(0,0x7F,0);
   TQColor c6=TQColor(0,0x98,0);
   TQColor c7=TDEGlobalSettings::alternateBackgroundColor();
@@ -439,7 +439,7 @@ void KMHeaders::readColorConfig (void)
   if (!config->readBoolEntry("defaultColors",true)) {
     mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1);
     mPaintInfo.colBack = config->readColorEntry("BackgroundColor",&c4);
-    TQPalette newPal = kapp->palette();
+    TQPalette newPal = tdeApp->palette();
     newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack );
     newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore );
     setPalette( newPal );
@@ -452,7 +452,7 @@ void KMHeaders::readColorConfig (void)
   else {
     mPaintInfo.colFore = c1;
     mPaintInfo.colBack = c4;
-    TQPalette newPal = kapp->palette();
+    TQPalette newPal = tdeApp->palette();
     newPal.setColor( TQColorGroup::Base, c4 );
     newPal.setColor( TQColorGroup::Text, c1 );
     setPalette( newPal );
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
         KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-        TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+        tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
       KMFolder *folder = 0;
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 0f1d34ed9..1978e092c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -390,7 +390,7 @@ void KMKernel::openReader( bool onlyCheck )
     // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( mWin, tdeApp->startupId() );
 #endif
   }
 }
@@ -460,7 +460,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   }
   return 1;
@@ -607,7 +607,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   } else {
     cWin->setAutoDeleteWindow( true );
@@ -653,7 +653,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   }
 
@@ -1357,7 +1357,7 @@ void KMKernel::slotSenderFinished()
   good, Folder manager go compact sent-mail and outbox
   clean up stage1 (release folders and config, unregister from dcop)
     -- another kmail may start now ---
-  kapp->quit();
+  tdeApp->quit();
 }
 */
 
@@ -1744,7 +1744,7 @@ bool KMKernel::doSessionManagement()
 {
 
   // Do session management
-  if (kapp->isRestored()){
+  if (tdeApp->isRestored()){
     int n = 1;
     while (KMMainWin::canBeRestored(n)){
       //only restore main windows! (Matthias);
@@ -1884,7 +1884,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
 
 #if 0
   // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved)
-  const TQString kmailName = kapp->aboutData()->programName();
+  const TQString kmailName = tdeApp->aboutData()->programName();
   TQString msg;
   if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) {
     // if destinationDir exists, we need to warn about possible
@@ -1962,7 +1962,7 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg)
 
   case TQtFatalMsg: // Hm, what about using kdFatal() here?
     ungrabPtrKb();
-    kdDebug(5006) << kapp->caption() << " fatal error "
+    kdDebug(5006) << tdeApp->caption() << " fatal error "
 		  << aMsg << endl;
     KMessageBox::error(0, aMsg);
     abort();
@@ -2344,7 +2344,7 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->topLevelWidgets();
+  TQWidgetList *l = tdeApp->topLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
@@ -2420,7 +2420,7 @@ KMFolder* KMKernel::findFolderById( const TQString& idString )
 
 ::KIMProxy* KMKernel::imProxy()
 {
-  return KIMProxy::instance( kapp->dcopClient() );
+  return KIMProxy::instance( tdeApp->dcopClient() );
 }
 
 void KMKernel::enableMailCheck()
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 06c563a50..cc148f0f7 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -486,7 +486,7 @@ private:
   TQString the_previousVersion;
   /** is this the first start?  read from config */
   bool the_firstStart;
-  /** are we starting up? set in main.cpp directly before kapp->exec() */
+  /** are we starting up? set in main.cpp directly before tdeApp->exec() */
   bool the_startingUp;
   /** are we going down? set from here */
   bool the_shuttingDown;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index bdae84d22..ec46d773f 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -856,7 +856,7 @@ void KMMainWidget::slotFind()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotHelp()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 
@@ -928,7 +928,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
   if ( !newMail || newInFolder.isEmpty() )
     return;
 
-  kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
+  tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
 
   // build summary for new mail message
   bool showNotification = false;
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index d1abdab6e..120b1606a 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -33,7 +33,7 @@ KMMainWin::KMMainWin(TQWidget *)
   // modal subdialogs will only affect this dialog, not the other windows
   setWFlags( getWFlags() | WGroupLeader );
 
-  kapp->ref();
+  tdeApp->ref();
 
   (void) new TDEAction( i18n("New &Window"), "window-new", 0,
 		      this, TQ_SLOT(slotNewMailReader()),
@@ -86,7 +86,7 @@ KMMainWin::~KMMainWin()
 {
   saveMainWindowSettings(KMKernel::config(), "Main Window");
   KMKernel::config()->sync();
-  kapp->deref();
+  tdeApp->deref();
 
   if ( !kmkernel->haveSystemTrayApplet() ) {
     // Check if this was the last KMMainWin
@@ -103,7 +103,7 @@ KMMainWin::~KMMainWin()
 
     if ( not_withdrawn == 0 ) {
       kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-      // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
+      // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them
       // if they are only about checking mail (not important stuff like moving messages)
       kmkernel->abortMailCheck();
       kmkernel->acctMgr()->cancelMailCheck();
@@ -206,10 +206,10 @@ void KMMainWin::slotConfigChanged()
 //-----------------------------------------------------------------------------
 bool KMMainWin::queryClose()
 {
-  if ( kapp->sessionSaving() )
+  if ( tdeApp->sessionSaving() )
     writeConfig();
 
-  if ( kmkernel->shuttingDown() || kapp->sessionSaving() || mReallyClose )
+  if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() || mReallyClose )
     return true;
   return kmkernel->canQueryClose();
 }
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 9cf26fbed..3b63badc8 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "<p>normally, you do not need to touch this setting, since the "
 	     "type of the file is automatically checked; but, sometimes, %1 "
 	     "may not detect the type correctly -- here is where you can fix "
-	     "that.</p></qt>").arg( kapp->aboutData()->programName() );
+	     "that.</p></qt>").arg( tdeApp->aboutData()->programName() );
   TQWhatsThis::add( mMimeType, msg );
 
   // row 1: Size label:
@@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "because calculating the exact size would take too much time; "
 	     "when this is the case, it will be made visible by adding "
 	     "\"(est.)\" to the size displayed.</p></qt>")
-    .arg( kapp->aboutData()->programName() );
+    .arg( tdeApp->aboutData()->programName() );
   TQWhatsThis::add( mSize, msg );
 
   // row 2: "Name" lineedit and label:
@@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 	     "binary data, but consists of pure text -- in this case, choosing "
 	     "\"quoted-printable\" over the default \"base64\" will save up "
 	     "to 25% in resulting message size.</p></qt>")
-    .arg( kapp->aboutData()->programName() );
+    .arg( tdeApp->aboutData()->programName() );
   TQWhatsThis::add( label, msg );
   TQWhatsThis::add( mEncoding, msg );
 
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index e7df43ca4..09c3701f6 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info )
   TQString location = locate("data", "kmail/about/main.html");
   TQString content = KPIM::kFileToString(location);
   content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
     content = content.arg( "" );
@@ -2163,7 +2163,7 @@ void KMReaderWin::slotToggleMimePartTree()
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotCopySelectedText()
 {
-  kapp->clipboard()->setText( mViewer->selectedText() );
+  tdeApp->clipboard()->setText( mViewer->selectedText() );
 }
 
 
@@ -2465,7 +2465,7 @@ void KMReaderWin::slotDocumentChanged()
 void KMReaderWin::slotTextSelected(bool)
 {
   TQString temp = mViewer->selectedText();
-  kapp->clipboard()->setText(temp);
+  tdeApp->clipboard()->setText(temp);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 5e8e4b415..cf1e72728 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -474,7 +474,7 @@ void KMSender::doSendMsg()
       true );
     connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
              this, TQ_SLOT( slotAbortSend() ) );
-    kapp->ref();
+    tdeApp->ref();
     mSendInProgress = true;
   }
 
@@ -632,7 +632,7 @@ void KMSender::cleanup(void)
   if (mSendProc && mSendProcStarted) mSendProc->finish();
   mSendProc = 0;
   mSendProcStarted = false;
-  if (mSendInProgress) kapp->deref();
+  if (mSendInProgress) tdeApp->deref();
   mSendInProgress = false;
   if (mCurrentMsg)
   {
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 7383060d3..9173d69cb 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
   if ( error )
   {
     mJob = 0;
-    KMessageBox::error( kapp->activeWindow(),
+    KMessageBox::error( tdeApp->activeWindow(),
         TDEIO::buildErrorString( error, errorText ),
         i18n("Error") );
     emit capabilities( mListNormal, mListSSL );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 8a3f8f741..dd8a43865 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -137,12 +137,12 @@ void checkConfigUpdates() {
 
 void lockOrDie() {
 // Check and create a lock file to prevent concurrent access to kmail files
-  TQString appName = kapp->instanceName();
+  TQString appName = tdeApp->instanceName();
   if ( appName.isEmpty() )
     appName = "kmail";
 
   TQString programName;
-  const TDEAboutData *about = kapp->aboutData();
+  const TDEAboutData *about = tdeApp->aboutData();
   if ( about )
     programName = about->programName();
   if ( programName.isEmpty() )
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index b6e1f9691..45d8bfc95 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -138,7 +138,7 @@ void KMSystemTray::buildPopupMenu()
 void KMSystemTray::tray_quit()
 {
   // Quit all of KMail
-  kapp->quit();
+  tdeApp->quit();
 }
 
 KMSystemTray::~KMSystemTray()
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index cace2a102..a33e02be6 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -35,12 +35,12 @@ void KMail::KorgHelper::ensureRunning()
     // [that's not the case when kontact was already running, but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
         kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-        Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+        Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else
         kdWarning() << "Error loading " << dcopService << endl;
     }
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index d55fe0af8..ac6d60bc0 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -61,7 +61,7 @@ MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name )
   accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() ));
   accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQ_SLOT( close() ));
   setWordWrap( KTextBrowser::NoWrap );
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 }
 
 MailSourceViewer::~MailSourceViewer()
diff --git a/kmail/main.cpp b/kmail/main.cpp
index fe5dee0a6..1f2d33ee2 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -58,7 +58,7 @@ int KMailApplication::newInstance()
   if (!kmkernel)
      return 0;
 
-  if (!kmkernel->firstInstance() || !kapp->isRestored())
+  if (!kmkernel->firstInstance() || !tdeApp->isRestored())
     kmkernel->handleCommandLine( true );
   kmkernel->setFirstInstance(FALSE);
   return 0;
@@ -87,14 +87,14 @@ int main(int argc, char *argv[])
   // using KMail without KDE)
   KNotifyClient::startDaemon();
 
-  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
+  tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet
 
   KMail::lockOrDie();
 
   //local, do the init
   KMKernel kmailKernel;
   kmailKernel.init();
-  kapp->dcopClient()->setDefaultObject( kmailKernel.objId() );
+  tdeApp->dcopClient()->setDefaultObject( kmailKernel.objId() );
 
   // and session management
   kmailKernel.doSessionManagement();
@@ -104,10 +104,10 @@ int main(int argc, char *argv[])
 
   kmsetSignalHandler(kmsignalHandler);
 
-  kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
+  tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
   kmailKernel.setStartingUp( false ); // Starting up is finished
   // Go!
-  int ret = kapp->exec();
+  int ret = tdeApp->exec();
   // clean up
   kmailKernel.cleanup();
 
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index bd8d99558..509a39b53 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -37,7 +37,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
     mWasActive( false )
 {
   setWFlags( WGroupLeader|WDestructiveClose );
-  KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
 
   TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, 0 );
 
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 97f1e4b60..84f0d3852 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -127,7 +127,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   // proper fix in KWin ([email protected])
   XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
 #endif
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   TDEConfig* config = KMKernel::config();
   config->setGroup("SearchDialog");
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index a421209a5..cd4a91624 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -45,14 +45,14 @@ namespace KMail {
     // modal subdialogs will only affect this window, not the other windows
     setWFlags( getWFlags() | WGroupLeader );
 
-    kapp->ref();
+    tdeApp->ref();
   }
 
 
   //---------------------------------------------------------------------------
   SecondaryWindow::~SecondaryWindow()
   {
-    kapp->deref();
+    tdeApp->deref();
   }
 
 
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index 7cb9d9acb..cd42388fd 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -59,7 +59,7 @@ namespace KMail {
     int newId;
     do
     {
-      newId = kapp->random();
+      newId = tdeApp->random();
     } while ( usedIds.find(newId) != usedIds.end() );
 
     return newId;
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index f02d42365..3b1c49323 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -43,7 +43,7 @@ namespace KMail {
 				  const char * name, bool modal )
     : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal )
   {
-    KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+    KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
 
     static const int rows = 7;
     int row = -1;
diff --git a/kmailcvt/filters.cpp b/kmailcvt/filters.cpp
index 2c43ff435..0b5c9937b 100644
--- a/kmailcvt/filters.cpp
+++ b/kmailcvt/filters.cpp
@@ -65,13 +65,13 @@ void FilterInfo::setTo( const TQString& to )
 void FilterInfo::setCurrent( const TQString& current )
 {
   m_dlg->_current->setText( current );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void  FilterInfo::setCurrent( int percent )
 {
   m_dlg->_done_current->setProgress( percent );
-  kapp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
+  tdeApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
 }
 
 void  FilterInfo::setOverall( int percent )
@@ -84,7 +84,7 @@ void FilterInfo::addLog( const TQString& log )
   m_dlg->_log->insertItem( log );
   m_dlg->_log->setCurrentItem( m_dlg->_log->count() - 1 );
   m_dlg->_log->centerCurrentItem();
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void FilterInfo::clear()
@@ -135,7 +135,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName,
   KURL msgURL;
   msgURL.setPath( msgPath );
 
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
     TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags );
@@ -171,7 +171,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
   KURL msgURL;
   msgURL.setPath( msgPath );
 
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
     TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags );
@@ -199,7 +199,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
 
 void Filter::showKMailImportArchiveDialog( FilterInfo* info )
 {
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
     TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" );
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 39ba423e9..6ae6982d1 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -40,7 +40,7 @@ KMailCVT::~KMailCVT() {
 }
 
 void KMailCVT::endImport() {
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
     TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call(  "dcopAddMessage", TQString(), TQString(), TQString());
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 6febb6aa3..c7535f526 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -94,7 +94,7 @@ KMobile::~KMobile()
 void KMobile::setupActions()
 {
     KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection());
-    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
     m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection());
     optionsShowToolbar();
@@ -115,7 +115,7 @@ void KMobile::setupActions()
 
     createGUI();
 
-    connect( kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) );
+    connect( tdeApp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) );
 }
 
 
@@ -139,7 +139,7 @@ bool KMobile::queryExit()
 
 void KMobile::slotQuit()
 {
-    kapp->quit();
+    tdeApp->quit();
 }
 
 void KMobile::showMinimized()
@@ -304,7 +304,7 @@ void KMobile::addDevice()
 		     "Please use the Skeleton- or Gnokii Device Driver during development.<p>"
 		     "This driver will still be visible, but you won't be able to access it "
 		     "from Konqueror or any other application.</qt>").arg(ptr->name()),
-		kapp->name());
+		tdeApp->name());
   }
 
   saveAll();
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 9e91d090f..3419c960d 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -1228,7 +1228,7 @@ void ArticleWidget::slotPrint( )
 
 void ArticleWidget::slotCopySelection( )
 {
-  kapp->clipboard()->setText( mViewer->selectedText() );
+  tdeApp->clipboard()->setText( mViewer->selectedText() );
 }
 
 
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index c01e58f8e..44e7bed8f 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -556,7 +556,7 @@ void KNArticleFactory::sendMailExternal(const TQString &address, const TQString
   if (!query.isEmpty())
     mailtoURL.setQuery(query);
 
-  kapp->invokeMailer(mailtoURL);
+  tdeApp->invokeMailer(mailtoURL);
 }
 
 
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index 8b2849a95..089ebfef4 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -57,13 +57,13 @@ void KNCleanUp::start()
   for ( TQValueList<KNArticleCollection*>::Iterator it = mColList.begin(); it != mColList.end(); ++it ) {
     if ( (*it)->type() == KNCollection::CTgroup ) {
       d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").arg( (*it)->name() ) );
-      kapp->processEvents();
+      tdeApp->processEvents();
       expireGroup( static_cast<KNGroup*>( (*it) ) );
       d_lg->doProgress();
     }
     else if ( (*it)->type() == KNCollection::CTfolder ) {
       d_lg->showMessage( i18n("Compacting folder <b>%1</b>").arg( (*it)->name() ) );
-      kapp->processEvents();
+      tdeApp->processEvents();
       compactFolder( static_cast<KNFolder*>( (*it) ) );
       d_lg->doProgress();
     }
@@ -255,7 +255,7 @@ KNCleanUp::ProgressDialog::ProgressDialog(int steps)
   p_rogress=0;
   s_teps=steps;
 
-  setCaption(kapp->makeStdCaption(i18n("Cleaning Up")));
+  setCaption(tdeApp->makeStdCaption(i18n("Cleaning Up")));
 
   setFixedSize(w,h);
   TQFrame *top=new TQFrame(this);
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index faab725f5..4a43a9d50 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
 
   TDEConfig *config = knGlobals.config();
   TDEConfigGroupSaver saver(config, "VISUAL_APPEARANCE");
-  TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp
-  TQColor defaultColor2( kapp->palette().active().text() );
-  TQColor defaultColor3( kapp->palette().active().text() );
-  TQColor defaultForeground( kapp->palette().active().text() );
+  TQColor defaultColor1( tdeApp->palette().active().text()); // defaults from kmreaderwin.cpp
+  TQColor defaultColor2( tdeApp->palette().active().text() );
+  TQColor defaultColor3( tdeApp->palette().active().text() );
+  TQColor defaultForeground( tdeApp->palette().active().text() );
   TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground );
   TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 );
   TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 );
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index ff6bd8b67..052b02ffd 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
   switch(i) {
 
     case background:
-      return kapp->palette().active().base();
+      return tdeApp->palette().active().base();
 
     case alternateBackground:
       return TDEGlobalSettings::alternateBackgroundColor();
@@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
 
     case normalText:
     case unreadThread:
-      return kapp->palette().active().text();
+      return tdeApp->palette().active().text();
 
     case url:
       return TDEGlobalSettings::linkColor();
 
     case readThread:
-      return kapp->palette().disabled().text();
+      return tdeApp->palette().disabled().text();
 
     case unreadArticle:
       return TQColor( 183, 154, 11 );
@@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
       return TQColor( 0xFF, 0x40, 0x40 );
   }
 
-  return kapp->palette().disabled().text();
+  return tdeApp->palette().disabled().text();
 }
 
 
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index e53f5c241..0b699ee65 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -47,7 +47,7 @@ bool KNConvert::needToConvert(const TQString &oldVersion)
 KNConvert::KNConvert(const TQString &version)
   : TQDialog(0,0,true), l_ogList(0), c_onversionDone(false), v_ersion(version)
 {
-  setCaption(kapp->makeStdCaption(i18n("Conversion")));
+  setCaption(tdeApp->makeStdCaption(i18n("Conversion")));
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5,5);
   s_tack=new TQWidgetStack(this);
   topL->addWidget(s_tack, 1);
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 35f976c48..473807ed1 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -93,7 +93,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   //article view
   a_rtDock = createDockWidget("article_viewer", SmallIcon("contents"), 0,
-                              kapp->makeStdCaption(i18n("Article Viewer")), i18n("Article Viewer"));
+                              tdeApp->makeStdCaption(i18n("Article Viewer")), i18n("Article Viewer"));
   if (!detachable) {
     a_rtDock->setEnableDocking(KDockWidget::DockFullSite);
   }
@@ -112,7 +112,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   //collection view
   c_olDock = createDockWidget("group_view", UserIcon("group"), 0,
-                              kapp->makeStdCaption(i18n("Group View")), i18n("Group View"));
+                              tdeApp->makeStdCaption(i18n("Group View")), i18n("Group View"));
   if (!detachable) {
     c_olDock->setEnableDocking(KDockWidget::DockFullSite);
   }
@@ -142,7 +142,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   //header view
   h_drDock = createDockWidget("header_view", SmallIcon("text_block"), 0,
-                              kapp->makeStdCaption(i18n("Header View")), i18n("Header View"));
+                              tdeApp->makeStdCaption(i18n("Header View")), i18n("Header View"));
   if (!detachable) {
     h_drDock->setEnableDocking(KDockWidget::DockFullSite);
   }
@@ -419,7 +419,7 @@ void KNMainWidget::secureProcessEvents()
     naccel->setEnabled(false);
   installEventFilter(this);
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   b_lockui = false;
   if ( mbar )
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index b63ba859b..475a48e3f 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -42,12 +42,12 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name )
 {
   if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   if ( fcntl( nntpInPipe[0], F_SETFL, O_NONBLOCK ) == -1 ||
        fcntl( nntpOutPipe[0], F_SETFL, O_NONBLOCK ) == -1 ) {
     KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read);
@@ -312,7 +312,7 @@ void KNNetAccess::threadDoneNntp()
       bool keep=false;
       if (KDialog::Accepted == TDEIO::PasswordDialog::getNameAndPassword(user, pass, &keep,
                                  i18n("You need to supply a username and a\npassword to access this server"), false,
-                                 kapp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) {
+                                 tdeApp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) {
         info->setNeedsLogon(true);
         info->setUser(user);
         info->setPass(pass);
diff --git a/knode/knode.cpp b/knode/knode.cpp
index 51f4f1278..2bad1511a 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -46,7 +46,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
   setStandardToolBarMenuEnabled(true);
 
   //config stuff
-  KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
+  KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection());
   KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection());
   KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection());
 
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 028a267d3..e4b856a2c 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -53,16 +53,16 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
   mParentWidget( parentWidget )
 {
   kdDebug(5003) << "KNodePart()" << endl;
-  kdDebug(5003) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5003) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   setInstance( KNodeFactory::instance() );
 
   kdDebug(5003) << "KNodePart()..." << endl;
-  kdDebug(5003) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5003) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   TDEGlobal::locale()->insertCatalogue("libtdepim");
   TDEGlobal::locale()->insertCatalogue("libkpgp");
-  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
+  tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet
   TDEGlobal::iconLoader()->addAppDir("knode");
   knGlobals.instance = KNodeFactory::instance();
 
@@ -76,7 +76,7 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
   topLayout->addWidget(mainWidget);
   mainWidget->setFocusPolicy(TQWidget::ClickFocus);
 
-  kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
+  tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   new KParts::SideBarExtension( mainWidget->collectionView(),
                                 this,
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 646969ee9..bd19398a7 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -32,7 +32,7 @@
 KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
   : TQDialog(parent)
 {
-  setCaption(kapp->makeStdCaption( i18n("Search for Articles") ));
+  setCaption(tdeApp->makeStdCaption( i18n("Search for Articles") ));
   setIcon(SmallIcon("knode"));
   TQGroupBox *bg=new TQGroupBox(this);
 
diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp
index 651bc1e80..c639c1161 100644
--- a/knode/knsourceviewwindow.cpp
+++ b/knode/knsourceviewwindow.cpp
@@ -32,7 +32,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text )
 
   setTextFormat( PlainText );
 
-  setCaption(kapp->makeStdCaption(i18n("Article Source")));
+  setCaption(tdeApp->makeStdCaption(i18n("Article Source")));
   setPaper( TQBrush(app->backgroundColor()) );
   setFont( app->articleFixedFont() );
   setColor( app->textColor() );
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 3485be00d..118836bf5 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -292,7 +292,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     // let KWin do the placement if the position is illegal--at least 10 pixels
     // of a note need to be visible
     const TQPoint& position = m_config->position();
-    TQRect desk = kapp->desktop()->rect();
+    TQRect desk = tdeApp->desktop()->rect();
     desk.addCoords( 10, 10, -10, -10 );
     if ( desk.intersects( TQRect( position, TQSize( width, height ) ) ) )
         move( position );           // do before calling show() to avoid flicker
@@ -360,8 +360,8 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     // HACK: update the icon color - again after showing the note, to make kicker aware of the new colors
     TDEIconEffect effect;
-    TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
-    TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
+    TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
+    TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, m_config->bgColor(), false );
     KWin::setIcons( winId(), icon, miniIcon );
 }
 
@@ -576,8 +576,8 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg )
 
     // update the icon color
     TDEIconEffect effect;
-    TQPixmap icon = effect.apply( kapp->icon(), TDEIconEffect::Colorize, 1, bg, false );
-    TQPixmap miniIcon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false );
+    TQPixmap icon = effect.apply( tdeApp->icon(), TDEIconEffect::Colorize, 1, bg, false );
+    TQPixmap miniIcon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1, bg, false );
     KWin::setIcons( winId(), icon, miniIcon );
 
     // set the color for the selection used to highlight the find stuff
@@ -1285,7 +1285,7 @@ void KNote::resizeEvent( TQResizeEvent *qre )
 
 void KNote::closeEvent( TQCloseEvent *event )
 {
-    if(kapp->sessionSaving())
+    if(tdeApp->sessionSaving())
         return;
     event->ignore(); //We don't want to close (and delete the widget). Just hide it
     slotClose();
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 60f7a539c..2f16a378b 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -47,7 +47,7 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title,
                      config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok )
 {
     setCaption( title );
-    KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+    KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
 
     setIconListAllVisible( true );
     enableButtonSeparator( true );
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 1f7e9b99a..9484598aa 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -96,7 +96,7 @@ KNotesApp::KNotesApp()
     : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ),
       m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 )
 {
-    connect( kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()) );
+    connect( tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit()) );
 
     m_noteList.setAutoDelete( true );
     m_noteActions.setAutoDelete( true );
@@ -119,7 +119,7 @@ KNotesApp::KNotesApp()
         this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
     new TDEAction( i18n("Hide All Notes"), "window-close", 0,
         this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
-    new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
+    new KHelpMenu( this, tdeApp->aboutData(), false, actionCollection() );
 
     m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() );
     KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() );
@@ -204,7 +204,7 @@ KNotesApp::KNotesApp()
     connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) );
     updateNetworkListener();
 
-    if ( m_noteList.count() == 0 && !kapp->isRestored() )
+    if ( m_noteList.count() == 0 && !tdeApp->isRestored() )
         newNote();
 
     updateNoteActions();
@@ -629,7 +629,7 @@ void KNotesApp::slotQuit()
             (*it)->saveData(false);
 
     saveConfigs();
-    kapp->quit();
+    tdeApp->quit();
 }
 
 
@@ -729,7 +729,7 @@ void KNotesApp::updateNoteActions()
                                        (TQObject *)0,
                                        it.current()->noteId().utf8() );
         TDEIconEffect effect;
-        TQPixmap icon = effect.apply( kapp->miniIcon(), TDEIconEffect::Colorize, 1,
+        TQPixmap icon = effect.apply( tdeApp->miniIcon(), TDEIconEffect::Colorize, 1,
                                      it.current()->paletteBackgroundColor(), false );
         action->setIconSet( icon );
         m_noteActions.append( action );
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index f0350627a..7eb4e4129 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -20,12 +20,12 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo
 
 * Constructor:
  m_foo_stub = 0L;
- kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)),
+ tdeApp->dcopClient()->setNotifications( true );
+ connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)),
           this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) );
 
 * Destructor:
- kapp->dcopClient()->setNotifications( false );
+ tdeApp->dcopClient()->setNotifications( false );
  delete m_foo_stub;
 
 [Note that setNotifications() is implemented with a refcount, this is the
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 904089cad..7fe8633ea 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -79,9 +79,9 @@ using namespace Kontact;
 int UniqueAppHandler::newInstance()
 {
   // This bit is duplicated from TDEUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
@@ -105,7 +105,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
     if ( !ds.atEnd() ) { // backwards compatibility
       TQCString asn_id;
       ds >> asn_id;
-      kapp->setStartupId( asn_id );
+      tdeApp->setStartupId( asn_id );
     }
 
     TQDataStream _replyStream( replyData, IO_WriteOnly );
@@ -148,15 +148,15 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
     : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
 {
   // The app is running standalone if 1) that name is known to DCOP
-  mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
+  mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() );
 
   // and 2) it's not registered by kontact (e.g. in another plugin)
-  if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) )
+  if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) )
       mRunningStandalone = false;
 
   if ( mRunningStandalone ) {
-    kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+    tdeApp->dcopClient()->setNotifications( true );
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
              this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
@@ -166,7 +166,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 UniqueAppWatcher::~UniqueAppWatcher()
 {
   if ( mRunningStandalone )
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
 
   delete mFactory;
 }
@@ -174,11 +174,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
 void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+    disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
                 this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
     mRunningStandalone = false;
   }
 }
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 1a8186940..f56bfabdb 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -203,7 +203,7 @@ int KMailUniqueAppHandler::newInstance()
 }
 
 bool KMailPlugin::queryClose() const {
-  KMailIface_stub stub( kapp->dcopClient(), "kmail", "KMailIface" );
+  KMailIface_stub stub( tdeApp->dcopClient(), "kmail", "KMailIface" );
   bool canClose=stub.canQueryClose();
   return canClose;
 }
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index dfa469bc0..fe39868a3 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -184,11 +184,11 @@ void KNoteTip::setFilter( bool enable )
     return;
 
   if ( enable ) {
-    kapp->installEventFilter( this );
+    tdeApp->installEventFilter( this );
     TQApplication::setGlobalMouseTracking( true );
   } else {
     TQApplication::setGlobalMouseTracking( false );
-    kapp->removeEventFilter( this );
+    tdeApp->removeEventFilter( this );
   }
 
   mFilter = enable;
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index a3229cd8a..69ab8dc20 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -42,9 +42,9 @@ int KOrganizerUniqueAppHandler::newInstance()
 
   // Bring korganizer's plugin to front
   // This bit is duplicated from TDEUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 475c64a9f..72d78b688 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -238,7 +238,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 }
 
 bool KOrganizerPlugin::queryClose() const {
-  KOrganizerIface_stub stub( kapp->dcopClient(), "korganizer", "KOrganizerIface" );
+  KOrganizerIface_stub stub( tdeApp->dcopClient(), "korganizer", "KOrganizerIface" );
   bool canClose=stub.canQueryClose();
   return (!canClose);
 }
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index cc91632f5..6a15dc096 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -113,13 +113,13 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
            this, TQ_SLOT( startKPilot() ) );
 
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
     startKPilot();
   }
 
   connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)",
                      "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false );
-	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
+	connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
 }
 
 SummaryWidget::~SummaryWidget()
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index e186f2a13..84aaca95d 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -392,7 +392,7 @@ bool KCMKontactKNT::dcopActive() const
   TQString error;
   TQCString appID;
   bool isGood = true;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if ( !client->isApplicationRegistered( "rssservice" ) ) {
     if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
       isGood = false;
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index b7b3f8660..e209d031e 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQCString appID;
 
   bool dcopAvailable = true;
-  if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
     if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
       vlay->addWidget( label, TQt::AlignHCenter );
@@ -224,7 +224,7 @@ void SummaryWidget::updateView()
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
-             kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+             tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
     connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
              this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
@@ -253,7 +253,7 @@ void SummaryWidget::updateView()
       mLayout->addWidget( urlLabel );
 
       connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
-               kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+               tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
       connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
   menu.insertItem( i18n( "Copy URL to Clipboard" ) );
   int id = menu.exec( TQCursor::pos() );
   if ( id != -1 )
-    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
+    tdeApp->clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index fb9167c65..ea783de86 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -558,7 +558,7 @@ void SDSummaryWidget::mailContact( const TQString &uid )
   TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true );
   TQString email = ab->findByUid( uid ).fullEmail();
 
-  kapp->invokeMailer( email, TQString() );
+  tdeApp->invokeMailer( email, TQString() );
 }
 
 void SDSummaryWidget::viewContact( const TQString &uid )
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 5c64d9348..0fea7ac8b 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -77,7 +77,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
 
   initGUI( core );
 
-  connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
   setDate( TQDate::currentDate() );
@@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged()
 
 void SummaryViewPart::slotAdjustPalette()
 {
-  mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
+  mMainWidget->setPaletteBackgroundColor( tdeApp->palette().active().base() );
 }
 
 void SummaryViewPart::setDate( const TQDate& newDate )
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 12a7b4833..0752a8369 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -53,14 +53,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
 
   new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
 }
 
 TestPart::~TestPart()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete m_kab_stub;
 }
 
@@ -92,7 +92,7 @@ bool TestPart::connectToAddressBook()
     }
     // TODO document the required named for the dcop interfaces e.g. "CalendarIface".
     TQCString dcopObjectId = "KAddressBookIface";
-    m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId);
+    m_kab_stub = new KAddressBookIface_stub(tdeApp->dcopClient(), dcopService, dcopObjectId);
   }
   return m_kab_stub != 0L;
 }
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 660cf3700..fb28ab335 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQString error;
   TQCString appID;
   bool serviceAvailable = true;
-  if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
     if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this );
       mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index a354fa417..3fb4714b7 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -193,12 +193,12 @@ void MainWindow::initObject()
   // launch commandline specified module if any
   activatePluginModule();
 
-  if ( Prefs::lastVersionSeen() == kapp->aboutData()->version() ) {
+  if ( Prefs::lastVersionSeen() == tdeApp->aboutData()->version() ) {
     selectPlugin( mCurrentPlugin );
   }
 
   paintAboutScreen( introductionString() );
-  Prefs::setLastVersionSeen( kapp->aboutData()->version() );
+  Prefs::setLastVersionSeen( tdeApp->aboutData()->version() );
 }
 
 MainWindow::~MainWindow()
@@ -291,7 +291,7 @@ void MainWindow::paintAboutScreen( const TQString& msg )
   TQString location = locate( "data", "kontact/about/main.html" );
   TQString content = KPIM::kFileToString( location );
   content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
     content = content.arg( "" );
@@ -802,7 +802,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
+  TQWidget *focusWidget = tdeApp->focusWidget();
   if ( mCurrentPlugin && focusWidget ) {
     // save the focus widget only when it belongs to the activated part
     TQWidget *parent = focusWidget->parentWidget();
@@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
       if ( !url.query().isEmpty() ) {
         app = url.query().mid( 1 );
       }
-      kapp->invokeHelp( TQString(), app );
+      tdeApp->invokeHelp( TQString(), app );
     }
   } else {
     new KRun( url, this );
@@ -1133,8 +1133,8 @@ void MainWindow::saveProperties( TDEConfig *config )
 
 bool MainWindow::queryClose()
 {
-  //if ( kapp->sessionSaving() || mReallyClose )
-  if ( kapp->sessionSaving() )
+  //if ( tdeApp->sessionSaving() || mReallyClose )
+  if ( tdeApp->sessionSaving() )
     return true;
 
   bool localClose = true;
@@ -1178,7 +1178,7 @@ TQString MainWindow::introductionString()
       "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
       "</table>"
       "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" )
-      .arg( kapp->aboutData()->version() )
+      .arg( tdeApp->aboutData()->version() )
       .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
       .arg( "exec:/help?kontact" )
       .arg( iconSize )
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index ff499d49f..22a36abdf 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -259,7 +259,7 @@ class TDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void keyBindings();
 
     /**
-      Using the TDEConfig associated with the kapp variable, read in the
+      Using the TDEConfig associated with the tdeApp variable, read in the
       settings from the config file.
     */
     void readSettings();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index d51bb4342..91868296b 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -378,7 +378,7 @@ class TDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     void checkClipboard();
 
     /**
-      Using the TDEConfig associated with the kapp variable, read in the
+      Using the TDEConfig associated with the tdeApp variable, read in the
       settings from the config file.
 
       You have to call setCalendar before calling readSettings.
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index a32e445ab..8ce25fb7f 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -242,7 +242,7 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
 
     pclose(fd);
   } else {
-    if (!kapp->dcopClient()->isApplicationRegistered("kmail")) {
+    if (!tdeApp->dcopClient()->isApplicationRegistered("kmail")) {
       if (TDEApplication::startServiceByDesktopName("kmail")) {
         KMessageBox::error(0,i18n("No running instance of KMail found."));
         return false;
@@ -293,9 +293,9 @@ int KOMailClient::kMailOpenComposer(const TQString& arg0,const TQString& arg1,
   arg << arg5;
   arg << arg6;
 #if KDE_IS_VERSION( 3, 2, 90 )
-  kapp->updateRemoteUserTimestamp( "kmail" );
+  tdeApp->updateRemoteUserTimestamp( "kmail" );
 #endif
-  if (kapp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) {
+  if (tdeApp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) {
     if ( replyType == "int" ) {
       TQDataStream _reply_stream( replyData, IO_ReadOnly );
       _reply_stream >> result;
@@ -345,9 +345,9 @@ int KOMailClient::kMailOpenComposer( const TQString& arg0, const TQString& arg1,
     arg << arg14;
     arg << identity;
 #if KDE_IS_VERSION( 3, 2, 90 )
-    kapp->updateRemoteUserTimestamp("kmail");
+    tdeApp->updateRemoteUserTimestamp("kmail");
 #endif
-    if ( kapp->dcopClient()->call("kmail","KMailIface",
+    if ( tdeApp->dcopClient()->call("kmail","KMailIface",
           "openComposer(TQString,TQString,TQString,TQString,TQString,int,TQString,TQCString,TQCString,TQCString,TQCString,TQCString,TQString,TQCString,TQCString,uint)", data, replyType, replyData ) ) {
         if ( replyType == "int" ) {
             TQDataStream _reply_stream( replyData, IO_ReadOnly );
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index b569677f2..91fb5d599 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary )
 
 void AlarmDialog::readLayout()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Layout" );
   TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
   if ( sizes.count() == 2 ) {
@@ -215,7 +215,7 @@ void AlarmDialog::readLayout()
 
 void AlarmDialog::writeLayout()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Layout" );
   TQValueList<int> list = mSplitter->sizes();
   config->writeEntry( "SplitterSizes", list );
@@ -344,7 +344,7 @@ void AlarmDialog::edit()
   arg << incidence->uid();
   arg << dt;
   //kdDebug(5890) << "editing incidence " << incidence->summary() << endl;
-  if ( !kapp->dcopClient()->send( "korganizer", "KOrganizerIface",
+  if ( !tdeApp->dcopClient()->send( "korganizer", "KOrganizerIface",
                                   "editIncidence(TQString,TQDate)",
                                   data ) ) {
     KMessageBox::error(
@@ -356,9 +356,9 @@ void AlarmDialog::edit()
   // get desktop # where korganizer (or kontact) runs
   TQByteArray replyData;
   TQCString object, replyType;
-  object = kapp->dcopClient()->isApplicationRegistered( "kontact" ) ?
+  object = tdeApp->dcopClient()->isApplicationRegistered( "kontact" ) ?
            "kontact-mainwindow#1" : "KOrganizer MainWindow";
-  if (!kapp->dcopClient()->call( "korganizer", object,
+  if (!tdeApp->dcopClient()->call( "korganizer", object,
                             "getWinID()", 0, replyType, replyData, true, -1 ) ) {
   }
 
@@ -566,7 +566,7 @@ void AlarmDialog::wakeUp()
 
 void AlarmDialog::slotSave()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   TDELockFile::Ptr lock = config->lockFile();
   if ( lock.data()->lock() != TDELockFile::LockOK )
     return;
@@ -673,12 +673,12 @@ bool AlarmDialog::ensureKorganizerRunning() const
     // but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject(
+    if ( !tdeApp->dcopClient()->findObject(
            dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to TDEUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
-        Q_ASSERT( kapp->dcopClient()->findObject(
+        Q_ASSERT( tdeApp->dcopClient()->findObject(
                     dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else {
         kdWarning() << "Error loading " << dcopService << endl;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index a5cb277e6..c61517c89 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -48,7 +48,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
   : KSystemTray( 0, name )
 {
   // Read the autostart status from the config file
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("General");
   bool autostart = config->readBoolEntry( "Autostart", true );
   bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
@@ -110,7 +110,7 @@ void AlarmDockWindow::resizeTrayIcon ()
 	mPixmapEnabled  = loadSizedIcon( "korgac", width() );
 	mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() );
 
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
 	setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled );
 }
@@ -148,7 +148,7 @@ void AlarmDockWindow::toggleAlarmsEnabled()
 {
   kdDebug(5890) << "AlarmDockWindow::toggleAlarmsEnabled()" << endl;
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "General" );
 
   bool enabled = !contextMenu()->isItemChecked( mAlarmsEnabledId );
@@ -178,7 +178,7 @@ void AlarmDockWindow::slotDismissAll()
 
 void AlarmDockWindow::enableAutostart( bool enable )
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "General" );
   config->writeEntry( "Autostart", enable );
   config->sync();
@@ -189,7 +189,7 @@ void AlarmDockWindow::enableAutostart( bool enable )
 void AlarmDockWindow::mousePressEvent( TQMouseEvent *e )
 {
   if ( e->button() == TQt::LeftButton ) {
-    kapp->startServiceByDesktopName( "korganizer", TQString() );
+    tdeApp->startServiceByDesktopName( "korganizer", TQString() );
   } else {
     KSystemTray::mousePressEvent( e );
   }
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 37478ca0e..a09a5c1d2 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -60,7 +60,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
 
   connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) );
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Alarms" );
   int interval = config->readNumEntry( "Interval", 60 );
   kdDebug(5890) << "KOAlarmClient check interval: " << interval << " seconds."
@@ -102,7 +102,7 @@ KOAlarmClient::~KOAlarmClient()
 
 void KOAlarmClient::checkAlarms()
 {
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
 
   cfg->setGroup( "General" );
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
@@ -160,7 +160,7 @@ void KOAlarmClient::saveLastCheckTime()
 void KOAlarmClient::quit()
 {
   kdDebug(5890) << "KOAlarmClient::quit()" << endl;
-  kapp->quit();
+  tdeApp->quit();
 }
 
 bool KOAlarmClient::commitData( TQSessionManager& )
@@ -178,7 +178,7 @@ void KOAlarmClient::forceAlarmCheck()
 
 void KOAlarmClient::dumpDebug()
 {
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
 
   cfg->setGroup( "Alarms" );
   TQDateTime lastChecked = cfg->readDateTimeEntry( "CalendarsLastChecked" );
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index 566146042..e569a9065 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -104,7 +104,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 
   protected slots:
 
-    /** using the TDEConfig associated with the kapp variable, read in the
+    /** using the TDEConfig associated with the tdeApp variable, read in the
      * settings from the config file.
      */
     void readSettings();
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 913482f3e..2c398560b 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -72,8 +72,8 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
   topLayout->addWidget( m_tryFindMailbox, 5, 2 );
   connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
 
-  kapp->config()->setGroup( "Calendar/Exchange Plugin" );
-  bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true );
+  tdeApp->config()->setGroup( "Calendar/Exchange Plugin" );
+  bool autoChecked = tdeApp->config()->readBoolEntry( "auto-mailbox", true );
   m_autoMailbox->setChecked( autoChecked );
 }
 
@@ -116,8 +116,8 @@ void ExchangeConfig::slotOk()
   mAccount->setAccount( m_user->text() );
   mAccount->setPassword( m_password->text() );
 
-  kapp->config()->setGroup( "Calendar/Exchange Plugin" );
-  kapp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() );
+  tdeApp->config()->setGroup( "Calendar/Exchange Plugin" );
+  tdeApp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() );
   
   accept();
 }
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 8b0e5cbff..d27380526 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -118,7 +118,7 @@ void KOProjectView::readSettings()
 {
   kdDebug(5850) << "KOProjectView::readSettings()" << endl;
 
-  //TDEConfig *config = kapp->config();
+  //TDEConfig *config = tdeApp->config();
   TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
   config.setGroup("Views");
 
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 911c5aca0..27a6e9709 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -77,7 +77,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
   if ( uri.startsWith( "kmail:" ) ) {
 
     // make sure kmail is running or the part is shown
-    kapp->startServiceByDesktopPath("kmail");
+    tdeApp->startServiceByDesktopPath("kmail");
 
     // parse string, show
     int colon = uri.find( ':' );
@@ -91,13 +91,13 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
 
   } else if ( uri.startsWith( "mailto:" ) ) {
 
-    TDEApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
+    tdeApp->invokeMailer( uri.mid(7), TQString() );
     return true;
 
   } else if ( uri.startsWith( "uid:" ) ) {
 
     TQString uid = uidFromUri( uri );
-    DCOPClient *client = TDEApplication::kApplication()->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     const TQByteArray noParamData;
     const TQByteArray paramData;
     TQByteArray replyData;
@@ -108,7 +108,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
     if ( foundAbbrowser ) {
       // KAddressbook is already running, so just DCOP to it to bring up the contact editor
 #if KDE_IS_VERSION( 3, 2, 90 )
-      kapp->updateRemoteUserTimestamp("kaddressbook");
+      tdeApp->updateRemoteUserTimestamp("kaddressbook");
 #endif
       DCOPRef kaddressbook( "kaddressbook", "KAddressBookIface" );
       kaddressbook.send( "showContactEditor", uid );
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 0571e41e0..99f54dd9d 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -400,7 +400,7 @@ void BoxContainerItem::runCommand()//Possible_unsafe?
 
 void BoxContainerItem::help()
 {
-	kapp->invokeHelp();
+	tdeApp->invokeHelp();
 }
 
 void BoxContainerItem::reportBug()
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 34b483cc6..fc97fa2d0 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -42,7 +42,7 @@ DockedItem::DockedItem( TQWidget * parent, const char * name )
 {
 	this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );
 	
-	connect( _systemtray, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) );
+	connect( _systemtray, TQ_SIGNAL( quitSelected() ), tdeApp, TQ_SLOT( quit() ) );
 	connect( _systemtray, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
 		 this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index 129543794..47ee53d25 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -36,10 +36,10 @@ HVItem::HVItem( TQWidget *parent, const char *name )
 	_popup( new TDEPopupMenu( _label, "popupmenu" ) ),
 	_actions( new TDEActionCollection( _popup, "actions" ) )
 {
-	_popup->insertTitle( kapp->miniIcon(), kapp->caption() );
+	_popup->insertTitle( tdeApp->miniIcon(), tdeApp->caption() );
 	this->fillTDEPopupMenu( _popup, _actions );
 	_popup->insertSeparator();
-	KStdAction::quit( kapp, TQ_SLOT( quit() ), _actions )->plug( _popup );
+	KStdAction::quit( tdeApp, TQ_SLOT( quit() ), _actions )->plug( _popup );
 	
 	connect( _label, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index ec3c7caf4..c35674142 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -40,7 +40,7 @@ KornShell::KornShell( TQWidget * parent, const char * name )
 	_show( false )
 {
 	_config->checkUpdate( "korn_kde_3_4_config_change", "korn-3-4-config_change.upd" );
-	if( kapp->isRestored() )
+	if( tdeApp->isRestored() )
 	{
 		_config->setGroup( "korn" );
 		TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQ_SLOT(readConfig()) );
@@ -119,7 +119,7 @@ void KornShell::readConfig()
 		}
 		else
 		{
-			kapp->quit();
+			tdeApp->quit();
 		}
 
 	if( _show )
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 9a03be625..70a43d928 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -86,7 +86,7 @@ void KTNEFMain::setupActions()
 {
 	// File menu
 	KStdAction::open(this, TQ_SLOT(openFile()), actionCollection());
-	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
 	// Action menu
 	new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQ_SLOT(viewFile()), actionCollection(), "view_file");
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index 0d1c63f2c..5f027a3cc 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -165,7 +165,7 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment )
 
   bool stat = true;
   if ( attachment->isUri() ) {
-    kapp->invokeBrowser( attachment->uri() );
+    tdeApp->invokeBrowser( attachment->uri() );
   } else {
     // put the attachment in a temporary file and launch it
     KURL tempUrl = tempFileForAttachment( attachment );
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index cb870d73e..2d364aeaa 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -293,8 +293,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
     mAllowedKeys( allowedKeys ),
     mCurrentContextMenuItem( 0 )
 {
-  if ( kapp )
-    KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  if ( tdeApp )
+    KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
   TDEConfig *config = pgp->getConfig();
   TDEConfigGroup dialogConfig( config, "Key Selection Dialog" );
@@ -1015,10 +1015,10 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c
     kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n";
     pProgressDlg->setLabel( i18n("Checking key 0x%1...")
                             .arg( TQString( getKeyId( *it ) ) ) );
-    kapp->processEvents();
+    tdeApp->processEvents();
     keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
     pProgressDlg->progressBar()->advance( 1 );
-    kapp->processEvents();
+    tdeApp->processEvents();
   }
 
   delete pProgressDlg;
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 9c8013281..fc8bf60a6 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -96,40 +96,40 @@ TQString endecryptStr( const TQString &aStr )
 
 void ExchangeAccount::save( TQString const &group )
 {
-  kapp->config()->setGroup( group );
-  kapp->config()->writeEntry( "host", mHost );
-  kapp->config()->writeEntry( "user", mAccount );
-  kapp->config()->writeEntry( "mailbox", mMailbox );
-  kapp->config()->writeEntry( "MS-ID", endecryptStr( mPassword ) );
-  kapp->config()->sync();
+  tdeApp->config()->setGroup( group );
+  tdeApp->config()->writeEntry( "host", mHost );
+  tdeApp->config()->writeEntry( "user", mAccount );
+  tdeApp->config()->writeEntry( "mailbox", mMailbox );
+  tdeApp->config()->writeEntry( "MS-ID", endecryptStr( mPassword ) );
+  tdeApp->config()->sync();
 }
 
 void ExchangeAccount::load( TQString const &group )
 {
-  kapp->config()->setGroup( group );
+  tdeApp->config()->setGroup( group );
 
-  TQString host = kapp->config()->readEntry( "host" );
+  TQString host = tdeApp->config()->readEntry( "host" );
   if ( ! host.isNull() ) {
     mHost = host;
   } else {
     mHost = "mail.company.com";
   }
 
-  TQString user = kapp->config()->readEntry( "user" );
+  TQString user = tdeApp->config()->readEntry( "user" );
   if ( ! user.isNull() ) {
     mAccount = user;
   } else {
     mAccount = "username";
   }
 
-  TQString mailbox = kapp->config()->readEntry( "mailbox" );
+  TQString mailbox = tdeApp->config()->readEntry( "mailbox" );
   if ( ! mailbox.isNull() ) {
     mMailbox = mailbox;
   } else {
     mMailbox = "webdav://" + host + "/exchange/" + mAccount;
   }
 
-  TQString password = endecryptStr( kapp->config()->readEntry( "MS-ID" ) );
+  TQString password = endecryptStr( tdeApp->config()->readEntry( "MS-ID" ) );
   if ( ! password.isNull() ) {
     mPassword = password;
   }
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 354145021..a087974d8 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -156,9 +156,9 @@ void IdentityManager::commit()
   // The emitter is always set to KPIM::IdentityManager, so that the connect works
   // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal
   TQByteArray data; TQDataStream arg( data, IO_WriteOnly );
-  arg << kapp->dcopClient()->appId();
+  arg << tdeApp->dcopClient()->appId();
   arg << DCOPObject::objId(); // the real objId, for checking in slotIdentitiesChanged
-  kapp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data );
+  tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data );
 }
 
 void IdentityManager::rollback()
@@ -487,7 +487,7 @@ int IdentityManager::newUoid()
                   // default identity
 
   do {
-    uoid = kapp->random();
+    uoid = tdeApp->random();
   } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() );
 
   return uoid;
@@ -506,7 +506,7 @@ void KPIM::IdentityManager::slotIdentitiesChanged( TQCString appId, TQCString ob
 {
   // From standalone kmail to standalone korganizer, the appId will differ
   // From kontact the appId will match, so we need to test the objId
-  if ( kapp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) {
+  if ( tdeApp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) {
     mConfig->reparseConfiguration();
     Q_ASSERT( !hasPendingChanges() );
     readConfig( mConfig );
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index defdecfac..a87249915 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -105,7 +105,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
   load();
 
   // set up IMProxy to display contacts' IM presence and make connections to keep the display live
-  mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+  mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
   connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
            this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) );
   connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ),
@@ -569,15 +569,15 @@ TDEABC::Addressee AddresseeView::addressee() const
 
 void AddresseeView::urlClicked( const TQString &url )
 {
-  kapp->invokeBrowser( url );
+  tdeApp->invokeBrowser( url );
 }
 
 void AddresseeView::emailClicked( const TQString &email )
 {
   if ( email.startsWith( "mailto:" ) )
-    kapp->invokeMailer( email.mid( 7 ), TQString() );
+    tdeApp->invokeMailer( email.mid( 7 ), TQString() );
   else
-    kapp->invokeMailer( email, TQString() );
+    tdeApp->invokeMailer( email, TQString() );
 }
 
 void AddresseeView::phoneNumberClicked( const TQString &number )
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 0695dfb19..e604bae93 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -972,7 +972,7 @@ AddressesDialog::ldapSearchResult()
 void
 AddressesDialog::launchAddressBook()
 {
-  kapp->startServiceByDesktopName( "kaddressbook", TQString() );
+  tdeApp->startServiceByDesktopName( "kaddressbook", TQString() );
 }
 
 void
diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp
index 50e7b960c..14d0a58bb 100644
--- a/libtdepim/alarmclient.cpp
+++ b/libtdepim/alarmclient.cpp
@@ -40,7 +40,7 @@ AlarmClient::~AlarmClient()
 
 void AlarmClient::startDaemon()
 {
-  if ( kapp->dcopClient()->isApplicationRegistered( "korgac" ) ) {
+  if ( tdeApp->dcopClient()->isApplicationRegistered( "korgac" ) ) {
     // Alarm daemon already runs
     return;
   }
@@ -52,7 +52,7 @@ void AlarmClient::startDaemon()
   }
   else {
     TQString error;
-    if ( kapp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 )
+    if ( tdeApp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 )
       kdWarning() << "Failure starting korgac:" << error << endl;
   }
 }
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 8a3a25eb5..a38c8f1e1 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -297,7 +297,7 @@ void CompletionOrderEditor::slotOk()
     // Emit DCOP signal
     // The emitter is always set to KPIM::IMAPCompletionOrder, so that the connect works
     // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal
-    kapp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() );
+    tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() );
   }
   KDialogBase::slotOk();
 }
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index b32b017ed..cb831d419 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -58,13 +58,13 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   TDEABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.count() > 0 ) {
-    if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
+    if ( tdeApp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
       //make sure kaddressbook is loaded, otherwise showContactEditor
       //won't work as desired, see bug #87233
       DCOPRef call ( "kaddressbook", "kaddressbook" );
       call.send( "newInstance()" );
     }  else {
-      kapp->startServiceByDesktopName( "kaddressbook" );
+      tdeApp->startServiceByDesktopName( "kaddressbook" );
     }
 
     DCOPRef call( "kaddressbook", "KAddressBookIface" );
@@ -162,12 +162,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
 }
 
 void KAddrBookExternal::openAddressBook(TQWidget *) {
-  kapp->startServiceByDesktopName( "kaddressbook" );
+  tdeApp->startServiceByDesktopName( "kaddressbook" );
 }
 
 void KAddrBookExternal::addNewAddressee( TQWidget* )
 {
-  kapp->startServiceByDesktopName("kaddressbook");
+  tdeApp->startServiceByDesktopName("kaddressbook");
   DCOPRef call("kaddressbook", "KAddressBookIface");
   call.send("newContact()");
 }
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index 44e7edddc..207fd845a 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -338,7 +338,7 @@ void KImportDialog::readFile( int rows )
     {
       progress->setValue(progressValue++);
       if (progressValue % 15 == 0) // try not to constantly repaint
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     
     if (x == '\r') inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly
@@ -572,7 +572,7 @@ void KImportDialog::assignTemplate()
   TQStringList templates;
 
   // load all template files
-  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) +
       "/csv-templates/*.desktop", true, true );
 
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
@@ -666,7 +666,7 @@ void KImportDialog::applyConverter()
     mCurrentRow = i;
     progress->setValue(i);
     if (i % 5 == 0)  // try to avoid constantly processing events
-      kapp->processEvents();
+      tdeApp->processEvents();
       
     convertRow();
   }
@@ -728,7 +728,7 @@ TQString KImportDialog::data( uint row, uint col )
 void KImportDialog::saveTemplate()
 {
   TQString fileName = KFileDialog::getSaveFileName(
-                      locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+                      locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
                       "*.desktop", this );
 
   if ( fileName.isEmpty() )
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 3549a314d..82c6ef17f 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -238,7 +238,7 @@ Core::initCore()
 void
 Core::initConnections()
 {
-  connect( kapp, TQ_SIGNAL(shutDown()),
+  connect( tdeApp, TQ_SIGNAL(shutDown()),
            TQ_SLOT(slotQuit()) );
 }
 
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 8c4e025d8..15218eacf 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -74,7 +74,7 @@ PluginManager::PluginManager( TQObject *parent )
   // can remain in control when all windows are removed.
   // This way we can unload plugins asynchronously, which is more
   // robust if they are still doing processing.
-  kapp->ref();
+  tdeApp->ref();
   d->shutdownMode = Private::StartingUp;
 
   KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(),
@@ -216,7 +216,7 @@ PluginManager::slotShutdownDone()
 {
   d->shutdownMode = Private::DoneShutdown;
 
-  kapp->deref();
+  tdeApp->deref();
 }
 
 void
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 26cc3d24e..920b5a35c 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -459,7 +459,7 @@ TQString LDAPSearchDialog::selectedEMails() const
 
 void LDAPSearchDialog::slotHelp()
 {
-  kapp->invokeHelp( "ldap-queries" );
+  tdeApp->invokeHelp( "ldap-queries" );
 }
 
 void LDAPSearchDialog::slotUser1()
diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp
index b269efe08..adc7962a9 100644
--- a/libtdepim/maillistdrag.cpp
+++ b/libtdepim/maillistdrag.cpp
@@ -248,7 +248,7 @@ TQByteArray MailListDrag::encodedData(const char *mimeType) const
                 break;
             }
             dlg->progressBar()->setValue(++i);
-            kapp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers);
+            tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers);
         }
 
         delete dlg;
diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index 7b982aea1..026a8dd00 100644
--- a/libtdepim/tdeconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -167,7 +167,7 @@ void TDEConfigWizard::readConfig()
            "configured by the wizard do not run in parallel to the wizard; "
            "otherwise, changes done by the wizard could be lost."),
       i18n("Warning"), i18n("Run Wizard Now"), "warning_running_instances" );
-  if ( result != KMessageBox::Continue ) kapp->quit();
+  if ( result != KMessageBox::Continue ) tdeApp->quit();
 
   usrReadConfig();
 }
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 4d37dc953..f1e4f941c 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -39,7 +39,7 @@ void KPartsGenericPart::load()
         return; // not enough info yet
     // Here it crashes in KSycoca::openDatabase when trying to load the stuff from designer itself
     // Not sure why - but it's not really needed anyway.
-    if ( !kapp )
+    if ( !tdeApp )
         return;
     TQString mimetype = m_mimetype;
     if ( mimetype == "auto" )
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 3e5bf9450..be9efe5b9 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -381,7 +381,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
         // [that's not the case when kontact was already running, but korganizer not loaded into it...]
         static const char* const dcopObjectId = "KOrganizerIface";
         TQCString dummy;
-        if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+        if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
           DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
           if ( switchTo ) {
             ref.call( "newInstance()" ); // activate korganizer window
@@ -390,7 +390,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
           DCOPReply reply = ref.call( "load()" );
           if ( reply.isValid() && (bool)reply ) {
             kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-            Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+            Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
           } else
             kdWarning() << "Error loading " << dcopService << endl;
         }
@@ -671,13 +671,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     {
       ensureKorganizerRunning( true );
       // raise korganizer part in kontact or the korganizer app
-      kapp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() );
+      tdeApp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() );
       TQByteArray arg;
       TQDataStream s( arg, IO_WriteOnly );
       s << TQString( "kontact_korganizerplugin" );
-      kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
+      tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg );
 
-      KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
+      KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" );
       iface->showEventView();
       iface->showDate( date );
       delete iface;
@@ -823,7 +823,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
             summary = i18n( "Re: %1" ).arg( summary );
           }
 
-          TDEApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
+          tdeApp->invokeMailer( incidence->organizer().email(), summary );
           //fall through
         case KMessageBox::Yes: // means "do not send"
           if ( saveFile( "Receiver Not Searched", iCal, TQString( "reply" ) ) ) {
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 3856c1e38..215c83c8d 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -71,7 +71,7 @@ namespace {
   public:
     Formatter() {
       // disabled pending resolution of how to share static objects when dlopening libraries
-      //mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+      //mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
     }
 
     Result format( BodyPart *bodyPart, KMail::HtmlWriter *writer, KMail::Callback & ) const {
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
index ea688aace..f872a13c3 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
@@ -148,7 +148,7 @@ void KABC2Mutt::loadingFinished()
     }
   }
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 static std::ostream & operator<< ( std::ostream &os, const TQString &s )
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 24f6efe0c..d19a25765 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -176,7 +176,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, labelTxt );
     uiserver.transferring( progressId, labelTxt );
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index ac4904a83..24d9c25e0 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -55,14 +55,14 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
   mDCOPClient->attach();
   mDCOPClient->registerAs( objId, true );
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete mKMailIcalIfaceStub;
   mKMailIcalIfaceStub = 0;
   delete mDCOPClient;
@@ -78,13 +78,13 @@ bool KMailConnection::connectToKMail()
     // if we are kmail (and probably kontact as well) ourselves, don't try to start us again
     // this prevents a DCOP deadlock when launching the kmail while kontact is the IMAP backend
     // provider (and probably vice versa)
-    if ( kapp->instanceName() == "kmail" ) {
+    if ( tdeApp->instanceName() == "kmail" ) {
       // someone, probably ourselves, already offers the interface, if not stop here
-      const QCStringList services = kapp->dcopClient()->registeredApplications();
+      const QCStringList services = tdeApp->dcopClient()->registeredApplications();
       for ( uint i = 0; i < services.count(); ++i ) {
         if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
-        const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
+        const QCStringList objs = tdeApp->dcopClient()->remoteObjects( services[i] );
         if ( objs.contains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
@@ -107,7 +107,7 @@ bool KMailConnection::connectToKMail()
       }
     }
 
-    mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+    mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index 7476212e6..4415ce2ef 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -201,7 +201,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource )
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) );
     uiserver.transferring( progressId, "Contacts" );
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index 6b796e5d4..cd341e2d3 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -165,7 +165,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, labelTxt );
     uiserver.transferring( progressId, labelTxt );
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 6f239cc2f..dec929ce7 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -54,14 +54,14 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
   mDCOPClient->attach();
   mDCOPClient->registerAs( objId, true );
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete mKMailIcalIfaceStub;
   mKMailIcalIfaceStub = 0;
   delete mDCOPClient;
@@ -84,7 +84,7 @@ bool KMailConnection::connectToKMail()
       return false;
     }
 
-    mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+    mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp
index dc953ded0..91fe99dd9 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
@@ -197,7 +197,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) );
     uiserver.transferring( progressId, "Contacts" );
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index cc6bb5655..1915702e5 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -179,7 +179,7 @@ void CreateDisconnectedImapAccount::apply()
   c.setGroup( TQString("Account %1").arg( accountId ) );
   int uid;
   if ( mExistingAccountId < 0 ) {
-    uid = kapp->random();
+    uid = tdeApp->random();
     c.writeEntry( "Folder", uid );
   } else {
     uid = c.readNumEntry( "Folder" );
@@ -319,7 +319,7 @@ void CreateOnlineImapAccount::apply()
   c.writeEntry( "accounts", accCnt+1 );
 
   c.setGroup( TQString("Account %1").arg(accCnt+1) );
-  int uid = kapp->random();
+  int uid = tdeApp->random();
   c.writeEntry( "Folder", uid );
   c.writeEntry( "Id", uid );
   c.writeEntry( "Type", "imap" );