Use tdeApp

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

112 files changed, 285 insertions, 285 deletions

diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index 6bee25e6..41d4c899 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -78,7 +78,7 @@ void DCOPRSSIface::getCategories( const TQString &cat )
 	TQByteArray data;
 	TQDataStream stream( data, IO_WriteOnly );
 	stream << cat;
-	kapp->dcopClient()->send( "rssservice", "RSSQuery",
+	tdeApp->dcopClient()->send( "rssservice", "RSSQuery",
 	                          "getCategories(TQString)", data );
 }
 
diff --git a/dcoprss/service.cpp b/dcoprss/service.cpp
index fad8e674..6c13803e 100644
--- a/dcoprss/service.cpp
+++ b/dcoprss/service.cpp
@@ -73,13 +73,13 @@ void RSSService::exit()
 	//Save all current RSS links.
 	saveLinks();
 	Cache::self().save();
-	kapp->quit();
+	tdeApp->quit();
 }
 
 
 void RSSService::loadLinks()
 {
-	TDEConfig *conf = kapp->config();
+	TDEConfig *conf = tdeApp->config();
 	conf->setGroup("RSS Links");	
 	const TQStringList links = conf->readListEntry ("links"); 
 	TQStringList::ConstIterator it = links.begin();
@@ -90,7 +90,7 @@ void RSSService::loadLinks()
 
 void RSSService::saveLinks()
 {
-	TDEConfig *conf = kapp->config();
+	TDEConfig *conf = tdeApp->config();
 	conf->setGroup("RSS Links");	
         TQStringList lst;
         TQDictIterator<RSSDocument> itr(m_list);
diff --git a/doc/kget/index.docbook b/doc/kget/index.docbook
index aef471b1..122afa63 100644
--- a/doc/kget/index.docbook
+++ b/doc/kget/index.docbook
@@ -251,7 +251,7 @@ role="extension">.jpeg</literal> as shown below:
 <chapter id="commands">
 <title>Command Reference</title>
 
-<sect1 id="kapp-mainwindow">
+<sect1 id="tdeApp-mainwindow">
 <title>The main &kget; window</title>
 
 <sect2>
@@ -717,7 +717,7 @@ Documentation Copyright &copy; 2003 Jonathan Drews <email>[email protected]</ema
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>How to obtain &kget;</title>
 
 &install.intro.documentation;
diff --git a/doc/lisa/index.docbook b/doc/lisa/index.docbook
index 86f8db4f..28fd6072 100644
--- a/doc/lisa/index.docbook
+++ b/doc/lisa/index.docbook
@@ -3,7 +3,7 @@
   <!ENTITY lisa "<application>LISa</application>">
   <!ENTITY package "tdenetwork">
   <!ENTITY reslisa "<application>resLISa</application>">
-  <!ENTITY kappname "&lisa;"><!-- replace kapp here -->
+  <!ENTITY kappname "&lisa;"><!-- replace tdeApp here -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 ]>
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 9c89e1c4..238dd699 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -276,7 +276,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data)
     return;
   }
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
     TDEApplication::startServiceByDesktopName("kdict");
     waiting = 1;
@@ -306,7 +306,7 @@ void DictApplet::sendDelayedCommand()
     return;
   }
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
     waiting++;
     TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index f7d183cd..a72a375b 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -1178,24 +1178,24 @@ DictInterface::DictInterface()
   if (::pipe(fdPipeIn ) == -1 ) {
     perror( "Creating in pipe" );
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   if (::pipe(fdPipeOut ) == -1 ) {
     perror( "Creating out pipe" );
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   if (-1 == fcntl(fdPipeIn[0],F_SETFL,O_NONBLOCK)) {  // make socket non-blocking
     perror("fcntl()");
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   if (-1 == fcntl(fdPipeOut[0],F_SETFL,O_NONBLOCK)) {  // make socket non-blocking
     perror("fcntl()");
     KMessageBox::error(global->topLevel, i18n("Internal error:\nFailed to open pipes for internal communication."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
 
   notifier = new TQSocketNotifier(fdPipeIn[0],TQSocketNotifier::Read,this);
@@ -1208,7 +1208,7 @@ DictInterface::DictInterface()
   client = new DictAsyncClient(fdPipeOut[0],fdPipeIn[1]);
   if (!client) {
     KMessageBox::error(global->topLevel, i18n("Internal error:\nUnable to create thread."));
-    kapp->exit(1);
+    tdeApp->exit(1);
   }
   client->start();
   
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 424ae13e..164c0477 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -113,7 +113,7 @@ void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
 MatchView::MatchView(TQWidget *parent, const char *name)
   : TQWidget(parent,name),getOn(false),getAllOn(false)
 {
-  setCaption(kapp->makeStdCaption(i18n("Match List")));
+  setCaption(tdeApp->makeStdCaption(i18n("Match List")));
 
   TQVBoxLayout * boxLayout = new TQVBoxLayout(this, 1, 0);
 
@@ -388,14 +388,14 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int)
     rightBtnMenu->insertSeparator();
   }
 
-  kapp->clipboard()->setSelectionMode(false);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(false);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(true);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(true);
+    text = tdeApp->clipboard()->text();
   }
   if (!text.isEmpty()) {
-    popupClip = kapp->clipboard()->text();
+    popupClip = tdeApp->clipboard()->text();
     rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQ_SLOT(popupMatchClip()));
     rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQ_SLOT(popupDefineClip()));
     rightBtnMenu->insertSeparator();
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index d1d93c1d..fb47eb8c 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -276,7 +276,7 @@ void QueryView::selectAll()
 
 void QueryView::copySelection()
 {
-  kapp->clipboard()->setText(part->selectedText());
+  tdeApp->clipboard()->setText(part->selectedText());
 }
 
 
@@ -380,9 +380,9 @@ void QueryView::slotURLRequest (const KURL &url, const KParts::URLArgs &)
     if(type=="dbinfo")
       interface->showDbInfo(urlText.utf8());
     if(type=="realhttp")
-      kapp->invokeBrowser("http://"+urlText);
+      tdeApp->invokeBrowser("http://"+urlText);
     if(type=="realftp")
-      kapp->invokeBrowser("ftp://"+urlText);
+      tdeApp->invokeBrowser("ftp://"+urlText);
   }
 }
 
@@ -441,11 +441,11 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
                              this,TQ_SLOT(popupMatchSelect()));
     rightBtnMenu->insertSeparator();
   } else {
-    kapp->clipboard()->setSelectionMode(false);
-    TQString text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    TQString text = tdeApp->clipboard()->text();
     if (text.isEmpty()) {
-      kapp->clipboard()->setSelectionMode(true);
-      text = kapp->clipboard()->text();
+      tdeApp->clipboard()->setSelectionMode(true);
+      text = tdeApp->clipboard()->text();
     }
     if (!text.isEmpty()) {
       popupSelect = TQApplication::clipboard()->text();
@@ -506,7 +506,7 @@ void QueryView::popupMatchLink()
 
 void QueryView::popupOpenLink()
 {
-  kapp->invokeBrowser(popupLink);
+  tdeApp->invokeBrowser(popupLink);
 }
 
 
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index eb1af9c9..7b6795b9 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -54,8 +54,8 @@ TopLevel::TopLevel(TQWidget* parent, const char* name)
   : DCOPObject("KDictIface"), TDEMainWindow(parent, name, WType_TopLevel),
     optDlg(0L), setsDlg(0L), stopRef(0)
 {
-  kapp->dcopClient()->setDefaultObject(objId());
-  kapp->setMainWidget(this);
+  tdeApp->dcopClient()->setDefaultObject(objId());
+  tdeApp->setMainWidget(this);
 
   global = new GlobalData();
   global->topLevel = this;
@@ -134,7 +134,7 @@ void TopLevel::normalStartup()
 void TopLevel::quit()
 {
   kdDebug(5004) << "*DCOP call* TopLevel::quit()" << endl;
-  kapp->closeAllWindows();
+  tdeApp->closeAllWindows();
 }
 
 
@@ -266,11 +266,11 @@ void TopLevel::define(const TQString &query)
 void TopLevel::defineClipboard()
 {
   kdDebug(5004) << "TopLevel::defineClipboard()" << endl;
-  kapp->clipboard()->setSelectionMode(true);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(true);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(false);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    text = tdeApp->clipboard()->text();
   }
   define(text);
 }
@@ -287,11 +287,11 @@ void TopLevel::match(const TQString &query)
 void TopLevel::matchClipboard()
 {
   kdDebug(5004) << "TopLevel::matchClipboard()" << endl;
-  kapp->clipboard()->setSelectionMode(true);
-  TQString text = kapp->clipboard()->text();
+  tdeApp->clipboard()->setSelectionMode(true);
+  TQString text = tdeApp->clipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(false);
-    text = kapp->clipboard()->text();
+    tdeApp->clipboard()->setSelectionMode(false);
+    text = tdeApp->clipboard()->text();
   }
   match(text);
 }
@@ -324,7 +324,7 @@ void TopLevel::setupActions()
   actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this,
                  TQ_SLOT(stopClients()), actionCollection(), "stop_query");
   actStopQuery->setEnabled(false);
-  KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
+  KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection());
 
   // edit menu...
   actCopy = KStdAction::copy(queryView, TQ_SLOT(copySelection()), actionCollection());
@@ -588,7 +588,7 @@ void TopLevel::clientStarted(const TQString &message)
   resetStatusbarTimer.stop();
   stopRef++;
   actStopQuery->setEnabled(stopRef>0);       // enable stop-icon
-  kapp->setOverrideCursor(waitCursor);
+  tdeApp->setOverrideCursor(waitCursor);
 }
 
 
@@ -599,7 +599,7 @@ void TopLevel::clientStopped(const TQString &message)
   if (stopRef > 0)
     stopRef--;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 }
 
 
@@ -614,7 +614,7 @@ void TopLevel::renderingStarted()
 {
   stopRef++;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->setOverrideCursor(waitCursor);
+  tdeApp->setOverrideCursor(waitCursor);
 }
 
 
@@ -623,7 +623,7 @@ void TopLevel::renderingStopped()
   if (stopRef > 0)
     stopRef--;
   actStopQuery->setEnabled(stopRef>0);      // disable stop-icon
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 }
 
 
@@ -767,7 +767,7 @@ void TopLevel::optionsChanged()
 void TopLevel::raiseWindow()
 {
   // Bypass focus stealing prevention
-  kapp->updateUserTimestamp();
+  tdeApp->updateUserTimestamp();
 
   KWin::WindowInfo info = KWin::windowInfo( winId() );
 
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index f06b939b..0be8baf1 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -335,7 +335,7 @@ void DlgIndividual::slotOpenLocation()
 
     KURL location=m_location;
     location.setFileName("");
-    kapp->invokeBrowser( location.url() );
+    tdeApp->invokeBrowser( location.url() );
 
 #ifdef _DEBUG
     sDebugOut<<endl;
diff --git a/kget/docking.cpp b/kget/docking.cpp
index 54c0d96a..98b0cccb 100644
--- a/kget/docking.cpp
+++ b/kget/docking.cpp
@@ -56,7 +56,7 @@ DockWidget::DockWidget(TDEMainWidget * _parent):KSystemTray(_parent)
     setAcceptDrops(true);
    
     dtip = new DynamicTip( this );
-    dtip->setStatus( kapp->aboutData()->shortDescription() );
+    dtip->setStatus( tdeApp->aboutData()->shortDescription() );
 
 }
 
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 990ff1aa..753c8899 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -86,7 +86,7 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget()
 
     // popup menu for right mouse button
     popupMenu = new TDEPopupMenu();
