1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 6c961518..bf8c82fa 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -61,7 +61,7 @@ using KMail::ImapAccountBase;
 #include "kmfolder.h"
 #include "kmmainwidget.h"
 #include "recentaddresses.h"
-using KRecentAddress::RecentAddresses;
+using TDERecentAddress::RecentAddresses;
 #include "completionordereditor.h"
 #include "ldapclient.h"
 #include "index.h"
@@ -297,8 +297,8 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name )
            TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) );
   connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
            TQT_SLOT(slotModifyIdentity()) );
-  connect( mIdentityList, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)),
-           TQT_SLOT(slotContextMenu(KListView*,TQListViewItem*,const TQPoint&)) );
+  connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
+           TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) );
   // ### connect dragged(...), ...
 
   hlay->addWidget( mIdentityList, 1 );
@@ -488,7 +488,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i,
   item->redisplay();
 }
 
-void IdentityPage::slotContextMenu( KListView *, TQListViewItem * i,
+void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i,
                                     const TQPoint & pos ) {
   IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i );
 
@@ -1585,7 +1585,7 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char *
   hlay->addWidget( mFontLocationCombo );
   hlay->addStretch( 10 );
   vlay->addSpacing( KDialog::spacingHint() );
-  mFontChooser = new KFontChooser( this, "font", false, TQStringList(),
+  mFontChooser = new TDEFontChooser( this, "font", false, TQStringList(),
                                    false, 4 );
   mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked()
   vlay->addWidget( mFontChooser );
@@ -1639,7 +1639,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
             this, TQT_SLOT( slotEmitChanged( void ) ) );
 
   // Disable Family and Size list if we have selected a quote font:
-  mFontChooser->enableColumn( KFontChooser::FamilyList|KFontChooser::SizeList,
+  mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList,
                               fontNames[ index ].enableFamilyAndSize );
 }
 
@@ -2891,7 +2891,7 @@ void ComposerPage::GeneralTab::save() {
 
 void ComposerPage::GeneralTab::slotConfigureRecentAddresses( )
 {
-  KRecentAddress::RecentAddressDialog dlg( this );
+  TDERecentAddress::RecentAddressDialog dlg( this );
   dlg.setAddresses( RecentAddresses::self( KMKernel::config() )->addresses() );
   if ( dlg.exec() ) {
     RecentAddresses::self( KMKernel::config() )->clear();