1 files changed, 29 insertions, 30 deletions

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index f998a74c..962271e6 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1,4 +1,3 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*- */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -61,7 +60,7 @@ using KMail::FolderIface;
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kprogress.h>
 #include <kpassivepopup.h>
@@ -174,8 +173,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
 #ifdef __TDE_HAVE_TDEHWLIB
   mNetworkManager = TDEGlobal::networkManager();
   if (mNetworkManager) {
-    connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
-        this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
+    connect( mNetworkManager, TQ_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
+        this, TQ_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
     if (networkStateConnected()) {
       resumeNetworkJobs();
     }
@@ -391,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
   }
 }
@@ -461,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;
@@ -608,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 );
@@ -654,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
   }
 
@@ -1358,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();
 }
 */
 
@@ -1583,17 +1582,17 @@ void KMKernel::init()
   the_weaverLogger->attach (the_weaver);
 //#endif
 
-  connect( the_folderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
-           this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
-  connect( the_dimapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
-           this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
-  connect( the_imapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
-           this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
-  connect( the_searchFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ),
-           this, TQT_SIGNAL( folderRemoved(KMFolder*) ) );
+  connect( the_folderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+           this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+  connect( the_dimapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+           this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+  connect( the_imapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+           this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
+  connect( the_searchFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ),
+           this, TQ_SIGNAL( folderRemoved(KMFolder*) ) );
 
   mBackgroundTasksTimer = new TQTimer( this, "mBackgroundTasksTimer" );
-  connect( mBackgroundTasksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRunBackgroundTasks() ) );
+  connect( mBackgroundTasksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRunBackgroundTasks() ) );
 #ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h
   mBackgroundTasksTimer->start( 10000, true ); // 10s, singleshot
 #else
@@ -1745,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);
@@ -1885,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
@@ -1963,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();
@@ -1983,7 +1982,7 @@ void KMKernel::dumpDeadLetters()
     return;
 
   for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) {
-    if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) {
+    if ( KMail::Composer * win = ::tqt_cast<KMail::Composer*>( it.current() ) ) {
       win->autoSaveMessage();
       // saving the message has to be finished right here, we are called from a dtor,
       // therefore we have no chance to finish this later
@@ -2021,10 +2020,10 @@ void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL,
   TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false);
   putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0;
   mPutJobs.insert(job, pd);
-  connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
-    TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
-  connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
-    TQT_SLOT(slotResult(TDEIO::Job*)));
+  connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+    TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+    TQ_SLOT(slotResult(TDEIO::Job*)));
 }
 
 void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data)
@@ -2080,8 +2079,8 @@ void KMKernel::slotShowConfigurationDialog()
 {
   if( !mConfigureDialog ) {
     mConfigureDialog = new ConfigureDialog( 0, "configure", false );
-    connect( mConfigureDialog, TQT_SIGNAL( configChanged() ),
-             this, TQT_SLOT( slotConfigChanged() ) );
+    connect( mConfigureDialog, TQ_SIGNAL( configChanged() ),
+             this, TQ_SLOT( slotConfigChanged() ) );
   }
 
   if( KMKernel::getKMMainWidget() == 0 )
@@ -2345,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;
 
@@ -2421,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()