Rename a number of classes to enhance compatibility with KDE4

28 files changed, 53 insertions, 53 deletions

diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index bf4e2b17c..81740c7b7 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -54,7 +54,7 @@ Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& )
 
     setInstance( PluginFactory::instance() );
 
-    insertNewAction( new KAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
+    insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
 
     m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
 	new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 159962e7a..929bd1b83 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -57,14 +57,14 @@ KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const
 {
   setInstance( KAddressbookPluginFactory::instance() );
 
-  insertNewAction( new KAction( i18n( "New Contact..." ), "identity",
+  insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity",
 			             CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(),
                    "new_contact" ) );
 
-  insertNewAction( new KAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
+  insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
                                 TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
 
-  insertSyncAction( new KAction( i18n( "Synchronize Contacts" ), "reload",
+  insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload",
                     0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(),
                    "kaddressbook_sync" ) );
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index 93d894933..8db54bc96 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -41,7 +41,7 @@ KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
 {
   setInstance( KarmPluginFactory::instance() );
   (void)dcopClient();
-  insertNewAction( new KAction( i18n( "New Task" ), "karm",
+  insertNewAction( new TDEAction( i18n( "New Task" ), "karm",
                    CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(),
                    "new_task" ) );
 }
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index eb8906d26..3ca4c9036 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -55,7 +55,7 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
   connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) );
   connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 
   load();
 
@@ -77,7 +77,7 @@ void KCMKMailSummary::initGUI()
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
-  mFolderView = new KListView( this );
+  mFolderView = new TDEListView( this );
   mFolderView->setRootIsDecorated( true );
   mFolderView->setFullWidth( true );
 
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 3b6a8f53e..7cc4763e7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -28,7 +28,7 @@
 
 #include <tdecmodule.h>
 
-class KListView;
+class TDEListView;
 
 class TQCheckBox;
 class TQCheckListItem;
@@ -54,7 +54,7 @@ class KCMKMailSummary : public TDECModule
     void loadFolders();
     void storeFolders();
 
-    KListView *mFolderView;
+    TDEListView *mFolderView;
     TQCheckBox *mFullPath;
     TQMap<TQString, TQListViewItem*> mFolderMap;
 };
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index e6a1fae21..051d69b95 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -61,11 +61,11 @@ KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList&
 {
   setInstance( KMailPluginFactory::instance() );
 
-  insertNewAction( new KAction( i18n( "New Message..." ), "mail_new",
+  insertNewAction( new TDEAction( i18n( "New Message..." ), "mail_new",
                    CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(),
                    "new_mail" ) );
 
-  insertSyncAction( new KAction( i18n( "Synchronize Mail" ), "reload",
+  insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload",
                    0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(),
                    "sync_mail" ) );
 
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 9713d853f..eded07cbd 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -49,7 +49,7 @@ KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList&
 {
   setInstance( KNodePluginFactory::instance() );
 
-  insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A,
+  insertNewAction( new TDEAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A,
                    this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 725219f4f..d73bd1fbe 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setInstance( new TDEInstance( "knotes" ) );
 
   // create the actions
-  new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
                actionCollection(), "file_new" );
-  new KAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+  new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
                actionCollection(), "edit_rename" );
-  new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+  new TDEAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
                actionCollection(), "edit_delete" );
-  new KAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
                actionCollection(), "print_note" );
 
   // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -398,8 +398,8 @@ void KNotesPart::renamedNote( TQIconViewItem* )
 
 void KNotesPart::slotOnCurrentChanged( TQIconViewItem* )
 {
-  KAction *renameAction = actionCollection()->action( "edit_rename" );
-  KAction *deleteAction = actionCollection()->action( "edit_delete" );
+  TDEAction *renameAction = actionCollection()->action( "edit_rename" );
+  TDEAction *deleteAction = actionCollection()->action( "edit_delete" );
 
   if ( !mNotesView->currentItem() ) {
     renameAction->setEnabled( false );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 91c198af2..648c94c2d 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -147,7 +147,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
       factory.addClient( this );
 
-      mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
+      mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));
 
       layout->addWidget( mTool );
       layout->addWidget( mNoteEdit );
@@ -181,8 +181,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
   private:
     KLineEdit  *mTitleEdit;
     KNoteEdit  *mNoteEdit;
-    KToolBar   *mTool;
-    KPopupMenu *mEditMenu;
+    TDEToolBar   *mTool;
+    TDEPopupMenu *mEditMenu;
 };
 
 
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 2f3f470b8..adf704b1d 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -44,9 +44,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis
 {
   setInstance( KNotesPluginFactory::instance() );
 
-  insertNewAction( new KAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
+  insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
                    this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
-  insertSyncAction( new KAction( i18n( "Synchronize Notes" ), "reload", 0,
+  insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
                    this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
 }
 
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 0bdb167f8..d75bfe76d 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -49,10 +49,10 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL
   setInstance( JournalPluginFactory::instance() );
   instance()->iconLoader()->addAppDir("tdepim");
 
-  insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal",
+  insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal",
                    CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
                    "new_journal" ) );
-  insertSyncAction( new KAction( i18n( "Synchronize Journal" ), "reload",
+  insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload",
                    0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(),
                    "journal_sync" ) );
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 818f3c056..acc95d0f2 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -60,7 +60,7 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
   connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
   connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 
   load();
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 2262dcef3..00ed1e532 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -64,11 +64,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS
   setInstance( KOrganizerPluginFactory::instance() );
   instance()->iconLoader()->addAppDir("tdepim");
 
-  insertNewAction( new KAction( i18n( "New Event..." ), "newappointment",
+  insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment",
                    CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(),
                    "new_event" ) );
 
-  insertSyncAction( new KAction( i18n( "Synchronize Calendar" ), "reload",
+  insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload",
                    0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(),
                    "korganizer_sync" ) );
 
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 451d8df57..416b0a5ad 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -267,7 +267,7 @@ void SummaryWidget::removeEvent( const TQString &uid )
 
 void SummaryWidget::popupMenu( const TQString &uid )
 {
-  KPopupMenu popup( this );
+  TDEPopupMenu popup( this );
   TQToolTip::remove( this );
   popup.insertItem( i18n( "&Edit Appointment..." ), 0 );
   popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index e3ff2ba8f..5c6ce7e9d 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -61,11 +61,11 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
   setInstance( TodoPluginFactory::instance() );
   instance()->iconLoader()->addAppDir("tdepim");
 
-  insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo",
+  insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo",
                    CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
                    "new_todo" ) );
 
-  insertSyncAction( new KAction( i18n( "Synchronize To-do List" ), "reload",
+  insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload",
                    0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(),
                    "todo_sync" ) );
 
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 818eac7c4..996ea070f 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -224,7 +224,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
 
 void TodoSummaryWidget::popupMenu( const TQString &uid )
 {
-  KPopupMenu popup( this );
+  TDEPopupMenu popup( this );
   TQToolTip::remove( this );
   popup.insertItem( i18n( "&Edit To-do..." ), 0 );
   popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small),
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 958959667..ce433d053 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -146,7 +146,7 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
   connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) );
   connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) );
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 
   load();
 }
