Use tdeApprename/tdeapp

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

26 files changed, 87 insertions, 87 deletions

diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp
index 5f3cbd14f..f2b3d4c0d 100644
--- a/konqueror/KonqMainWindowIface.cpp
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -93,7 +93,7 @@ DCOPRef KonqMainWindowIface::currentView()
   if ( !view )
     return DCOPRef();
 
-  return DCOPRef( kapp->dcopClient()->appId(), view->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), view->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::currentPart()
@@ -115,7 +115,7 @@ DCOPRef KonqMainWindowIface::view(int viewNumber)
       ++it;
   if ( it == viewMap.end() )
       return DCOPRef();
-  return DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::part(int viewNumber)
@@ -131,7 +131,7 @@ DCOPRef KonqMainWindowIface::part(int viewNumber)
 
 DCOPRef KonqMainWindowIface::action( const TQCString &name )
 {
-  return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
+  return DCOPRef( tdeApp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
 }
 
 QCStringList KonqMainWindowIface::actions()
diff --git a/konqueror/KonqViewIface.cpp b/konqueror/KonqViewIface.cpp
index 77bfbb61c..12e0fb4a1 100644
--- a/konqueror/KonqViewIface.cpp
+++ b/konqueror/KonqViewIface.cpp
@@ -91,7 +91,7 @@ DCOPRef KonqViewIface::part()
   if ( dcopProperty.type() != TQVariant::CString )
     return res;
 
-  res.setRef( kapp->dcopClient()->appId(), dcopProperty.toCString() );
+  res.setRef( tdeApp->dcopClient()->appId(), dcopProperty.toCString() );
   return res;
 }
 
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp
index db87e39ed..a449a0488 100644
--- a/konqueror/KonquerorIface.cpp
+++ b/konqueror/KonquerorIface.cpp
@@ -60,7 +60,7 @@ DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 
 DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return openBrowserWindow( url );
 }
 
@@ -71,7 +71,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url )
 
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, TQString::null, tempFile );
 }
 
@@ -86,7 +86,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStr
 
 DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindowWithSelection( url, filesToSelect );
 }
 
@@ -106,7 +106,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mi
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype,
     const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, mimetype, tempFile );
 }
 
@@ -123,7 +123,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path );
 }
 
@@ -141,7 +141,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, c
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path, filename );
 }
 
@@ -157,7 +157,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & p
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url );
 }
 
@@ -175,7 +175,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &pa
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
 }
 
@@ -218,7 +218,7 @@ TQValueList<DCOPRef> KonquerorIface::getWindows()
     {
       TQPtrListIterator<KonqMainWindow> it( *mainWindows );
       for (; it.current(); ++it )
-        lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
+        lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
     }
     return lst;
 }
@@ -290,5 +290,5 @@ bool KonquerorIface::processCanBeReused( int screen )
 void KonquerorIface::terminatePreloaded()
 {
     if( KonqMainWindow::isPreloaded())
-        kapp->exit();
+        tdeApp->exit();
 }
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index a18aa3eda..b7605adea 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -111,7 +111,7 @@ TQString KonqAboutPageFactory::launch()
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
   res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.arg( "" );
@@ -196,7 +196,7 @@ TQString KonqAboutPageFactory::intro()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -251,7 +251,7 @@ TQString KonqAboutPageFactory::specs()
 	return res;
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -348,7 +348,7 @@ TQString KonqAboutPageFactory::tips()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -412,7 +412,7 @@ TQString KonqAboutPageFactory::plugins()
     if ( s_plugins_html )
         return *s_plugins_html;
 