-    popupMenu->insertTitle(kapp->caption());
+    popupMenu->insertTitle(tdeApp->caption());
     popupMenu->setCheckable(true);
 
     pop_Max = popupMenu->insertItem(i18n("Maximize"), this, TQ_SLOT(toggleMinimizeRestore()));
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index 339090b6..087d906e 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -121,7 +121,7 @@ void KGetLinkView::slotStartLeech()
         {
             TDEApplication::startServiceByDesktopName( "kget" );
         }
-        kapp->updateRemoteUserTimestamp( "kget" );
+        tdeApp->updateRemoteUserTimestamp( "kget" );
 
         TQByteArray data;
         TQDataStream stream( data, IO_WriteOnly );
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index be94180e..56b09312 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -134,9 +134,9 @@ void SeparatedLog::transferSelected(TQListViewItem * item)
 {
     if (item) {
         idSelected = item->text(0).toUInt();
-        // kapp->lock();
+        // tdeApp->lock();
         ml_log->setText(trMap[idSelected]);
-        // kapp->unlock();
+        // tdeApp->unlock();
     }
 }
 
@@ -144,9 +144,9 @@ void SeparatedLog::transferSelected(TQListViewItem * item)
 void SeparatedLog::refresh()
 {
     if (idSelected > 0) {
-        // kapp->lock();
+        // tdeApp->lock();
         ml_log->setText(trMap[idSelected]);
-        // kapp->unlock();
+        // tdeApp->unlock();
     }
 }
 
diff --git a/kget/main.cpp b/kget/main.cpp
index 7b59407f..4c81d4b8 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -147,7 +147,7 @@ public:
         }
 
         else
-            TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
+            TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId());
 
         if (args->isSet("showDropTarget"))
             tdemain->activateDropTarget();
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 8c905e18..3d456ff4 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -59,7 +59,7 @@ Settings::load()
 {
     sDebug << "Loading settings" << endl;
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
 
     // read system options
     config->setGroup("System");
@@ -196,7 +196,7 @@ void Settings::save()
 {
     sDebug << "Saving settings" << endl;
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
 
     // write connection options
     config->setGroup("Connection");
diff --git a/kget/slave.cpp b/kget/slave.cpp
index dac9e184..2dea721d 100644
--- a/kget/slave.cpp
+++ b/kget/slave.cpp
@@ -78,14 +78,14 @@ void Slave::PostMessage(SlaveResult _event, TQ_ULLONG _data)
 {
     SlaveEvent *e1 = new SlaveEvent(m_parent, _event, _data);
 
-    TQApplication::postEvent(kapp->mainWidget(), (TQEvent *) e1);
+    TQApplication::postEvent(tdeApp->mainWidget(), (TQEvent *) e1);
 }
 
 void Slave::PostMessage(SlaveResult _event, const TQString & _msg)
 {
     SlaveEvent *e1 = new SlaveEvent(m_parent, _event, _msg);
 
-    TQApplication::postEvent(kapp->mainWidget(), (TQEvent *) e1);
+    TQApplication::postEvent(tdeApp->mainWidget(), (TQEvent *) e1);
     mDebug << "Msg:" << "_msg = " << _msg << endl;
 }
 
@@ -93,7 +93,7 @@ void Slave::InfoMessage(const TQString & _msg)
 {
     SlaveEvent *e1 = new SlaveEvent(m_parent, SLV_INFO, _msg);
 
-    TQApplication::postEvent(kapp->mainWidget(), (TQEvent *) e1);
+    TQApplication::postEvent(tdeApp->mainWidget(), (TQEvent *) e1);
     mDebug << "Infor Msg:" << "_msg = " << _msg << endl;
 }
 
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 0cc65452..0b3c8091 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -169,7 +169,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked)
 
     setCentralWidget(myTransferList);
 
-    connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(slotSaveYourself()));
+    connect(tdeApp, TQ_SIGNAL(saveYourself()), TQ_SLOT(slotSaveYourself()));
 
     // Enable dropping
     setAcceptDrops(true);
@@ -726,7 +726,7 @@ void TDEMainWidget::slotQuit()
     sDebugOut << endl;
 #endif
 
-    kapp->quit();
+    tdeApp->quit();
 }
 
 
@@ -1650,7 +1650,7 @@ void TDEMainWidget::slotOpenIndividual()
 
 bool TDEMainWidget::queryClose()
 {
-    if( kapp->sessionSaving())
+    if( tdeApp->sessionSaving())
         return true;
     hide();
     return false;
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 22525bc3..8f4334ea 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -82,7 +82,7 @@ void NewsIconMgr::getIcon(const KURL &url)
 			TQByteArray data;
 			TQDataStream ds(data, IO_WriteOnly);
 			ds << url;
-			kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
+			tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
 		} else {
 			emit gotIcon(url, TQPixmap(TDEGlobal::dirs()->findResource("cache",
 							TQString::fromLatin1("favicons/%1.png").arg(url.host()))));
@@ -144,7 +144,7 @@ TQString NewsIconMgr::favicon(const KURL &url) const
 
 	ds << url;
 	
-	kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply);
+	tdeApp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply);
 	
 	if (replyType == "TQString") {
 		TQDataStream replyStream(reply, IO_ReadOnly);
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index a7e2ecfa..ccb5fb6a 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -119,7 +119,7 @@ void KNewsTicker::about()
 
 void KNewsTicker::help()
 {
-	kapp->invokeHelp(TQString(), TQString::fromLatin1("knewsticker"));
+	tdeApp->invokeHelp(TQString(), TQString::fromLatin1("knewsticker"));
 }
 
 void KNewsTicker::reportBug()
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 4db586e3..0c10ecc5 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -90,7 +90,7 @@ void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, Status status)
 
 void KntSrcFilePropsDlg::slotOpenURL(const TQString &url)
 {
-	kapp->invokeBrowser(url);
+	tdeApp->invokeBrowser(url);
 }
 
 void KntSrcFilePropsDlg::slotGotIcon(const KURL &, const TQPixmap &pixmap)
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index 5da27a1c..10f65964 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -136,8 +136,8 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name
 	m_mouseDrag(false),
 	m_totalStepping(0.0)
 {
-	if (!kapp->dcopClient()->isAttached())
-		kapp->dcopClient()->attach();
+	if (!tdeApp->dcopClient()->isAttached())
+		tdeApp->dcopClient()->attach();
 	
 	setFrameStyle(StyledPanel | Sunken);
 	
@@ -202,7 +202,7 @@ void NewsScroller::dropEvent(TQDropEvent* event)
 			configFrontend.setNewsSources(newsSources);
 
 			TQByteArray data;
-			kapp->dcopClient()->send("knewsticker", "KNewsTicker", "reparseConfig()", data);
+			tdeApp->dcopClient()->send("knewsticker", "KNewsTicker", "reparseConfig()", data);
 		}
 	}
 }
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 72e9a9c2..1b350469 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -128,7 +128,7 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name )
 	connect( protocolListView, TQ_SIGNAL(spacePressed(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *)));
 
 	// read sticky settings
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("Add Contact Wizard");
 	bool useKABC = config->readBoolEntry( "UseAddressBook", false );
 	chkAddressee->setChecked( useKABC );
@@ -237,7 +237,7 @@ void AddContactWizard::accept()
 		delete metaContact;
 
 	// write sticky settings
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("Add Contact Wizard");
 	config->writeEntry( "UseAddressBook", chkAddressee->isChecked() );
 	config->sync();
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 5471d528..bf3af844 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -941,7 +941,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
 
 	if(text.isEmpty()) return;
 
-	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
+	disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
 
 #ifndef TQT_NO_MIMECLIPBOARD
 	if(!justselection)
@@ -963,7 +963,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
     	TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
 	TQApplication::clipboard()->setText( text, TQClipboard::Selection );
 #endif
-	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+	connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 
 }
 
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 20549de2..1de1cee7 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -219,7 +219,7 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name )
 	m_showFormatToolbar = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true );
 	adjustingFormatToolbar = false;
 //	kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl;
-	kapp->ref();
+	tdeApp->ref();
 }
 
 KopeteChatWindow::~KopeteChatWindow()
@@ -267,7 +267,7 @@ KopeteChatWindow::~KopeteChatWindow()
 	}
 
 	delete anim;
-	kapp->deref();
+	tdeApp->deref();
 }
 
 void KopeteChatWindow::windowListChanged()
@@ -1155,7 +1155,7 @@ bool KopeteChatWindow::queryClose()
 
 bool KopeteChatWindow::queryExit()
 {
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
  	if ( app->sessionSaving()
 		|| app->isShuttingDown() /* only set if KopeteApplication::quitKopete() or
 									KopeteApplication::commitData() called */
@@ -1173,7 +1173,7 @@ void KopeteChatWindow::closeEvent( TQCloseEvent * e )
 {
 	// if there's a system tray applet and we are not shutting down then just do what needs to be done if a
 	// window is closed.
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
 	if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
 //		hide();
 		// BEGIN of code borrowed from TDEMainWindow::closeEvent
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 9e0c520f..d2f4e774 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -130,7 +130,7 @@ void KopeteEmoticonAction::setStickyMenu(bool sticky)
 
 int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 {
-	if (kapp && !kapp->authorizeTDEAction(name()))
+	if (tdeApp && !tdeApp->authorizeTDEAction(name()))
 		return -1;
 
 //	kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index 112be721..15510407 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -1447,7 +1447,7 @@ void KopeteContactListView::slotSendFile()
 
 			kdDebug( 14000 ) << "Email: " << emailAddr << "!" << endl;
 			if ( !emailAddr.isEmpty() )
-				kapp->invokeMailer( emailAddr, TQString() );
+				tdeApp->invokeMailer( emailAddr, TQString() );
 			else
 				KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "There is no email address set for this contact in the TDE address book." ), i18n( "No Email Address in Address Book" ) );
 		}
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index c08dfa01..85c62a24 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -114,7 +114,7 @@ void KopeteGroupViewItem::initLVI()
 
 	connect( KopetePrefs::prefs(), TQ_SIGNAL( contactListAppearanceChanged() ),
 		TQ_SLOT( slotConfigChanged() ) );
-	connect( kapp, TQ_SIGNAL( appearanceChanged() ),  TQ_SLOT( slotConfigChanged() ) );
+	connect( tdeApp, TQ_SIGNAL( appearanceChanged() ),  TQ_SLOT( slotConfigChanged() ) );
 
 	connect( m_group, TQ_SIGNAL( iconAppearanceChanged() ), TQ_SLOT( updateIcon() ) );
 
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index d088e971..05dac993 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -249,7 +249,7 @@ void KopeteMetaContactLVI::initLVI()
 	connect( KopetePrefs::prefs(), TQ_SIGNAL( contactListAppearanceChanged() ),
 			 TQ_SLOT( slotConfigChanged() ) );
 	
-	connect( kapp, TQ_SIGNAL( appearanceChanged() ),  TQ_SLOT( slotConfigChanged() ) );
+	connect( tdeApp, TQ_SIGNAL( appearanceChanged() ),  TQ_SLOT( slotConfigChanged() ) );
 
 	mBlinkTimer = new TQTimer( this, "mBlinkTimer" );
 	connect( mBlinkTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotBlink() ) );
diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp
index be4c0311..4f7a2cc2 100644
--- a/kopete/kopete/kimifaceimpl.cpp
+++ b/kopete/kopete/kimifaceimpl.cpp
@@ -362,13 +362,13 @@ void KIMIfaceImpl::slotContactStatusChanged( Kopete::MetaContact *mc )
 			break;
 		}
 		// tell anyone who's listening over DCOP
-		contactPresenceChanged( mc->metaContactId(), kapp->name(), p );
+		contactPresenceChanged( mc->metaContactId(), tdeApp->name(), p );
 /*		TQByteArray params;
 		TQDataStream stream(params, IO_WriteOnly);
 		stream << mc->metaContactId();
-		stream << kapp->name();
+		stream << tdeApp->name();
 		stream << p;
-		kapp->dcopClient()->emitDCOPSignal( "contactPresenceChanged( TQString, TQCString, int )", params );*/
+		tdeApp->dcopClient()->emitDCOPSignal( "contactPresenceChanged( TQString, TQCString, int )", params );*/
 	}
 }
 
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index e921cfe4..5f1ddd13 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -55,7 +55,7 @@ void KopeteActiveLabel::openLink( const TQString& link )
 	TQString protocol = url.protocol();
 	
 	if ( protocol == "mailto" )
-		kapp->invokeMailer(url);
+		tdeApp->invokeMailer(url);
 	else 
 	{
 		if ( KProtocolInfo::protocolClass( protocol ) == ":internet" ) // http, ftp, etc.
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 7f6f4c5d..4c0ab56f 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -618,7 +618,7 @@ void KopeteWindow::slotDisconnectAll()
 
 bool KopeteWindow::queryClose()
 {
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
 	if ( !app->sessionSaving()	// if we are just closing but not shutting down
 		&& !app->isShuttingDown()
 		&& KopetePrefs::prefs()->showTray()
@@ -636,7 +636,7 @@ bool KopeteWindow::queryClose()
 
 bool KopeteWindow::queryExit()
 {
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
  	if ( app->sessionSaving()
 		|| app->isShuttingDown() /* only set if KopeteApplication::quitKopete() or
 									KopeteApplication::commitData() called */
@@ -655,7 +655,7 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
 {
 	// if there's a system tray applet and we are not shutting down then just do what needs to be done if a
 	// window is closed.
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
 	if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
 		// BEGIN of code borrowed from TDEMainWindow::closeEvent
 		// Save settings if auto-save is enabled, and settings have changed
@@ -678,7 +678,7 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
 void KopeteWindow::slotQuit()
 {
 	saveOptions();
-	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	KopeteApplication *app = static_cast<KopeteApplication *>( tdeApp );
 	app->quitKopete();
 }
 
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index 68218d78..e255f06f 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -102,8 +102,8 @@ int main( int argc, char *argv[] )
 
 	KopeteApplication kopete;
 	new KIMIfaceImpl();
-	kapp->dcopClient()->registerAs( "kopete", false );
-	kapp->dcopClient()->setDefaultObject( (new KopeteIface())->objId() ); // Has to be called before exec
+	tdeApp->dcopClient()->registerAs( "kopete", false );
+	tdeApp->dcopClient()->setDefaultObject( (new KopeteIface())->objId() ); // Has to be called before exec
 
 	kopete.exec();
 }
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index 9d0fe5e8..821e67ae 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -53,7 +53,7 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name)
 	: KSystemTray(parent,name)
 {
 //	kdDebug(14010) << "Creating KopeteSystemTray" << endl;
-	TQToolTip::add( this, kapp->aboutData()->shortDescription() );
+	TQToolTip::add( this, tdeApp->aboutData()->shortDescription() );
 
 	mIsBlinkIcon = false;
 	mIsBlinking = false;
diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp
index 90519ae7..62296dd2 100644
--- a/kopete/libkopete/connectionmanager.cpp
+++ b/kopete/libkopete/connectionmanager.cpp
@@ -24,7 +24,7 @@ ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : D
 {
 	d = new ConnectionManagerPrivate;
 	
-	d->m_stub = new ClientIface_stub( kapp->dcopClient(), "kded", "networkstatus" );
+	d->m_stub = new ClientIface_stub( tdeApp->dcopClient(), "kded", "networkstatus" );
 	
 	connectDCOPSignal( "kded", "networkstatus", "statusChange(TQString,int)", "slotStatusChanged(TQString,int)", false );
 	d->m_userInitiatedOnly = false;
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 05457222..99e7d51c 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -94,8 +94,8 @@ public:
     ignoreTheseWidgets.setAutoDelete(true);
 
     static bool defaultKDEPropertyMapInstalled = false;
-    if ( !defaultKDEPropertyMapInstalled && kapp ) {
-      kapp->installKDEPropertyMap();
+    if ( !defaultKDEPropertyMapInstalled && tdeApp ) {
+      tdeApp->installKDEPropertyMap();
       defaultKDEPropertyMapInstalled = true;
     }
   }
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index 1a835386..282d844f 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -87,7 +87,7 @@ struct KopeteAwayPrivate
 
 Kopete::Away *Kopete::Away::instance = 0L;
 
-Kopete::Away::Away() : TQObject( kapp , "Kopete::Away")
+Kopete::Away::Away() : TQObject( tdeApp , "Kopete::Away")
 {
 	int dummy = 0;
 	dummy = dummy; // shut up
diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp
index 64940963..93fd698c 100644
--- a/kopete/libkopete/kopetechatsessionmanager.cpp
+++ b/kopete/libkopete/kopetechatsessionmanager.cpp
@@ -38,7 +38,7 @@ ChatSessionManager* ChatSessionManager::s_self = 0L;
 ChatSessionManager* ChatSessionManager::self()
 {
 	if( !s_self )
-		s_self = new ChatSessionManager( kapp );
+		s_self = new ChatSessionManager( tdeApp );
 
 	return s_self;
 }
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index af6f626a..afcdfc6c 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -275,7 +275,7 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat
 	if( !args.isEmpty() )
 	{
 		TDEProcess *proc = 0L;
-		if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) )
+		if ( tdeApp->authorize( TQString::fromLatin1( "shell_access" ) ) )
 				proc = new TDEProcess(manager);
 		
 		if( proc )
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 5e919776..67c67ff6 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -80,7 +80,7 @@ ContactList *ContactList::self()
 }
 
 ContactList::ContactList()
-	: TQObject( kapp, "KopeteContactList" )
+	: TQObject( tdeApp, "KopeteContactList" )
 {
 	d=new Private;
 
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 5e5a223d..72b2a268 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -238,7 +238,7 @@ void installEmoticonTheme(const TQString &archiveName)
 	 	i18n("Installing Emoticon Themes..."), TQString(), true);
 	progressDlg->progressBar()->setTotalSteps(foundThemes.count());
 	progressDlg->show();
-	kapp->processEvents();
+	tdeApp->processEvents();
 
 	TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name();
 	if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") )
@@ -296,7 +296,7 @@ void installEmoticonTheme(const TQString &archiveName)
 			i18n("<qt>Installing <strong>%1</strong> emoticon theme</qt>")
 			.arg(*it));
 		progressDlg->resize(progressDlg->sizeHint());
-		kapp->processEvents();
+		tdeApp->processEvents();
 
 		if (progressDlg->wasCancelled())
 			break;
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 9c260c48..22127b51 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -69,7 +69,7 @@ OnlineStatusManager::OnlineStatusManager()
 {
 	d->iconCache.setAutoDelete( true );
 	d->nullPixmap = new TQPixmap;
-	connect( kapp, TQ_SIGNAL( iconChanged(int) ), this, TQ_SLOT( slotIconsChanged() ) );
+	connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), this, TQ_SLOT( slotIconsChanged() ) );
 }
 
 OnlineStatusManager::~OnlineStatusManager()
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index ebfddee3..563ff0dc 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -251,12 +251,12 @@ public:
 	KopetePasswordSetRequest( Kopete::Password &pass, const TQString &newPass )
 	 : KopetePasswordRequest( 0, pass ), mNewPass( newPass )
 	{
-		if ( TDEApplication *app = TDEApplication::kApplication() )
+		if ( TDEApplication *app = tdeApp )
 			app->ref();
 	}
 	~KopetePasswordSetRequest()
 	{
-		if ( TDEApplication *app = TDEApplication::kApplication() )
+		if ( TDEApplication *app = tdeApp )
 			app->deref();
 		kdDebug( 14010 ) << k_funcinfo << "job complete" << endl;
 	}
@@ -315,12 +315,12 @@ public:
 	KopetePasswordClearRequest( Kopete::Password &pass )
 	 : KopetePasswordRequest( 0, pass )
 	{
-		if ( TDEApplication *app = TDEApplication::kApplication() )
+		if ( TDEApplication *app = tdeApp )
 			app->ref();
 	}
 	~KopetePasswordClearRequest()
 	{
-		if ( TDEApplication *app = TDEApplication::kApplication() )
+		if ( TDEApplication *app = tdeApp )
 			app->deref();
 		kdDebug( 14010 ) << k_funcinfo << "job complete" << endl;
 	}
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 22ea8c63..eef7c5e5 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -98,7 +98,7 @@ PluginManager::PluginManager() : TQObject( tqApp ), d( new Private )
 	// 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();
 }
 
 PluginManager::~PluginManager()
@@ -251,7 +251,7 @@ void PluginManager::slotShutdownDone()
 
 	d->shutdownMode = Private::DoneShutdown;
 
-	kapp->deref();
+	tdeApp->deref();
 }
 
 void PluginManager::loadAllPlugins()
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 403a8915..a1f5741f 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -37,7 +37,7 @@ KopetePrefs *KopetePrefs::prefs()
 	return s_prefs;
 }
 