@@ -334,7 +334,7 @@ void KCMKontactKNT::initGUI()
   TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
-  mAllNews = new KListView( this );
+  mAllNews = new TDEListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
@@ -351,7 +351,7 @@ void KCMKontactKNT::initGUI()
   vbox->addWidget( mRemoveButton );
   vbox->addStretch();
 
-  mSelectedNews = new KListView( this );
+  mSelectedNews = new TDEListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
   layout->addWidget( mSelectedNews, 0, 2 );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index cd3cbf0ee..a44cae7fb 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -30,7 +30,7 @@ class TQListViewItem;
 class TQSpinxBox;
 
 class TDEAboutData;
-class KListView;
+class TDEListView;
 class KPushButton;
 
 class NewsItem;
@@ -68,8 +68,8 @@ class KCMKontactKNT : public TDECModule
 
     bool dcopActive() const;
 
-    KListView *mAllNews;
-    KListView *mSelectedNews;
+    TDEListView *mAllNews;
+    TDEListView *mSelectedNews;
     TQListViewItem *mCustomItem;
 
     KPushButton *mAddButton;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index a15d1118c..e88911bad 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -63,7 +63,7 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
   connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
   connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 
   load();
 }
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 4857f1035..32aab8d0a 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -574,7 +574,7 @@ void SDSummaryWidget::viewContact( const TQString &uid )
 
 void SDSummaryWidget::popupMenu( const TQString &uid )
 {
-  KPopupMenu popup( this );
+  TDEPopupMenu popup( this );
   popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ),
                     i18n( "Send &Mail" ), 0 );
   popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ),
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 91f33d3fc..e1e3c7f00 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -51,7 +51,7 @@ extern "C"
 class PluginItem : public TQCheckListItem
 {
   public:
-    PluginItem( KPluginInfo *info, KListView *parent )
+    PluginItem( KPluginInfo *info, TDEListView *parent )
       : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ),
         mInfo( info )
     {
@@ -79,7 +79,7 @@ class PluginItem : public TQCheckListItem
 };
 
 PluginView::PluginView( TQWidget *parent, const char *name )