-    TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+    TQString res = loadFile( locate( "data", tdeApp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
                   .arg(i18n("Installed Plugins"))
                   .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
                   .arg(i18n("Installed"))
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index 9bf5a746a..50f79fe64 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -454,7 +454,7 @@ bool clientApp::doIt()
   }
   TQCString command = args->arg(0);
 
-  // read ASN env. variable for non-KApp cases
+  // read ASN env. variable for non-TDEApp cases
   startup_id_str = TDEStartupInfo::currentStartupIdEnv().id();
 
   if ( command == "openURL" || command == "newTab" )
@@ -619,7 +619,7 @@ bool clientApp::doIt()
   {
     checkArgumentCount(argc, 1, 1);
     TQByteArray data;
-    kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
     // Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync.
   }
   else if ( command == "configureDesktop" )
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 395da6a5d..052fa341c 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -343,7 +343,7 @@ void ActionsImpl::slotCopy() {
     TQValueList<KBookmark> bookmarks
         = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
     KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
-    kapp->clipboard()->setData(data, TQClipboard::Clipboard);
+    tdeApp->clipboard()->setData(data, TQClipboard::Clipboard);
 }
 
 void ActionsImpl::slotPaste() {
@@ -351,7 +351,7 @@ void ActionsImpl::slotPaste() {
     KEBMacroCommand *mcmd =
         CmdGen::insertMimeSource(
                             i18n("Paste"),
-                            kapp->clipboard()->data(TQClipboard::Clipboard),
+                            tdeApp->clipboard()->data(TQClipboard::Clipboard),
                             ListView::self()->userAddress());
     CmdHistory::self()->didCommand(mcmd);
 }
@@ -442,7 +442,7 @@ void ActionsImpl::slotPrint() {
     (*tstream) << exporter.toString(CurrentMgr::self()->mgr()->root(), true);
     tmpf.close();
 
-    s_appId = kapp->dcopClient()->appId();
+    s_appId = tdeApp->dcopClient()->appId();
     s_objId = s_part->property("dcopObjectId").toString().latin1();
     connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint()));
 
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index 73cbd9ced..d3d8ce432 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,7 +83,7 @@ void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
+        m_updater = new FavIconUpdater(tdeApp, "FavIconUpdater");
         connect(m_updater, TQ_SIGNAL( done(bool) ),
                 this,      TQ_SLOT( slotDone(bool) ) );
     }
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 1355874de..6bb249beb 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -61,7 +61,7 @@ static void continueInWindow(TQString _wname) {
     TQCString wname = _wname.latin1();
     int id = -1;
 
-    QCStringList apps = kapp->dcopClient()->registeredApplications();
+    QCStringList apps = tdeApp->dcopClient()->registeredApplications();
     for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
         TQCString &clientId = *it;
 
@@ -93,7 +93,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     int ret = KMessageBox::warningYesNo(0, 
             i18n("Another instance of %1 is already running, do you really "
                 "want to open another instance or continue work in the same instance?\n"
-                "Please note that, unfortunately, duplicate views are read-only.").arg(kapp->caption()), 
+                "Please note that, unfortunately, duplicate views are read-only.").arg(tdeApp->caption()), 
             i18n("Warning"),
             i18n("Run Another"),     /* yes */
             i18n("Continue in Same") /*  no */);
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index d685e8dee..c37b8f480 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -245,7 +245,7 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ),
+    connect(tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ),
                                TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
@@ -317,7 +317,7 @@ void KEBApp::slotClipboardDataChanged() {
     // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
     if (!m_readOnly) {
         m_canPaste = KBookmarkDrag::canDecode(
-                        kapp->clipboard()->data(TQClipboard::Clipboard));
+                        tdeApp->clipboard()->data(TQClipboard::Clipboard));
         updateActions();
     }
 }
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp
index fa93bca57..3f2c4cce9 100644
--- a/konqueror/konq_actions.cpp
+++ b/konqueror/konq_actions.cpp
@@ -90,7 +90,7 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject*
 
 int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   // Go menu