-KopetePrefs::KopetePrefs() : TQObject( kapp, "KopetePrefs" )
+KopetePrefs::KopetePrefs() : TQObject( tdeApp, "KopetePrefs" )
 {
 	config = TDEGlobal::config();
 	load();
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 0684d183..18fc37f7 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -83,7 +83,7 @@ bool isHostReachable(const TQString &host)
 	TQDataStream stream(params, IO_WriteOnly);
 	stream << host;
 
-	if ( TDEApplication::kApplication()->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && (replyType == "int") )
+	if ( tdeApp->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && (replyType == "int") )
 	{
 		int result;
 		TQDataStream stream2( reply, IO_ReadOnly );
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index acaca77c..2073b1df 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -88,7 +88,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession
 			"\"%1\" has a maximum of %n arguments.", m_minArgs)
 			.arg( text() ), manager, gui );
 	}
-	else if( !TDEApplication::kApplication()->authorizeTDEAction( name() ) )
+	else if( !tdeApp->authorizeTDEAction( name() ) )
 	{
 		printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui );
 	}
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index ed0bdf5d..110367ad 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -271,7 +271,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint
 	return result;
 }
 
-Emoticons::Emoticons( const TQString &theme ) : TQObject( kapp, "KopeteEmoticons" )
+Emoticons::Emoticons( const TQString &theme ) : TQObject( tdeApp, "KopeteEmoticons" )
 {
 //	kdDebug(14010) << "KopeteEmoticons::KopeteEmoticons" << endl;
 	d=new Private;
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 3e84fd32..bf050695 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -71,7 +71,7 @@ void KopeteMessage_Test::allTests()
 	// is created. Running the console version doesn't create it, but the GUI
 	// version does.
 
-	if (!kapp)
+	if (!tdeApp)
 		new TDEApplication();
 
 	testPrimitives();
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index c63833e8..cdd0acfd 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -40,7 +40,7 @@ void HistoryPlugin::convertOldHistory()
 		i18n( "Would you like to remove old history files?" ) , i18n( "History Converter" ), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes;
 
 	KProgressDialog *progressDlg=new KProgressDialog(Kopete::UI::Global::mainWidget() , "history_progress_dlg" , i18n( "History converter" ) ,
-		 TQString() , true); //modal  to  make sure the user will not doing stupid things (we have a kapp->processEvents())
+		 TQString() , true); //modal  to  make sure the user will not doing stupid things (we have a tdeApp->processEvents())
 	progressDlg->setAllowCancel(false); //because i am too lazy to allow to cancel
 
 
@@ -123,7 +123,7 @@ void HistoryPlugin::convertOldHistory()
 				if(!contactId.isEmpty() )
 				{
 					progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").arg(fi->fileName()).arg(contactId));
-					kapp->processEvents(0); //make sure the text is updated in the progressDlg
+					tdeApp->processEvents(0); //make sure the text is updated in the progressDlg
 
 					int month=0;
 					int year=0;
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 4842db32..6df41a26 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -596,18 +596,18 @@ void HistoryDialog::slotCopy()
 	qsSelection = mHtmlPart->selectedText();
 	if ( qsSelection.isEmpty() ) return;
 	
-	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard);
 	TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection);
-	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 }
 
 void HistoryDialog::slotCopyURL()
 {
-	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 	TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard);
 	TQApplication::clipboard()->setText( mURL, TQClipboard::Selection);
-	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
+	connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection()));
 }
 
 #include "historydialog.moc"
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 0a0457c2..0b3f5fcc 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -107,7 +107,7 @@ NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, cons
 	  slotNewKMM( *it );
 
 	// get a pointer to the dcop client
-	d->m_client = kapp->dcopClient(); //new DCOPClient();
+	d->m_client = tdeApp->dcopClient(); //new DCOPClient();
 
 	// set up known media players
 	d->m_mediaPlayerList.setAutoDelete( true );