-  : KListView( parent, name )
+  : TDEListView( parent, name )
 {
   addColumn( i18n( "Name" ) );
   setAllColumnsShowFocus( true );
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 3e624798d..75cd79821 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -30,7 +30,7 @@
 
 class KPluginInfo;
 
-class PluginView : public KListView
+class PluginView : public TDEListView
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 27dac829f..335651cbd 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -88,7 +88,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
   connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
            info, TQT_SIGNAL( textChanged( const TQString& ) ) );
 
-  mConfigAction = new KAction( i18n( "&Configure Summary View..." ),
+  mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ),
                                "configure", 0, this,
                                TQT_SLOT( slotConfigure() ), actionCollection(),
                                "summaryview_configure" );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 9de42432e..03b37d033 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -46,7 +46,7 @@ namespace KParts
 class TQFrame;
 class TQLabel;
 class TQGridLayout;
-class KAction;
+class TDEAction;
 class KCMultiDialog;
 
 class SummaryViewPart : public KParts::ReadOnlyPart
@@ -95,7 +95,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
     TQVBoxLayout *mRightColumn;
     TQLabel *mUsernameLabel;
     TQLabel *mDateLabel;
-    KAction *mConfigAction;
+    TDEAction *mConfigAction;
 
     TQStringList mLeftColumnSummaries;
     TQStringList mRightColumnSummaries;
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index a7bb89960..21c3a24c5 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -39,7 +39,7 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
 {
   setInstance( SummaryViewFactory::instance() );
 
-  mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 
+  mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 
                                    0, actionCollection(),
                                    "kontact_summary_sync" );
   connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
@@ -90,8 +90,8 @@ void SummaryView::doSync()
   for ( TQValueList<Kontact::Plugin*>::ConstIterator it = pluginList.begin(), end = pluginList.end();
         it != end; ++it ) {
     // execute all sync actions but our own
-    TQPtrList<KAction> *actions = (*it)->syncActions();
-    for ( TQPtrList<KAction>::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) {
+    TQPtrList<TDEAction> *actions = (*it)->syncActions();
+    for ( TQPtrList<TDEAction>::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) {
       if ( *jt != mSyncAction )
         (*jt)->activate();
     }
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 336f43dbd..ad14ce2ec 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -28,7 +28,7 @@
 
 #include <tqmap.h>
 
-class KSelectAction;
+class TDESelectAction;
 
 class SummaryViewPart;
 
@@ -57,7 +57,7 @@ class SummaryView : public Kontact::Plugin
   private:
     TDEAboutData *mAboutData;
     SummaryViewPart *mPart;
-    KSelectAction *mSyncAction; 
+    TDESelectAction *mSyncAction; 
 };
 
 #endif
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index b8e6f70cb..846717ee8 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -48,7 +48,7 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
   m_edit = new TQTextEdit;
   setWidget(m_edit);
   setXMLFile("testpartui.rc");
-  new KAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
+  new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
   m_kab_stub = 0L;
 
   new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index bf5d00577..b5ca0462f 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -39,7 +39,7 @@ TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringLis
 {
   setInstance(TestPluginFactory::instance());
 
-  insertNewAction(new KAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
+  insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
 
   setXMLFile("kptestplugin.rc");
 }