Use tdeApprename/tdeapp

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

1 files changed, 10 insertions, 10 deletions

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 0f1d34ed9..1978e092c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -390,7 +390,7 @@ void KMKernel::openReader( bool onlyCheck )
     // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( mWin, tdeApp->startupId() );
 #endif
   }
 }
@@ -460,7 +460,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   }
   return 1;
@@ -607,7 +607,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   } else {
     cWin->setAutoDeleteWindow( true );
@@ -653,7 +653,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc,
     // Activate window - doing this instead of KWin::activateWindow(cWin->winId());
     // so that it also works when called from KMailApplication::newInstance()
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-    TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() );
+    TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() );
 #endif
   }
 
@@ -1357,7 +1357,7 @@ void KMKernel::slotSenderFinished()
   good, Folder manager go compact sent-mail and outbox
   clean up stage1 (release folders and config, unregister from dcop)
     -- another kmail may start now ---
-  kapp->quit();
+  tdeApp->quit();
 }
 */
 
@@ -1744,7 +1744,7 @@ bool KMKernel::doSessionManagement()
 {
 
   // Do session management
-  if (kapp->isRestored()){
+  if (tdeApp->isRestored()){
     int n = 1;
     while (KMMainWin::canBeRestored(n)){
       //only restore main windows! (Matthias);
@@ -1884,7 +1884,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
 
 #if 0
   // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved)
-  const TQString kmailName = kapp->aboutData()->programName();
+  const TQString kmailName = tdeApp->aboutData()->programName();
   TQString msg;
   if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) {
     // if destinationDir exists, we need to warn about possible
@@ -1962,7 +1962,7 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg)
 
   case TQtFatalMsg: // Hm, what about using kdFatal() here?
     ungrabPtrKb();
-    kdDebug(5006) << kapp->caption() << " fatal error "
+    kdDebug(5006) << tdeApp->caption() << " fatal error "
 		  << aMsg << endl;
     KMessageBox::error(0, aMsg);
     abort();
@@ -2344,7 +2344,7 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->topLevelWidgets();
+  TQWidgetList *l = tdeApp->topLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
@@ -2420,7 +2420,7 @@ KMFolder* KMKernel::findFolderById( const TQString& idString )
 
 ::KIMProxy* KMKernel::imProxy()
 {
-  return KIMProxy::instance( kapp->dcopClient() );
+  return KIMProxy::instance( tdeApp->dcopClient() );
 }
 
 void KMKernel::enableMailCheck()