diff --git a/kopete/plugins/smpppdcs/detectordcop.cpp b/kopete/plugins/smpppdcs/detectordcop.cpp
index 931d5e3a..f3e84c96 100644
--- a/kopete/plugins/smpppdcs/detectordcop.cpp
+++ b/kopete/plugins/smpppdcs/detectordcop.cpp
@@ -34,7 +34,7 @@ DetectorDCOP::~DetectorDCOP() {}
     \fn DetectorDCOP::getKInternetDCOP()
  */
 TQCString DetectorDCOP::getKInternetDCOP() const {
-    DCOPClient * client = kapp->dcopClient();
+    DCOPClient * client = tdeApp->dcopClient();
     if(m_kinternetApp.isEmpty() && client && client->isAttached()) {
         // get all registered dcop apps and search for kinternet
         QCStringList apps = client->registeredApplications();
@@ -56,7 +56,7 @@ DetectorDCOP::KInternetDCOPState DetectorDCOP::getConnectionStatusDCOP() const {
     kdDebug(14312) << k_funcinfo << "Start inquiring " << m_kinternetApp << " via DCOP" << endl;
 	
 	
-	KInternetIface_stub stub = KInternetIface_stub(kapp->dcopClient(), m_kinternetApp, "KInternetIface");
+	KInternetIface_stub stub = KInternetIface_stub(tdeApp->dcopClient(), m_kinternetApp, "KInternetIface");
 	
 	bool status = stub.isOnline();
 	
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 009780c8..8e24a08c 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -38,7 +38,7 @@ void DetectorSMPPPD::checkStatus() const {
 
 #ifndef NOKINTERNETDCOP
     m_kinternetApp = getKInternetDCOP();
-    if(kapp->dcopClient() && m_kinternetApp != "") {
+    if(tdeApp->dcopClient() && m_kinternetApp != "") {
         switch(getConnectionStatusDCOP()) {
         case CONNECTED:
             m_connector->setConnectedStatus(true);
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index ca4462e8..4beb20f5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -72,7 +72,7 @@ void SMPPPDCSPrefs::determineCSType() {
 
     // while we search, we'll disable the button
     autoCSTest->setEnabled(false);
-    //kapp->processEvents();
+    //tdeApp->processEvents();
 
     /* broadcast network for a smpppd.
        If one is available set to smpppd method */
@@ -109,7 +109,7 @@ void SMPPPDCSPrefs::scanStarted(uint total) {
 
 void SMPPPDCSPrefs::scanProgress(uint cur) {
     m_scanProgressDlg->progressBar()->setProgress(cur);
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void SMPPPDCSPrefs::cancelScanning() {
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 14489141..4820a0ff 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -346,7 +346,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
 	struct utsname utsBuf;
 	uname (&utsBuf);
 	m_client->setClientName ("Kopete");
-	m_client->setClientVersion ( kapp->aboutData ()->version () );
+	m_client->setClientVersion ( tdeApp->aboutData ()->version () );
 	m_client->setOSName (TQString ("%1 %2").arg (utsBuf.sysname, 1).arg (utsBuf.release, 2));
 
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Connecting to GroupWise server " << server() << ":" << port() << endl;
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index a9336845..d46c147c 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy()
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
 	if ( m_propsWidget->m_propsView->currentItem() )
 	{
-		TQClipboard *cb = kapp->clipboard();
+		TQClipboard *cb = tdeApp->clipboard();
 		cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) );
 	}
 }
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 64c638d9..7d2458cb 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -55,7 +55,7 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete
 	else
 	{
 		// look for a default server and port setting
-		TDEConfig *config = kapp->config();
+		TDEConfig *config = tdeApp->config();
 		config->setGroup("GroupWise Messenger");
 		m_preferencesDialog->m_server->setText( config->readEntry( "DefaultServer" ) );
 		m_preferencesDialog->m_port->setValue( config->readNumEntry( "DefaultPort", 8300 ) );
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 5175865a..f3a10f60 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
 	for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
 		m_engine->addCustomCtcp( it.key(), it.data() );
 
-	TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(kapp->aboutData()->version());
+	TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(tdeApp->aboutData()->version());
 	m_engine->setVersionString( version  );
 
 	TQObject::connect(m_engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)),
@@ -352,7 +352,7 @@ const TQString IRCAccount::defaultPart() const
 {
 	TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart"));
 	if( partMsg.isEmpty() )
-		return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg( kapp->aboutData()->version() );
+		return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg( tdeApp->aboutData()->version() );
 	return partMsg;
 }
 
@@ -360,7 +360,7 @@ const TQString IRCAccount::defaultQuit() const
 {
 	TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit"));
 	if( quitMsg.isEmpty() )
-		return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg(kapp->aboutData()->version());
+		return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg(tdeApp->aboutData()->version());
 	return quitMsg;
 }
 
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 82440bbb..27e64b40 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -44,7 +44,7 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
 {
 	d = new KSSLSocketPrivate;
 	d->kssl = 0;
-	d->dcc = TDEApplication::kApplication()->dcopClient();
+	d->dcc = tdeApp->dcopClient();
 	d->cc = new KSSLCertificateCache;
 	d->cc->reload();
 
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 4117bb3c..7616b925 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -366,13 +366,13 @@ void JabberAccount::connectWithPassword ( const TQString &password )
 		uname (&utsBuf);
 
 		m_jabberClient->setClientName ("Kopete");
-		m_jabberClient->setClientVersion (kapp->aboutData ()->version ());
+		m_jabberClient->setClientVersion (tdeApp->aboutData ()->version ());
 		m_jabberClient->setOSName (TQString ("%1 %2").arg (utsBuf.sysname, 1).arg (utsBuf.release, 2));
 	}
 
 	// Set caps node information
 	m_jabberClient->setCapsNode(KOPETE_CAPS_NODE);
-	m_jabberClient->setCapsVersion(kapp->aboutData()->version());
+	m_jabberClient->setCapsVersion(tdeApp->aboutData()->version());
 	
 	// Set Disco Identity information
 	DiscoItem::Identity identity;
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index c29e6d8c..0ce7b95a 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -275,7 +275,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 
 		sendCommand( "CVR", i18n( "MS Local code, see http://www.microsoft.com/globaldev/reference/oslocversion.mspx", "0x0409" ) +
 			" " + escape( utsBuf.sysname ) + " " + escape( utsBuf.release ) + " " + escape( utsBuf.machine ) + " Kopete " +
-			escape( kapp->aboutData()->version() ) + " Kopete " + m_msnId );
+			escape( tdeApp->aboutData()->version() ) + " Kopete " + m_msnId );
 */
 	}
 	else if ( cmd == "CVR" ) //else if ( cmd == "INF" )
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index e60c01aa..4a77d907 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -481,7 +481,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 
 				TQCString message = TQString( "MIME-Version: 1.0\r\n"
 						"Content-Type: text/x-clientcaps\r\n"
-						"Client-Name: Kopete/"+escape(kapp->aboutData()->version())+"\r\n"
+						"Client-Name: Kopete/"+escape(tdeApp->aboutData()->version())+"\r\n"
 						+JabberID+
 						"\r\n" ).utf8();
 
@@ -699,7 +699,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 	TQString UA;
 	if( config->readBoolEntry("SendClientInfo", true) )
 	{
-		UA="User-Agent: Kopete/"+escape(kapp->aboutData()->version())+"\r\n";
+		UA="User-Agent: Kopete/"+escape(tdeApp->aboutData()->version())+"\r\n";
 	}
 
 	TQString head =
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index 3fb180d2..0eb9fb6c 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -63,7 +63,7 @@ void ChatServiceTask::onGo()
     kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "sending '" << m_message.textArray() << "' to the "
                              << m_room << " room" << endl;
     Buffer* b = new Buffer();
-    b->addDWord( TDEApplication::random() ); //use kapp since it's convenient
+    b->addDWord( TDEApplication::random() ); //use tdeApp since it's convenient
     b->addDWord( TDEApplication::random() );
     b->addWord( 0x0003 ); //this be message channel 3 mateys! arrr!!
     b->addDWord( 0x00010000 ); //TLV 1 - this means it's a public message
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index ec52f682..c04b4c26 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -171,7 +171,7 @@ namespace KPF
     void
   Applet::help()
   {
-    kapp->invokeHelp( TQString(), "kpf" );
+    tdeApp->invokeHelp( TQString(), "kpf" );
   }
 
     void
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index 99e8e1d2..d91e5e4c 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -111,7 +111,7 @@ namespace KPF
   void AppletItem::setBackground()
   {
     TQResizeEvent e(size(), size());
-    kapp->sendEvent(graph_, &e);
+    tdeApp->sendEvent(graph_, &e);
     graph_->update();
   }
 
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index f6d95da5..94eef700 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -196,23 +196,23 @@ namespace KPF
     d->stack->addWidget(d->initWidget,    0);
     d->stack->addWidget(d->configWidget,  1);
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
 
     connect
       (
-       kapp->dcopClient(),
+       tdeApp->dcopClient(),
        TQ_SIGNAL(applicationRegistered(const TQCString &)),
        TQ_SLOT(slotApplicationRegistered(const TQCString &))
       );
 
     connect
       (
-       kapp->dcopClient(),
+       tdeApp->dcopClient(),
        TQ_SIGNAL(applicationRemoved(const TQCString &)),
        TQ_SLOT(slotApplicationUnregistered(const TQCString &))
       );
 
-    d->kpfRunning = kapp->dcopClient()->isApplicationRegistered("kpf");
+    d->kpfRunning = tdeApp->dcopClient()->isApplicationRegistered("kpf");
 
     if (!d->kpfRunning)
     {
@@ -509,7 +509,7 @@ namespace KPF
     d->l_kpfStatus
       ->setText(i18n("kpf applet status: <strong>starting...</strong>"));
 
-    kapp->dcopClient()
+    tdeApp->dcopClient()
       ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
     TQTimer::singleShot(4 * 1000, this, TQ_SLOT(slotStartKPFFailed()));
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 38c6c15a..0da176ff 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -402,7 +402,7 @@ namespace KPF
     void
   ServerWizard::help()
   {
-    kapp->invokeHelp("share-config", "kpf");
+    tdeApp->invokeHelp("share-config", "kpf");
   }
 }
 
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 0ebe0228..9b8c0087 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -75,16 +75,16 @@ namespace KPF
 
     layout->addWidget(about);
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
 
     connect
       (
-       kapp->dcopClient(),
+       tdeApp->dcopClient(),
        TQ_SIGNAL(applicationRegistered(const TQCString &)),
        TQ_SLOT(slotApplicationRegistered(const TQCString &))
       );
 
-    kapp->dcopClient()
+    tdeApp->dcopClient()
       ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
     connect(&d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
@@ -120,7 +120,7 @@ namespace KPF
     bool
   StartingKPFDialog::kpfRunning()
   {
-    return kapp->dcopClient()->isApplicationRegistered("kpf");
+    return tdeApp->dcopClient()->isApplicationRegistered("kpf");
   }
 
     void
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index 92b1b908..90d4a48d 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -248,7 +248,7 @@ namespace KPF
     void
   WebServerManager::quit()
   {
-//    kapp->quit();
+//    tdeApp->quit();
   }
 
     bool
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 13f2ea37..e2721449 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -344,7 +344,7 @@ int AccountWidget::doTab(){
   tabWindow = new KDialogBase( KDialogBase::Tabbed, TQString(),
                                KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
                                0, 0, true);
-  KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(tabWindow->winId(), tdeApp->icon(), tdeApp->miniIcon());
   bool isnewaccount;
 
   if(gpppdata.accname().isEmpty()) {
@@ -427,7 +427,7 @@ TQString AccountWidget::prettyPrintVolume(unsigned int n) {
 //
 /////////////////////////////////////////////////////////////////////////////
 QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
   setCaption(i18n("Reset Accounting"));
 
   TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10);
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index abcc277c..3296326f 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -145,7 +145,7 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
   pausetimer = new TQTimer(this);
   connect(pausetimer, TQ_SIGNAL(timeout()), TQ_SLOT(pause()));
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   timeout_timer = new TQTimer(this);
   connect(timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(script_timed_out()));
@@ -213,23 +213,23 @@ void ConnectWidget::init() {
   TQString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
   setCaption(tit);
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   // signal other applications that we are about to get connected
-  kapp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToConnect()", TQByteArray());
+  tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToConnect()", TQByteArray());
 
   // run the "before-connect" command
   if (!gpppdata.command_before_connect().isEmpty()) {
     messg->setText(i18n("Running pre-startup command..."));
     emit debugMessage(i18n("Running pre-startup command..."));
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     TQApplication::flushX();
     pid_t id = execute_command(gpppdata.command_before_connect());
     int i, status;
 
     do {
-      kapp->processEvents();
+      tdeApp->processEvents();
       i = waitpid(id, &status, WNOHANG);
       usleep(100000);
     } while (i == 0 && errno == 0);
@@ -251,10 +251,10 @@ void ConnectWidget::init() {
 
   if(Modem::modem->opentty()) {
     messg->setText(Modem::modem->modemMessage());
-    kapp->processEvents();
+    tdeApp->processEvents();
     if(Modem::modem->hangup()) {
 
-      kapp->processEvents();
+      tdeApp->processEvents();
 
       semaphore = false;
 
@@ -915,7 +915,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
       // find out PPP interface and notify the stats module
       stats->setUnit(pppInterfaceNumber());
 
-      kapp->flushX();
+      tdeApp->flushX();
       semaphore = true;
       result = execppp();
 
@@ -940,7 +940,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
 	messg->setText("");
 	p_kppp->quit_b->setFocus();
 	p_kppp->show();
-	kapp->processEvents();
+	tdeApp->processEvents();
 	Modem::modem->hangup();
 	emit stopAccounting();
 	p_kppp->con_win->stopClock();
@@ -1065,7 +1065,7 @@ void ConnectWidget::cancelbutton() {
   Requester::rq->removeSecret(AUTH_CHAP);
   removedns();
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   Requester::rq->killPPPDaemon();
   Modem::modem->hangup();
@@ -1086,7 +1086,7 @@ void ConnectWidget::cancelbutton() {
   prompt->setConsumed();
 
   if(p_kppp->quitOnDisconnect())
-    kapp->exit(0);
+    tdeApp->exit(0);
 }
 
 
@@ -1192,13 +1192,13 @@ void ConnectWidget::if_waiting_slot() {
   auto_hostname();
 
   // signal other applications that we are connected now
-  kapp->dcopClient()->emitDCOPSignal("KpppIface", "connected()", TQByteArray());
+  tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "connected()", TQByteArray());
 
   if(!gpppdata.command_on_connect().isEmpty()) {
     messg->setText(i18n("Running startup command..."));
 
     // make sure that we don't get any async errors
-    kapp->flushX();
+    tdeApp->flushX();
     execute_command(gpppdata.command_on_connect());
     messg->setText(i18n("Done"));
   }
@@ -1344,7 +1344,7 @@ bool ConnectWidget::execppp() {
     return false; // nonsensically long command which would bust my buffer buf.
   }
 
-  kapp->flushX();
+  tdeApp->flushX();
 
   return Requester::rq->execPPPDaemon(command);
 }
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index b4537617..c4634c9b 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -1202,7 +1202,7 @@ void ScriptWidget::removeButton() {
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Add Phone Number"), Ok|Cancel) {
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   TQHBox *hbox = new TQHBox(this);
   setMainWidget(hbox);
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index a6dfae00..dafde781 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -237,17 +237,17 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 
   stats = new PPPStats;
 
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   // constructor of con_win reads position from config file
   con_win = new ConWindow(0, "conw", this, stats);
-  KWin::setIcons(con_win->winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(con_win->winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   statdlg = new PPPStatsDlg(0, "stats", this, stats);
   statdlg->hide();
 
   debugwindow = new DebugWidget(0,"debugwindow");
-  KWin::setIcons(debugwindow->winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(debugwindow->winId(), tdeApp->icon(), tdeApp->miniIcon());
   debugwindow->hide();
 
   // load up the accounts combo box
@@ -255,7 +255,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   resetaccounts();
   resetmodems();
   con = new ConnectWidget(0, "con", stats);
-  KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons(con->winId(), tdeApp->icon(), tdeApp->miniIcon() );
   connect(this, TQ_SIGNAL(begin_connect()),con, TQ_SLOT(preinit()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(topLevelWidget());
@@ -274,9 +274,9 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 	  this, TQ_SLOT(startAccounting()));
   connect(con, TQ_SIGNAL(stopAccounting()),
 	  this, TQ_SLOT(stopAccounting()));
-  connect(TDEApplication::kApplication(), TQ_SIGNAL(saveYourself()),
+  connect(tdeApp, TQ_SIGNAL(saveYourself()),
 	  this, TQ_SLOT(saveMyself()));
-  connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()),
+  connect(tdeApp, TQ_SIGNAL(shutDown()),
 	  this, TQ_SLOT(shutDown()));
 
   debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55,
@@ -334,10 +334,10 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 #endif
 
   // attach to the DCOP server, if possible
-  if (!kapp->dcopClient()->attach())
+  if (!tdeApp->dcopClient()->attach())
     kdDebug(5002) << "Error: Could not connect to the DCOP server" << endl;
   else
-    kapp->dcopClient()->registerAs(kapp->name(), true);
+    tdeApp->dcopClient()->registerAs(tdeApp->name(), true);
 
   // this timer will delay the actual disconnection DISCONNECTION_DELAY ms
   // to give applications time to shutdown, logout, whatever..
@@ -383,10 +383,10 @@ void KPPPWidget::prepareSetupDialog() {
   if(tabWindow == 0) {
     tabWindow = new KDialogBase( KDialogBase::Tabbed, i18n("KPPP Configuration"),
                                  KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
-                                 kapp->mainWidget(), 0, true);
+                                 tdeApp->mainWidget(), 0, true);
 
 
-    KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(tabWindow->winId(), tdeApp->icon(), tdeApp->miniIcon());
 
     //    tabWindow->setFixedSize( 365, 375 );
 
@@ -580,7 +580,7 @@ void KPPPWidget::sigPPPDDied() {
       // stop the disconnect timer (just in case)
       disconnectTimer->stop();
       // signal other applications that we are disconnected now
-      kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
+      tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
 
       kdDebug(5002) << "Executing command on disconnect since pppd has died." << endl;
       TQApplication::flushX();
@@ -797,7 +797,7 @@ void KPPPWidget::disconnect() {
   if (disconnectTimer->isActive()) return; // you had already pressed disconnect before
 
   // signal other applications that we are about to go offline now
-  kapp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToDisconnect()", TQByteArray());
+  tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToDisconnect()", TQByteArray());
   con_win->hide();
   con->show();
   con->disableButtons(); // will reenable them later in delayedDisconnect()
@@ -806,13 +806,13 @@ void KPPPWidget::disconnect() {
   if (!gpppdata.command_before_disconnect().isEmpty()) {
     con->setMsg(i18n("Executing command before disconnection."));
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     TQApplication::flushX();
     pid_t id = execute_command(gpppdata.command_before_disconnect());
     int i, status;
 
     do {
-      kapp->processEvents();
+      tdeApp->processEvents();
       i = waitpid(id, &status, WNOHANG);
       usleep(500000);
     } while (i == 0 && errno == 0);
@@ -821,7 +821,7 @@ void KPPPWidget::disconnect() {
   con->setMsg(i18n("Announcing disconnection."));
 
   // this is no longer necessary since I'm delaying disconnection usign a TQTimer
-  //  kapp->processEvents();
+  //  tdeApp->processEvents();
 
   // set the timer to call delayedDisconnect() in DISCONNECT_DELAY ms
   disconnectTimer->start(DISCONNECT_DELAY, true);
@@ -835,7 +835,7 @@ void KPPPWidget::delayedDisconnect() {
   Requester::rq->killPPPDaemon();
 
   // signal other applications that we are disconnected now
-  kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
+  tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
 
   TQApplication::flushX();
   execute_command(gpppdata.command_on_disconnect());
@@ -854,7 +854,7 @@ void KPPPWidget::delayedDisconnect() {
   DockWidget::dock_widget->hide();
 
   if(m_bQuitOnDisconnect)
-    kapp->exit(0);
+    tdeApp->exit(0);
   else {
     quit_b->setFocus();
     show();
@@ -863,7 +863,7 @@ void KPPPWidget::delayedDisconnect() {
 
 
 void KPPPWidget::helpbutton() {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 
@@ -879,7 +879,7 @@ void KPPPWidget::quitbutton() {
       disconnectTimer->stop();
 
       // signal other applications that we are disconnected now
-      kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
+      tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray());
 
       TQApplication::flushX();
       execute_command(gpppdata.command_on_disconnect());
@@ -891,7 +891,7 @@ void KPPPWidget::quitbutton() {
       gpppdata.setStoredPassword("");
   }
   gpppdata.save();
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
diff --git a/kppp/logview/log.cpp b/kppp/logview/log.cpp
index 61009d7b..fe29180f 100644
--- a/kppp/logview/log.cpp
+++ b/kppp/logview/log.cpp
@@ -92,7 +92,7 @@ int loadLog(TQString fname) {
       continue;
     
     dlg->setProgress(dlg->progress() + slen);
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     LogInfo *li = new LogInfo(buffer);    
     if(li->error()) {
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index b4591e0c..986d00f0 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -83,7 +83,7 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") {
     lh->addWidget(but);
 
     connect(but, TQ_SIGNAL(clicked()),
-	    kapp, TQ_SLOT(quit()));
+	    tdeApp, TQ_SLOT(quit()));
   }
 
   setMinimumSize(mw->sizeHint().width() + 15,
diff --git a/kppp/main.cpp b/kppp/main.cpp
index 4d18b76b..46d068aa 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -233,7 +233,7 @@ int main( int argc, char **argv ) {
   // make sure that nobody can read the password from the
   // config file
   TQString configFile = TDEGlobal::dirs()->saveLocation("config")
-    + TQString(kapp->name()) + "rc";
+    + TQString(tdeApp->name()) + "rc";
   if(access(TQFile::encodeName(configFile), F_OK) == 0)
     chmod(TQFile::encodeName(configFile), S_IRUSR | S_IWUSR);
 
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index e65f812e..efabab70 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -51,7 +51,7 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name)
   : TQDialog(parent, name, true)
 {
   setCaption(i18n("Kppp Mini-Terminal"));
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   m_file = new TQPopupMenu(this);
   m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(cancelbutton()) );
@@ -123,7 +123,7 @@ void MiniTerm::setupToolbar() {
 void MiniTerm::init() {
   inittimer->stop();
   statusbar->setText(i18n("Initializing Modem"));
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   int lock = Modem::modem->lockdevice();
   if (lock == 1) {
@@ -151,8 +151,8 @@ void MiniTerm::init() {
       statusbar->setText(i18n("Modem Ready"));
       terminal->setFocus();
 
-      kapp->processEvents();
-      kapp->processEvents();
+      tdeApp->processEvents();
+      tdeApp->processEvents();
 
       Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char)));
       return;
@@ -190,7 +190,7 @@ void MiniTerm::cancelbutton() {
   Modem::modem->stop();
 
   statusbar->setText(i18n("Hanging up..."));
-  kapp->processEvents();
+  tdeApp->processEvents();
   TDEApplication::flushX();
 
   Modem::modem->hangup();
@@ -205,7 +205,7 @@ void MiniTerm::cancelbutton() {
 void MiniTerm::resetModem() {
   statusbar->setText(i18n("Resetting Modem"));
   terminal->newLine();
-  kapp->processEvents();
+  tdeApp->processEvents();
   TDEApplication::flushX();
 
   Modem::modem->hangup();
@@ -221,7 +221,7 @@ void MiniTerm::closeEvent( TQCloseEvent *e ) {
 
 
 void MiniTerm::help() {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 0a68996a..a140d368 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -48,7 +48,7 @@
 ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   : KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel)
 {
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
   TQWidget *dummyWidget = new TQWidget(this);
   setMainWidget(dummyWidget);
 
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index 7053f2e9..331d2ea8 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -39,7 +39,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
   : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder)
 {
   setCaption(i18n("ATI Query"));
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10);
 
@@ -121,7 +121,7 @@ void ModemTransfer::time_out_slot() {
 
 void ModemTransfer::init() {
 
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   int lock = Modem::modem->lockdevice();
   if (lock == 1) {
@@ -143,9 +143,9 @@ void ModemTransfer::init() {
       Modem::modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ...
 
       statusBar->setText(i18n("Modem Ready"));
-      kapp->processEvents();
+      tdeApp->processEvents();
       usleep(100000);  // wait 0.1 secs
-      kapp->processEvents();
+      tdeApp->processEvents();
       scripttimer->start(1000);	 	// this one does the ati query
 
       // clear modem buffer
@@ -224,7 +224,7 @@ void ModemTransfer::cancelbutton() {
   timeout_timer->stop();
 
   statusBar->setText(i18n("One moment please..."));
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   Modem::modem->hangup();
 
@@ -246,7 +246,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name)
   TQString label_text;
 
   setCaption(i18n("Modem Query Results"));
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10);
 
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 9ceab292..b3e7f5bf 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -210,7 +210,7 @@ int ModemsWidget::doTab(){
   tabWindow = new KDialogBase( KDialogBase::Tabbed, TQString(),
                                KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
                                0, 0, true);
-  KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(tabWindow->winId(), tdeApp->icon(), tdeApp->miniIcon());
   bool isnewmodem;
 
   if(gpppdata.modname().isEmpty()) {
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 2bbc1e62..758b25c0 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -44,7 +44,7 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name)
   : TQDialog(parent, name, TRUE)
 {
   setCaption(i18n("Customize pppd Arguments"));
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
   TQVBoxLayout *l = new TQVBoxLayout(this, 10, 10);
   TQHBoxLayout *tl = new TQHBoxLayout(10);
   l->addLayout(tl);
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 5f2b3cd0..4b24284f 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -56,7 +56,7 @@ PPPData::PPPData()
 //
 bool PPPData::open() {
 
-  config = kapp->config();
+  config = tdeApp->config();
 
   if (config->getConfigState() == TDEConfig::NoAccess) {
     KMessageBox::error(0L,
@@ -65,7 +65,7 @@ bool PPPData::open() {
                        "The superuser might have to change its ownership "
                        "by issuing the following command in your home directory:\n"
                        "chown {YourUsername} .trinity/share/config/kppprc"),
-			 kapp->name());
+			 tdeApp->name());
     return false;
   }
 
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index f70b379d..5bac3808 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -53,7 +53,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   max = 1024;
 
   setCaption(i18n("kppp Statistics"));
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   TQVBoxLayout *tl = new TQVBoxLayout(this, 10);
   TQGridLayout *l1 = new TQGridLayout(4, 4);
diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp
index f2b6a384..b6ec942f 100644
--- a/krdc/hostpreferences.cpp
+++ b/krdc/hostpreferences.cpp
@@ -66,7 +66,7 @@ TQString HostPref::prefix(const TQString &host, const TQString &type) {
 
 
 HostPreferences::HostPreferences() {
-	m_config = kapp->config();
+	m_config = tdeApp->config();
 }
 
 HostPreferences::~HostPreferences() {
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 1e86891d..b50cde3d 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -187,7 +187,7 @@ bool KRDC::start()
 			break;
 	}
 
-	m_view->setViewOnly(kapp->config()->readBoolEntry("viewOnly", false));
+	m_view->setViewOnly(tdeApp->config()->readBoolEntry("viewOnly", false));
 
 	m_scrollView->addChild(m_view);
 	TQWhatsThis::add(m_view, i18n("Here you can see the remote desktop. If the other side allows you to control it, you can also move the mouse, click or enter keystrokes. If the content does not fit your screen, click on the toolbar's full screen button or scale button. To end the connection, just close the window."));
diff --git a/krdc/main.cpp b/krdc/main.cpp
index 11106084..b1d31ac1 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 	TQString keymap = TQString();
 	WindowMode wm = WINDOW_MODE_AUTO;
 	bool scale = false;
-	bool localCursor = kapp->config()->readBoolEntry("alwaysShowLocalCursor", false);
+	bool localCursor = tdeApp->config()->readBoolEntry("alwaysShowLocalCursor", false);
 	TQSize initialWindowSize;
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp
index 11546308..c593c51d 100644
--- a/krdc/maindialog.cpp
+++ b/krdc/maindialog.cpp
@@ -52,7 +52,7 @@ TQString MainDialog::remoteHost()
 
 void MainDialog::slotHelp()
 {
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }
 
 void MainDialog::slotUser1()
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 88219776..bff72382 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -818,9 +818,9 @@ extern int isQuitFlagSet() {
 }
 
 extern void DrawScreenRegion(int x, int y, int width, int height) {
-/*	TDEApplication::kApplication()->lock();
+/*	tdeApp->lock();
 	kvncview->drawRegion(x, y, width, height);
-	TDEApplication::kApplication()->unlock();
+	tdeApp->unlock();
 */
 	TQApplication::postEvent(kvncview, new ScreenRepaintEvent(x, y, width, height));
 }
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 806b18df..aa3067ad 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -153,7 +153,7 @@ void KcmKRfb::save() {
 		m_configuration.setPreferredPort(m_confWidget->portInput->value());
 	m_configuration.setDisableBackground(m_confWidget->disableBackgroundCB->isChecked());
 	m_configuration.save();
-	kapp->dcopClient()->emitDCOPSignal("KRFB::ConfigChanged", "KRFB_ConfigChanged()", TQByteArray());
+	tdeApp->dcopClient()->emitDCOPSignal("KRFB::ConfigChanged", "KRFB_ConfigChanged()", TQByteArray());
 	emit changed(false);
 }
 
diff --git a/krfb/krfb/configuration.cpp b/krfb/krfb/configuration.cpp
index 82c796ba..aa42f5dc 100644
--- a/krfb/krfb/configuration.cpp
+++ b/krfb/krfb/configuration.cpp
@@ -438,7 +438,7 @@ void Configuration::inviteEmail() {
 	save();
 	emit invitationNumChanged(invitationList.size());
 
-	TDEApplication *app = TDEApplication::kApplication();
+	TDEApplication *app = tdeApp;
 	app->invokeMailer(TQString(), TQString(), TQString(),
 		i18n("Desktop Sharing (VNC) invitation"),
 		i18n("You have been invited to a VNC session. If you have the TDE Remote "
diff --git a/krfb/krfb/rfbcontroller.cpp b/krfb/krfb/rfbcontroller.cpp
index 45f2d435..9119aad7 100644
--- a/krfb/krfb/rfbcontroller.cpp
+++ b/krfb/krfb/rfbcontroller.cpp
@@ -118,11 +118,11 @@ class AppLocker
 {
 public:
 	AppLocker() {
-		TDEApplication::kApplication()->lock();
+		tdeApp->lock();
 	}
 
 	~AppLocker() {
-		TDEApplication::kApplication()->unlock();
+		tdeApp->unlock();
 	}
 };
 
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 44d9d338..01778d5e 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -77,7 +77,7 @@ void FilterRuleEditor::newRule()
 void FilterRuleEditor::OkPressed()
 {
   int number, after;
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
 
   if(filter->InsertButton->isEnabled()){
     number = kConfig->readNumEntry("Rules", 0) + 1;
@@ -120,7 +120,7 @@ void FilterRuleEditor::OkPressed()
 
 void FilterRuleEditor::updateListBox(int citem )
 {
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   int number = kConfig->readNumEntry("Rules", 0);
   filter->RuleList->clear();
@@ -142,7 +142,7 @@ void FilterRuleEditor::updateListBox(int citem )
 
 void FilterRuleEditor::moveRule(int from, int to)
 {
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   TQString src;
   TQString dest;
@@ -169,7 +169,7 @@ void FilterRuleEditor::deleteRule()
   int number = filter->RuleList->currentItem();
 
   if( number >= 0){
-    TDEConfig *kConfig = kapp->config();
+    TDEConfig *kConfig = tdeApp->config();
     kConfig->setGroup("FilterRules");
     int max = kConfig->readNumEntry("Rules");
     for(int i = number+2; i <= max; i++){
@@ -185,7 +185,7 @@ void FilterRuleEditor::deleteRule()
 void FilterRuleEditor::newHighlight(int i)
 {
   i++;
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   TQString key;
   key.sprintf("name-%d", i);
@@ -201,7 +201,7 @@ void FilterRuleEditor::newHighlight(int i)
 void FilterRuleEditor::raiseRule()
 {
   int item = filter->RuleList->currentItem();
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   int max = kConfig->readNumEntry("Rules");
   if(item > 0){
@@ -215,7 +215,7 @@ void FilterRuleEditor::raiseRule()
 void FilterRuleEditor::lowerRule()
 {
   int item = filter->RuleList->currentItem();
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   int max = kConfig->readNumEntry("Rules");
   if(item < max-1){
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 7a7cee21..6cf24358 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -63,7 +63,7 @@ open_ksirc::open_ksirc
   }
 
   // Add current ones
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup("ServerList");
   CheckB_StorePassword->setChecked( conf->readBoolEntry("StorePasswords") );
   TQStringList recent = conf->readListEntry("RecentServers");
@@ -230,7 +230,7 @@ TQString open_ksirc::encryptPassword( const TQString &password )
   // Can contain NULL bytes after XORing
   unsigned int utf8Length(utf8.length());
   TQByteArray result(utf8Length << 1);
-  memcpy(result.data(), kapp->randomString(utf8Length).latin1(), utf8Length);
+  memcpy(result.data(), tdeApp->randomString(utf8Length).latin1(), utf8Length);
   for (unsigned int i = 0; i < utf8Length; ++i)
     result[i + utf8Length] = utf8[i] ^ result[i];
   return TQString::fromLatin1(KCodecs::base64Encode(result));
@@ -276,7 +276,7 @@ void open_ksirc::clickConnect()
   TQString port;
   TQString script;
   Server *serv;
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
 
   hide();
 
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 8ce6311d..c5761d59 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -43,7 +43,7 @@ PageAutoConnect::~PageAutoConnect()
 void PageAutoConnect::saveConfig()
 {
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("AutoConnect");
 
     TQStringList servers;
@@ -92,7 +92,7 @@ void PageAutoConnect::saveConfig()
 
 void PageAutoConnect::readConfig()
 {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("AutoConnect");
     TQStringList servers = conf->readListEntry("Servers");
     servers.sort();
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index 31d22044..afe40f69 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -87,7 +87,7 @@ void PageColors::saveConfig()
     ksopts->mircColors = allowMIRCColorsCB->isChecked();
     ksopts->colourTheme = themeLB->currentText();
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     TQDictIterator<KSOColors> it(m_dcol);
     TQStringList names;
     for(; it.current(); ++it){
@@ -158,7 +158,7 @@ void PageColors::readConfig( const KSOColors *opts )
     allowKSircColorsCB->setChecked( opts->ksircColors );
     allowMIRCColorsCB->setChecked( opts->mircColors );
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("ColourSchemes");
     themeLB->clear();
     TQStringList names = conf->readListEntry("Names");
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index fc9e73e6..74a6c7d2 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -37,7 +37,7 @@ void PageServChan::saveConfig()
         if(!txt.isNull())
             sLB << txt;
     }
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("ServerList");
     conf->writeEntry("RecentServers", sLB);
 
@@ -53,7 +53,7 @@ void PageServChan::saveConfig()
 
 void PageServChan::readConfig( const KSOServChan * )
 {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("ServerList");
     TQStringList recent = conf->readListEntry("RecentServers");
     recent.sort();
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 5fe687e2..e531836a 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -30,7 +30,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
   pic = new TQPixmap(); // create pic map here, resize it later though.
   //  pic->setBackgroundMode(TransparentMode);
 
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup("KSTicker");
   bScrollConstantly = conf->readNumEntry("ScollConst", FALSE);
 
@@ -445,7 +445,7 @@ void KSTicker::scrollConstantly()
   popup->setItemChecked(iScrollItem, bScrollConstantly);
   if(bScrollConstantly == TRUE)
     startTicker();
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup("KSTicker");
   conf->writeEntry("ScollConst", bScrollConstantly);
   conf->sync();
@@ -456,7 +456,7 @@ void KSTicker::updateFont(const TQFont &font){
   setFixedHeight((fontMetrics().height()+fontMetrics().descent()*2)*pHeight);
   resize(fontMetrics().width("X")*chars,
          (fontMetrics().height()+fontMetrics().descent())*pHeight);
-  TDEConfig *conf = kapp->config();
+  TDEConfig *conf = tdeApp->config();
   conf->setGroup("KSTicker");
   conf->writeEntry("Font", font);
   conf->sync();
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index de243be6..ba4fcc20 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -35,7 +35,7 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par
   connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )),
 	   this, TQ_SLOT( slotTextChanged( const TQString &)));
 
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   TDEConfigGroupSaver saver(kConfig, "Recent");
   m_combo->setHistoryItems(kConfig->readListEntry("Channels"));
   slotTextChanged( m_combo->lineEdit()->text());
@@ -43,7 +43,7 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par
 
 NewWindowDialog::~NewWindowDialog()
 {
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   TDEConfigGroupSaver saver(kConfig, "Recent");
   kConfig->writeEntry("Channels", m_combo->historyItems());
 }
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 03aa40f0..c2e8bb1c 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -31,7 +31,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
     : dccNewBase( parent, name)
 {
 
-    TQColorGroup cg_mainw = kapp->palette().active();
+    TQColorGroup cg_mainw = tdeApp->palette().active();
     cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor);
     cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor);
     cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor);
@@ -69,7 +69,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
     }
     cbNicks->setCurrentText(nick);
 
-    TDEConfig *kConfig = kapp->config();
+    TDEConfig *kConfig = tdeApp->config();
     kConfig->setGroup("dccNew");
 
     bool chatChecked = kConfig->readBoolEntry("chatChecked", false);
@@ -123,7 +123,7 @@ void dccNew::fileSendClicked()
 
 void dccNew::sendClicked()
 {
-    TDEConfig *kConfig = kapp->config();
+    TDEConfig *kConfig = tdeApp->config();
     kConfig->setGroup("dccNew");
     kConfig->writeEntry("chatChecked",rbChat->isChecked());
     int type = Chat;
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index ae2c45bf..9383cf5f 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -178,12 +178,12 @@ void DisplayMgrMDI::reparentReq()
 {
     kdDebug(5008) << "got reparent" << endl;
 
-    TQWidget *o = kapp->focusWidget();
+    TQWidget *o = tdeApp->focusWidget();
     TQWidget *s;
 
     if(o == NULL){
         kdDebug(5008) << "Kapp says no widget has focus!" << endl;
-        o = kapp->activeWindow();
+        o = tdeApp->activeWindow();
 
         if(o->inherits("TDEMainWindow") == false)
             return;
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 9429093a..53e85d39 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -141,7 +141,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa
 
   // Setup the environment for KSirc
   TQString qsNick, qsRealname, qsUserID, qsAltNick;
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("StartUp");
   qsNick = ksopts->serv(kss).nick;
   qsAltNick = ksopts->serv(kss).altNick;
@@ -583,7 +583,7 @@ void KSircProcess::filters_update()
       cur = it.current();
     }
   }
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("FilterRules");
   int max = kConfig->readNumEntry("Rules", 0);
   for(int number = 1; number <= max; number++){
diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index 75da1bcb..39a364c2 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -89,9 +89,9 @@ KSOColors::KSOColors()
     msg1Regex = false;
     msg2Regex = false;
 
-    backgroundColor = kapp->palette().color( TQPalette::Active, TQColorGroup::Mid );
-    selBackgroundColor = kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight );
-    selForegroundColor = kapp->palette().color( TQPalette::Active, TQColorGroup::HighlightedText );
+    backgroundColor = tdeApp->palette().color( TQPalette::Active, TQColorGroup::Mid );
+    selBackgroundColor = tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight );
+    selForegroundColor = tdeApp->palette().color( TQPalette::Active, TQColorGroup::HighlightedText );
 
     ircColors[0] = TQt::white;
     ircColors[1] = TQt::black;
@@ -140,7 +140,7 @@ KSOChannel::KSOChannel()
 
 void KSOptions::load( int sections )
 {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup( "ServerController" );
     geometry = conf->readRectEntry( "Size" );
 
@@ -240,7 +240,7 @@ void KSOptions::load( int sections )
 	    }
         }
 	conf->setGroup( "GlobalOptions" );
-        TQFont df = kapp->font((TQWidget*)0);
+        TQFont df = tdeApp->font((TQWidget*)0);
         defaultFont = conf->readFontEntry( "MainFont", &df);
         TQApplication::setFont( defaultFont, true, "KSirc::TextView" );
     }
@@ -355,7 +355,7 @@ void KSOptions::load( int sections )
 
 void KSOptions::save( int sections )
 {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
 
     if ( sections & General )
     {
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 85bb62cb..b6062b25 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -62,7 +62,7 @@ TQPixmap ksTextViewLoadPixmap( const TQString &icon )
     {
         TQImage img;
 
-        const TQMimeSource *src = kapp->mimeSourceFactory()->data( icon, TQString() );
+        const TQMimeSource *src = tdeApp->mimeSourceFactory()->data( icon, TQString() );
         if ( !src || !TQImageDrag::decode( src, img ) || img.isNull() )
             return TQPixmap();
 
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index 3576b554..4e5b0a06 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -45,7 +45,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
     connect( m_tab, TQ_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ),
              this, TQ_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) );
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("MDI");
     TQSize s( 600, 360 );
     resize(config->readSizeEntry( "TopLevelSize", &s ));
@@ -62,7 +62,7 @@ MDITopLevel::~MDITopLevel()
 {
   kdDebug(5008) << "~MDITopLevel in" << endl;
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup( "MDI" );
     config->writeEntry( "TopLevelSize", this->size() );
     config->sync();
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 67736f44..c5aad1f7 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -125,7 +125,7 @@ servercontroller::servercontroller( TQWidget*, const char* name )
   m_ncm = new nickColourMaker();
 
   MenuBar = menuBar();
-  KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+  KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
 
   s_self = this;
 
@@ -179,7 +179,7 @@ servercontroller::servercontroller( TQWidget*, const char* name )
 
   MenuBar->insertItem(i18n("&Settings"), options);
 
-  KHelpMenu *help = new KHelpMenu( this, kapp->aboutData() );
+  KHelpMenu *help = new KHelpMenu( this, tdeApp->aboutData() );
   MenuBar->insertItem( KStdGuiItem::help().text(), help->menu() );
 
   m_kga = new TDEGlobalAccel(this, "globalAccess");
@@ -383,7 +383,7 @@ void servercontroller::font_update(const TQFont &font)
   ksopts->defaultFont = font;
 /*  configChange(); */
 
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("GlobalOptions");
   kConfig->sync();
   TQApplication::setFont( font, true, "KSirc::TextView" );
@@ -739,14 +739,14 @@ void servercontroller::saveDockingStatus()
     if ( we_are_exiting ) // we are hidden by closeEvent
 	return;
 
-//    TDEConfig *kConfig = kapp->config();
+//    TDEConfig *kConfig = tdeApp->config();
 //    TDEConfigGroupSaver s( kConfig, "ServerController" );
 //    kConfig->writeEntry("Docked", !isVisible());
 //    kConfig->sync();
 }
 
 void servercontroller::endksirc(){
-    kapp->config()->sync();
+    tdeApp->config()->sync();
     exit(0);
 }
 
@@ -838,7 +838,7 @@ void servercontroller::do_autoconnect()
 
     kdDebug(5008) << "Doing AUTOCONNECT" << endl;
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("AutoConnect");
     TQStringList servers = conf->readListEntry("Servers");
     servers.sort();
@@ -923,7 +923,7 @@ void servercontroller::start_autoconnect() {
 
 void servercontroller::start_autoconnect_check() {
 
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup("AutoConnect");
     TQStringList servers = conf->readListEntry("Servers");
 
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index d1fbb2ef..427c9364 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -85,7 +85,7 @@ TQStringList KSircTopLevel::cmd_menu;
 void
 KSircTopLevel::initColors()
 {
-  TQColorGroup cg_mainw = kapp->palette().active();
+  TQColorGroup cg_mainw = tdeApp->palette().active();
   cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor);
   cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor);
   cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor);
@@ -116,7 +116,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
     // prevent us from being quitted when closing a channel-window. Only
     // closing the servercontroller shall quit.
     // TDEMainWindow will deref() us in closeEvent
-    kapp->ref();
+    tdeApp->ref();
 
 
   m_topic = TQString();
@@ -403,7 +403,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
    * This should use on of the KDE finder commands
    */
 
-  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+  KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
 
   /*
    * Create our basic parser object
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index 1387932d..5fd31e1f 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -30,7 +30,7 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig()
 
   UserMenu.clear();
 
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("UserMenu");
   int items = kConfig->readNumEntry("Number");
   if(items == 0){
@@ -131,7 +131,7 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig()
 
 void UserControlMenu::writeTDEConfig()
 {
-  TDEConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = tdeApp->config();
   kConfig->setGroup("UserMenu");
 
   int items = (int) UserMenu.count();
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index a4904638..04205785 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -161,7 +161,7 @@ int main (int argc, char **argv)
 	 * 	That's why it's bad to use system()
 	 */
         system (TQFile::encodeName(cmd));
-        kapp->quit();
+        tdeApp->quit();
     }
 
     return 0;
diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp
index f84dc03d..94856aab 100644
--- a/librss/testlibrss.cpp
+++ b/librss/testlibrss.cpp
@@ -23,7 +23,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/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index 9b0ad947..1bde468f 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -313,7 +313,7 @@ void ZeroConfProtocol::listDir(const KURL& url )
 	}
 	connect(browser,TQ_SIGNAL(finished()),this,TQ_SLOT(allReported()));
 	browser->startBrowse();
-	kapp->eventLoop()->enterLoop();
+	tdeApp->eventLoop()->enterLoop();
 }
 void ZeroConfProtocol::allReported()
 {
@@ -323,7 +323,7 @@ void ZeroConfProtocol::allReported()
 	delete browser;
 	browser=0;
 	mergedtypes.clear();
-	kapp->eventLoop()->exitLoop();
+	tdeApp->eventLoop()->exitLoop();
 }
 void ZeroConfProtocol::newType(DNSSD::RemoteService::Ptr srv)
 {
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index de4f7ee4..63426515 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -74,7 +74,7 @@ DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown
   init_whois_db ();
 
   TQStringList *ignoreInterfaces;
-  if (kapp->isRestored())
+  if (tdeApp->isRestored())
   	ignoreInterfaces = new TQStringList();
   else
 	ignoreInterfaces = new TQStringList( usedInterfacesList() );
@@ -83,7 +83,7 @@ DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown
   device = new Interface_wireless_wirelessextensions (ignoreInterfaces);
 
    //This setting gets here from the kdeglobals config
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   if (config->hasGroup("System Tray"))
       config->setGroup("System Tray");
   m_iconSize=config->readNumEntry("systrayIconWidth", 22);
@@ -113,7 +113,7 @@ DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown
   slotToggleTric(); //set to value saved by TDEConfig
 
   setAutoSaveSettings();
-  kapp->setMainWidget(this);
+  tdeApp->setMainWidget(this);
 }
 
 
@@ -301,7 +301,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
 void
 KWiFiManagerApp::initActions ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   if (config->hasGroup("General"))
 	config->setGroup("General");
   fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, this,
@@ -402,7 +402,7 @@ KWiFiManagerApp::initView ()
 void
 KWiFiManagerApp::slotToggleShowStrengthNumber ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("General");
   config->writeEntry( "showStrengthNumberInTray", settingsShowStrengthNumber->isChecked() );
   if (settingsShowStrengthNumber->isChecked()) { showStrength = true; }
@@ -488,7 +488,7 @@ KWiFiManagerApp::slotDisablePowerProcessExited()
 void
 KWiFiManagerApp::slotToggleTric ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("General");
   config->writeEntry( "acousticScanning", settingsAcousticScanning->isChecked() );
   if (settingsAcousticScanning->isChecked())
@@ -503,7 +503,7 @@ KWiFiManagerApp::slotToggleTric ()
 
 void KWiFiManagerApp::slotToggleStrengthCalc ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("General");
   config->writeEntry( "useAlternateStrengthCalculation", settingsUseAlternateCalc->isChecked() );
   useAlternateStrengthCalc = settingsUseAlternateCalc->isChecked();
@@ -511,7 +511,7 @@ void KWiFiManagerApp::slotToggleStrengthCalc ()
 
 void KWiFiManagerApp::slotToggleStayInSystray ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("General");
   config->writeEntry( "stayInSystrayOnClose", settingsStayInSystrayOnClose->isChecked() );
 }
@@ -541,7 +541,7 @@ KWiFiManagerApp::tricorder_beep ()
 void
 KWiFiManagerApp::slotShowStatsNoise ()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup("General");
   config->writeEntry( "showStatsNoise", settingsShowStatsNoise->isChecked() );
   showStatsNoise = settingsShowStatsNoise->isChecked();
@@ -551,7 +551,7 @@ void
 KWiFiManagerApp::slotFileQuit ()
 {
   m_shuttingDown = true;
-  kapp->quit();
+  tdeApp->quit();
 }
 
 void
@@ -587,7 +587,7 @@ bool
 KWiFiManagerApp::queryClose()
 {
   if(!m_shuttingDown &&
-       !kapp->sessionSaving() &&
+       !tdeApp->sessionSaving() &&
        settingsStayInSystrayOnClose->isChecked() ) {
     hide();
     return false;
@@ -608,7 +608,7 @@ KWiFiManagerApp::queryExit()
 TQStringList usedInterfacesList()
 {
   // Register with DCOP
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   client->registerAs( "kwifimanager" );
   client->setDefaultObject( "dcop_interface" );