@@ -242,7 +242,7 @@ void KonqLogoAction::updateIcon(int id)
 
 int KonqLogoAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
 /*
diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index ef65a5412..d7e5870ae 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -131,8 +131,8 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
     setHistoryEditorEnabled( true ); 
     connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) );
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 }
 
 KonqCombo::~KonqCombo()
@@ -157,8 +157,8 @@ void KonqCombo::setURL( const TQString& url )
         m_returnPressed = false;      
         TQByteArray data;
         TQDataStream s( data, IO_WriteOnly );
-        s << url << kapp->dcopClient()->defaultObject();
-        kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+        s << url << tdeApp->dcopClient()->defaultObject();
+        tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                   "addToCombo(TQString,TQCString)", data);
     }
     // important security consideration: always display the beginning
@@ -506,16 +506,16 @@ void KonqCombo::slotCleared()
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
+    s << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
 }
 
 void KonqCombo::slotRemoved( const TQString& item )
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << item << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+    s << item << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                "removeFromCombo(TQString,TQCString)", data);
 }
 
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index 32ca35650..d42e203d8 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
 
     bool hasFocus = m_pParentKonqFrame->isActivePart();
 
-    const TQColorGroup& activeCg = kapp->palette().active();
+    const TQColorGroup& activeCg = tdeApp->palette().active();
     setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
 
     static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp
index 0f582d1a0..f7a9c6c00 100644
--- a/konqueror/konq_main.cpp
+++ b/konqueror/konq_main.cpp
@@ -70,7 +70,7 @@ extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
   KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log");
   KonqMainWindow::s_crashlog_file = crashlog_file.file();
 
-  if ( kapp->isRestored() )
+  if ( tdeApp->isRestored() )
   {
     int n = 1;
     while ( KonqMainWindow::canBeRestored( n ) )
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index d9d726ec6..f1eac5ca8 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -192,7 +192,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   // init history-manager, load history, get completion object
   if ( !s_pCompletion ) {
-    KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" );
+    KonqHistoryManager *mgr = new KonqHistoryManager( tdeApp, "history mgr" );
     s_pCompletion = mgr->completionObject();
 
 
@@ -220,7 +220,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
   connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ),
            this, TQ_SLOT( slotDatabaseChanged() ) );
 
-  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
 
   //load the xmlui file specified in the profile or the default konqueror.rc
   setXMLFile( xmluiFile );
@@ -347,7 +347,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
   if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) )
   {
     assert( res->inherits( "TDEToolBar" ) );
-    if (!kapp->authorizeTDEAction("bookmarks"))
+    if (!tdeApp->authorizeTDEAction("bookmarks"))
     {
         delete res;
         return 0;
@@ -706,7 +706,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
 bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req )
 {
   // Second argument is referring URL
-  if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
+  if ( !tdeApp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
   {
      TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, _url.prettyURL());
      KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
@@ -1401,7 +1401,7 @@ void KonqMainWindow::slotSendURL()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null,TQString::null,TQString::null,
+  tdeApp->invokeMailer(TQString::null,TQString::null,TQString::null,
                      subject, body);
 }
 
@@ -1441,7 +1441,7 @@ void KonqMainWindow::slotSendFile()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
+  tdeApp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
                      TQString::null, //body
                      TQString::null,
                      urls); // attachments
@@ -2020,7 +2020,7 @@ void KonqMainWindow::slotConfigure()
         for( TQStringList::ConstIterator it = modules.begin();
                 it != end; ++it )
         {
-            if ( kapp->authorizeControlModule( *it ) )
+            if ( tdeApp->authorizeControlModule( *it ) )
             {
                 m_configureDialog->addModule( *it );
             }
@@ -2104,14 +2104,14 @@ void KonqMainWindow::slotRunFinished()
 
   if ( !run->mailtoURL().isEmpty() )
   {
-      kapp->invokeMailer( run->mailtoURL() );
+      tdeApp->invokeMailer( run->mailtoURL() );
   }
 
   if ( run->hasError() ) { // we had an error
       TQByteArray data;
       TQDataStream s( data, IO_WriteOnly );
-      s << run->url().prettyURL() << kapp->dcopClient()->defaultObject();
-      kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+      s << run->url().prettyURL() << tdeApp->dcopClient()->defaultObject();
+      tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
 				"removeFromCombo(TQString,TQCString)", data);
   }
 
@@ -2239,7 +2239,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
     unplugViewModeActions();
     createGUI( 0L );
     KParts::MainWindow::setCaption( "" );
-    KParts::MainWindow::setIcon( kapp->icon());
+    KParts::MainWindow::setIcon( tdeApp->icon());
     return;
   }
 
@@ -3774,7 +3774,7 @@ void KonqMainWindow::comboAction( int action, const TQString& url, const TQCStri
     }
 
     // only one instance should save...
-    if ( combo && objId == kapp->dcopClient()->defaultObject() )
+    if ( combo && objId == tdeApp->dcopClient()->defaultObject() )
       combo->saveItems();
 }
 
@@ -3840,7 +3840,7 @@ void KonqMainWindow::initActions()
   (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
   (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
   (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
-  if (kapp->authorize("shell_access"))
+  if (tdeApp->authorize("shell_access"))
   {
      (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
   }
@@ -3915,7 +3915,7 @@ void KonqMainWindow::initActions()
       "tde-tdehtml_plugins.desktop" << "tde-kcmkonqyperformance.desktop";
 
 
-  if (!kapp->authorizeControlModules(configModules()).isEmpty())
+  if (!tdeApp->authorizeControlModules(configModules()).isEmpty())
      KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() );
 
   KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
@@ -4557,7 +4557,7 @@ void KonqMainWindow::setCaption( const TQString &caption )
   {
     kdDebug(1202) << "KonqMainWindow::setCaption(" << caption << ")" << endl;
 
-    // Keep an unmodified copy of the caption (before kapp->makeStdCaption is applied)
+    // Keep an unmodified copy of the caption (before tdeApp->makeStdCaption is applied)
     m_currentView->setCaption( caption );
     KParts::MainWindow::setCaption( m_currentView->caption() );
   }
@@ -5050,7 +5050,7 @@ void KonqMainWindow::updateOpenWithActions()
 
   m_openWithActions.clear();
 
-  if (!kapp->authorizeTDEAction("openwith"))
+  if (!tdeApp->authorizeTDEAction("openwith"))
      return;
 
   const TDETrader::OfferList & services = m_currentView->appServiceOffers();
@@ -5309,7 +5309,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
   kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl;
   // This breaks session management (the window is withdrawn in twin)
   // so let's do this only when closed by the user.
-  if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() )
+  if ( static_cast<KonquerorApplication *>(tdeApp)->closedByUser() )
   {
     if ( viewManager()->docContainer() && viewManager()->docContainer()->frameType()=="Tabs" )
     {
@@ -5401,7 +5401,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
           TQApplication::sendEvent( (*it)->part()->widget(), e );
   }
   KParts::MainWindow::closeEvent( e );
-  if( isPreloaded() && !kapp->sessionSaving())
+  if( isPreloaded() && !tdeApp->sessionSaving())
   { // queryExit() refused closing, hide instead
       hide();
   }
@@ -5410,7 +5410,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
 
 bool KonqMainWindow::queryExit()
 {
-    if( kapp->sessionSaving()) // *sigh*
+    if( tdeApp->sessionSaving()) // *sigh*
         return true;
     return !stayPreloaded();
 }
@@ -5812,14 +5812,14 @@ void KonqMainWindow::setPreloadedFlag( bool preloaded )
     s_preloaded = preloaded;
     if( s_preloaded )
     {
-        kapp->disableSessionManagement(); // dont restore preloaded konqy's
+        tdeApp->disableSessionManagement(); // dont restore preloaded konqy's
         return; // was registered before calling this
     }
     delete s_preloadedWindow; // preloaded state was abandoned without reusing the window
     s_preloadedWindow = NULL;
-    kapp->enableSessionManagement(); // enable SM again
+    tdeApp->enableSessionManagement(); // enable SM again
     DCOPRef ref( "kded", "konqy_preloader" );
-    ref.send( "unregisterPreloadedKonqy", kapp->dcopClient()->appId());
+    ref.send( "unregisterPreloadedKonqy", tdeApp->dcopClient()->appId());
 }
 
 void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
@@ -5863,7 +5863,7 @@ void KonqMainWindow::resetWindow()
 // Qt remembers the iconic state if the window was withdrawn while on another virtual desktop
     clearWState( WState_Minimized );
     ignoreInitialGeometry();
-    kapp->setTopWidget( this ); // set again the default window icon
+    tdeApp->setTopWidget( this ); // set again the default window icon
 }
 
 bool KonqMainWindow::event( TQEvent* e )
@@ -5901,12 +5901,12 @@ bool KonqMainWindow::stayPreloaded()
         return false;
     DCOPRef ref( "kded", "konqy_preloader" );
     if( !ref.callExt( "registerPreloadedKonqy", DCOPRef::NoEventLoop, 5000,
-        kapp->dcopClient()->appId(), tqt_xscreen()))
+        tdeApp->dcopClient()->appId(), tqt_xscreen()))
     {
         return false;
     }
     KonqMainWindow::setPreloadedFlag( true );
-    kdDebug(1202) << "Konqy kept for preloading :" << kapp->dcopClient()->appId() << endl;
+    kdDebug(1202) << "Konqy kept for preloading :" << tdeApp->dcopClient()->appId() << endl;
     KonqMainWindow::setPreloadedWindow( this );
     return true;
 }
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 281407cf8..d95cada6b 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -474,7 +474,7 @@ protected slots:
   // Connected to KSycoca
   void slotDatabaseChanged();
 
-  // Connected to KApp
+  // Connected to TDEApp
   void slotReconfigure();
 
   void slotForceSaveMainWindowSettings();
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index 1fbea747e..52f5e2857 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -129,7 +129,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path,
   else if( KonqMainWindow::isPreloaded() && KonqMainWindow::preloadedWindow() != NULL )
   {
       mainWindow = KonqMainWindow::preloadedWindow();
-      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), kapp->startupId());
+      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), tdeApp->startupId());
       KonqMainWindow::setPreloadedWindow( NULL );
       KonqMainWindow::setPreloadedFlag( false );
       mainWindow->resetWindow();
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index c7ead1d0b..810d67376 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -1704,7 +1704,7 @@ void KonqViewManager::profileListDirty( bool broadcast )
     return;
   }
 
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
 }
 
 void KonqViewManager::slotProfileActivated( int id )
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 94322e267..efc655a40 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -63,11 +63,11 @@ void TDEHTMLPluginKTTSD::slotReadOut()
     else
     {
         // If KTTSD not running, start it.
-        DCOPClient *client = kapp->dcopClient();
+        DCOPClient *client = tdeApp->dcopClient();
         if (!client->isApplicationRegistered("kttsd"))
         {
             TQString error;
-            if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+            if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error))
                 TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error );
         }
 
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index 5c31c5cea..81e9af735 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -49,7 +49,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="FileNameColumnWidth" type="Int">
-      <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
+      <default code="true">25 * tdeApp->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
       <whatsthis></whatsthis>
     </entry>
diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp
index fcfa4b4d0..4b9e375d7 100644
--- a/konqueror/preloader/preloader.cpp
+++ b/konqueror/preloader/preloader.cpp
@@ -30,7 +30,7 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj )
     : KDEDModule( obj )
     {
     reconfigure();
-    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
         TQ_SLOT( appRemoved( const TQCString& )));
     connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
 	TQ_SLOT( checkAlwaysPreloaded()));
@@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
 	{
 	if( !check_always_preloaded_timer.isActive())
 	    {
-	    if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
+	    if( tdeApp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
 		TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
 		{
 		kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index fc79c711a..6245c2bd9 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -30,7 +30,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
 	                          const TQStringList & )
     : KParts::Plugin( parent, name )
 {
-    if (!kapp->authorize("shell_access"))
+    if (!tdeApp->authorize("shell_access"))
        return;
 
     new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this,
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 51f09e793..955927558 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -852,7 +852,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 
 bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
 		{
 			KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
@@ -901,7 +901,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 
 void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
 			m_menu->exec(TQCursor::pos());
 		}
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index fa4b2b4f6..5e9b29236 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
     else
 	return;
 
-    DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), tree()->topLevelWidget()->name());
 
     if (bookmark.isGroup()) {
         KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
 
     if ( !bookmark.isGroup() )
     {
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Selection );
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Clipboard );
     }
 }
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index eb1621ae9..951dce28b 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -98,7 +98,7 @@ void KonqSidebarHistorySettings::applySettings()
     delete config;
 
     // notify konqueror instances about the new configuration
-    kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
 			      "notifySettingsChanged()", TQByteArray() );
 }
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 188da9d93..056d0deb7 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -155,13 +155,13 @@ void HistorySidebarConfig::save()
     TQByteArray dataAge;
     TQDataStream streamAge( dataAge, IO_WriteOnly );
     streamAge << age << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
 
     TQByteArray dataCount;
     TQDataStream streamCount( dataCount, IO_WriteOnly );
     streamCount << count << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
 
     m_settings->m_valueYoungerThan = dialog->spinNewer->value();
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 147f3135b..dad6fd7bd 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -883,7 +883,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
 bool KonqSidebarTree::tabSupport()
 {
     // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
-   DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+   DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     DCOPReply reply = ref.call("functions()");
     if (reply.isValid()) {
         QCStringList funcs;
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
 void KonqSidebarTree::slotOpenTab()
 {
     if (!m_currentTopLevelItem) return;
-    DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
 }
 
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
 {
     if (!m_currentTopLevelItem) return;
     KURL url = m_currentTopLevelItem->externalURL();
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
 }
 
 ///////////////////////////////////////////////////////////////////