1 files changed, 19 insertions, 20 deletions

diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 23918a04..1add4e7a 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of KMail.
     Copyright (c) 2002-2003 Don Sanders <sanders@kde.org>,
     Copyright (c) 2003      Zack Rusin  <zack@kde.org>,
@@ -66,12 +65,12 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   mParentWidget( parentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
-  kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5006) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   setInstance(KMailFactory::instance());
 
   kdDebug(5006) << "KMailPart()..." << endl;
-  kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
+  kdDebug(5006) << "  InstanceName: " << tdeApp->instanceName() << endl;
 
   // import i18n data and icons from libraries:
   KMail::insertLibraryCataloguesAndIcons();
@@ -82,7 +81,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 
   KMail::lockOrDie();
 
-  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
+  tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet
 
   //local, do the init
   KMKernel *mKMailKernel = new KMKernel();
@@ -96,18 +95,18 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   mKMailKernel->recoverDeadLetters();
 
   kmsetSignalHandler(kmsignalHandler);
-  kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
+  tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget(parentWidget, widgetName);
-  canvas->setFocusPolicy(TQ_ClickFocus);
+  canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   TDEGlobal::iconLoader()->addAppDir("kmail");
 #if 0
   //It's also possible to make a part out of a readerWin
   KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() );
-  connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)),
-	  mReaderWin, TQT_SLOT(slotUrlClicked()));
+  connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)),
+	  mReaderWin, TQ_SLOT(slotUrlClicked()));
   TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
   topLayout->addWidget(mReaderWin);
   mReaderWin->setAutoDelete( true );
@@ -122,10 +121,10 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kmkernel->inboxFolder()->close();
 #else
   mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(),
-                                 kapp->config());
+                                 tdeApp->config());
   TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
   topLayout->addWidget(mainWidget);
-  mainWidget->setFocusPolicy(TQ_ClickFocus);
+  mainWidget->setFocusPolicy(TQWidget::ClickFocus);
   mStatusBar  = new KMailStatusBarExtension(this);
   mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
 
@@ -135,26 +134,26 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 
   // Get to know when the user clicked on a folder in the KMail part and update the headerWidget of Kontact
   KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KMailInfo" );
-  connect( mainWidget->folderTree(), TQT_SIGNAL(folderSelected(KMFolder*)), this, TQT_SLOT(exportFolder(KMFolder*)) );
-  connect( mainWidget->folderTree(), TQT_SIGNAL(iconChanged(KMFolderTreeItem*)),
-           this, TQT_SLOT(slotIconChanged(KMFolderTreeItem*)) );
-  connect( mainWidget->folderTree(), TQT_SIGNAL(nameChanged(KMFolderTreeItem*)),
-           this, TQT_SLOT(slotNameChanged(KMFolderTreeItem*)) );
-  connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) );
-  connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) );
+  connect( mainWidget->folderTree(), TQ_SIGNAL(folderSelected(KMFolder*)), this, TQ_SLOT(exportFolder(KMFolder*)) );
+  connect( mainWidget->folderTree(), TQ_SIGNAL(iconChanged(KMFolderTreeItem*)),
+           this, TQ_SLOT(slotIconChanged(KMFolderTreeItem*)) );
+  connect( mainWidget->folderTree(), TQ_SIGNAL(nameChanged(KMFolderTreeItem*)),
+           this, TQ_SLOT(slotNameChanged(KMFolderTreeItem*)) );
+  connect( this, TQ_SIGNAL(textChanged(const TQString&)), ie, TQ_SIGNAL(textChanged(const TQString&)) );
+  connect( this, TQ_SIGNAL(iconChanged(const TQPixmap&)), ie, TQ_SIGNAL(iconChanged(const TQPixmap&)) );
 
   TDEGlobal::iconLoader()->addAppDir( "kmail" );
   setXMLFile( "kmail_part.rc" );
 #endif
 
   KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel,
-                                                   TQT_SLOT( slotConfigChanged() ) );
+                                                   TQ_SLOT( slotConfigChanged() ) );
 }
 
 KMailPart::~KMailPart()
 {
   kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-  // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
+  // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them
   // if they are only about checking mail (not important stuff like moving messages)
   kmkernel->abortMailCheck();
   kmkernel->acctMgr()->cancelMailCheck();