1 files changed, 26 insertions, 26 deletions

diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 423c04a70..05571bf3c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -36,7 +36,7 @@ using KMail::AccountManager;
 #include "kmmainwidget.h"
 #include "kmfoldertree.h"
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 #include "kmmsgdict.h"
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
@@ -351,12 +351,12 @@ void KMKernel::saveToProfile( const TQString& ) const
 void KMKernel::openReader( bool onlyCheck )
 {
   mWin = 0;
-  KMainWindow *ktmw = 0;
+  TDEMainWindow *ktmw = 0;
   kdDebug(5006) << "KMKernel::openReader called" << endl;
 
-  if (KMainWindow::memberList)
-    for (ktmw = KMainWindow::memberList->first(); ktmw;
-         ktmw = KMainWindow::memberList->next())
+  if (TDEMainWindow::memberList)
+    for (ktmw = TDEMainWindow::memberList->first(); ktmw;
+         ktmw = TDEMainWindow::memberList->next())
       if (ktmw->isA("KMMainWin"))
         break;
 
@@ -1124,13 +1124,13 @@ void KMKernel::raise()
 bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 {
   KMMainWidget *mainWidget = 0;
-  if (KMainWindow::memberList) {
-    KMainWindow *win = 0;
+  if (TDEMainWindow::memberList) {
+    TDEMainWindow *win = 0;
     TQObjectList *l;
 
-    // First look for a KMainWindow.
-    for (win = KMainWindow::memberList->first(); win;
-         win = KMainWindow::memberList->next()) {
+    // First look for a TDEMainWindow.
+    for (win = TDEMainWindow::memberList->first(); win;
+         win = TDEMainWindow::memberList->next()) {
       // Then look for a KMMainWidget.
       l	= win->queryList("KMMainWidget");
       if (l && l->first()) {
@@ -1745,9 +1745,9 @@ bool KMKernel::doSessionManagement()
 
 void KMKernel::closeAllKMailWindows()
 {
-  if (!KMainWindow::memberList) return;
-  TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
-  KMainWindow *window = 0;
+  if (!TDEMainWindow::memberList) return;
+  TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
+  TDEMainWindow *window = 0;
   while ((window = it.current()) != 0) {
     ++it;
     if (window->isA("KMMainWindow") ||
@@ -1921,8 +1921,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
 
 void KMKernel::ungrabPtrKb(void)
 {
-  if(!KMainWindow::memberList) return;
-  TQWidget* widg = KMainWindow::memberList->first();
+  if(!TDEMainWindow::memberList) return;
+  TQWidget* widg = TDEMainWindow::memberList->first();
   Display* dpy;
 
   if (!widg) return;
@@ -1964,10 +1964,10 @@ void KMKernel::dumpDeadLetters()
     return; //All documents should be saved before shutting down is set!
 
   // make all composer windows autosave their contents
-  if ( !KMainWindow::memberList )
+  if ( !TDEMainWindow::memberList )
     return;
 
-  for ( TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList) ; it.current() != 0; ++it ) {
+  for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) {
     if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) {
       win->autoSaveMessage();
       // saving the message has to be finished right here, we are called from a dtor,
@@ -2234,29 +2234,29 @@ KMMsgIndex *KMKernel::msgIndex()
     return the_msgIndex;
 }
 
-KMainWindow* KMKernel::mainWin()
+TDEMainWindow* KMKernel::mainWin()
 {
-  if (KMainWindow::memberList) {
-    KMainWindow *kmWin = 0;
+  if (TDEMainWindow::memberList) {
+    TDEMainWindow *kmWin = 0;
 
     // First look for a KMMainWin.
-    for (kmWin = KMainWindow::memberList->first(); kmWin;
-         kmWin = KMainWindow::memberList->next())
+    for (kmWin = TDEMainWindow::memberList->first(); kmWin;
+         kmWin = TDEMainWindow::memberList->next())
       if (kmWin->isA("KMMainWin"))
         return kmWin;
 
-    // There is no KMMainWin. Use any other KMainWindow instead (e.g. in
+    // There is no KMMainWin. Use any other TDEMainWindow instead (e.g. in
     // case we are running inside Kontact) because we anyway only need
     // it for modal message boxes and for KNotify events.
-    kmWin = KMainWindow::memberList->first();
+    kmWin = TDEMainWindow::memberList->first();
     if ( kmWin )
       return kmWin;
   }
 
-  // There's not a single KMainWindow. Create a KMMainWin.
+  // There's not a single TDEMainWindow. Create a KMMainWin.
   // This could happen if we want to pop up an error message
   // while we are still doing the startup wizard and no other
-  // KMainWindow is running.
+  // TDEMainWindow is running.
   mWin = new KMMainWin;
   return mWin;
 }