Rename a number of classes to enhance compatibility with KDE4

6 files changed, 9 insertions, 9 deletions

diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 0bdb167f..d75bfe76 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 818f3c05..acc95d0f 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 2262dcef..00ed1e53 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 451d8df5..416b0a5a 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 e3ff2ba8..5c6ce7e9 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 818eac7c..996ea070 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),