Rename a number of classes to enhance compatibility with KDE4

1 files changed, 69 insertions, 69 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 4ceb95a1b..7eef7539c 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -219,7 +219,7 @@ void ActionManager::initCalendar( Calendar *cal )
 
 void ActionManager::initActions()
 {
-  KAction *action;
+  TDEAction *action;
 
 
   //*************************** FILE MENU **********************************
@@ -252,32 +252,32 @@ void ActionManager::initActions()
 
 
   //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  new KAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ),
+  new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ),
                mACollection, "import_icalendar" );
-  new KAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ),
+  new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ),
                mACollection, "import_ical" );
-  new KAction( i18n("Get &Hot New Stuff..."), 0, this,
+  new TDEAction( i18n("Get &Hot New Stuff..."), 0, this,
                TQT_SLOT( downloadNewStuff() ), mACollection,
                "downloadnewstuff" );
 
-  new KAction( i18n("Export &Web Page..."), "webexport", 0,
+  new TDEAction( i18n("Export &Web Page..."), "webexport", 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ),
                mACollection, "export_web" );
-  new KAction( i18n("&iCalendar..."), 0,
+  new TDEAction( i18n("&iCalendar..."), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ),
                mACollection, "export_icalendar" );
-  new KAction( i18n("&vCalendar..."), 0,
+  new TDEAction( i18n("&vCalendar..."), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ),
                mACollection, "export_vcalendar" );
-  new KAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this),
+  new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this),
                TQT_SLOT( uploadNewStuff() ), mACollection,
                "uploadnewstuff" );
 
 
 
-  new KAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ),
+  new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ),
                     mACollection, "file_archive" );
-  new KAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
+  new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection,
                "purge_completed" );
 
@@ -285,7 +285,7 @@ void ActionManager::initActions()
 
 
   //************************** EDIT MENU *********************************
-  KAction *pasteAction;
+  TDEAction *pasteAction;
   KOrg::History *h = mCalendarView->history();
   if ( mIsPart ) {
     // edit menu
@@ -309,7 +309,7 @@ void ActionManager::initActions()
     mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection );
     mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection );
   }
-  mDeleteAction = new KAction( i18n("&Delete"), "editdelete", 0,
+  mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", 0,
                                TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ),
                                mACollection, "edit_delete" );
   if ( mIsPart ) {
@@ -335,60 +335,60 @@ void ActionManager::initActions()
   //************************** VIEW MENU *********************************
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  new KAction( i18n("What's &Next"),
+  new TDEAction( i18n("What's &Next"),
                KOGlobals::self()->smallIcon( "whatsnext" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ),
                mACollection, "view_whatsnext" );
-  new KAction( i18n("&Day"),
+  new TDEAction( i18n("&Day"),
                KOGlobals::self()->smallIcon( "1day" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showDayView() ),
                mACollection, "view_day" );
-  mNextXDays = new KAction( "",
+  mNextXDays = new TDEAction( "",
                             KOGlobals::self()->smallIcon( "xdays" ), 0,
                             mCalendarView->viewManager(),
                             TQT_SLOT( showNextXView() ),
                             mACollection, "view_nextx" );
   mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days",
                              KOPrefs::instance()->mNextXDays ) );
-  new KAction( i18n("W&ork Week"),
+  new TDEAction( i18n("W&ork Week"),
                KOGlobals::self()->smallIcon( "5days" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ),
                mACollection, "view_workweek" );
-  new KAction( i18n("&Week"),
+  new TDEAction( i18n("&Week"),
                KOGlobals::self()->smallIcon( "7days" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showWeekView() ),
                mACollection, "view_week" );
-  new KAction( i18n("&Month"),
+  new TDEAction( i18n("&Month"),
                KOGlobals::self()->smallIcon( "month" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showMonthView() ),
                mACollection, "view_month" );
-  new KAction( i18n("&List"),
+  new TDEAction( i18n("&List"),
                KOGlobals::self()->smallIcon( "list" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showListView() ),
                mACollection, "view_list" );
-  new KAction( i18n("&To-do List"),
+  new TDEAction( i18n("&To-do List"),
                KOGlobals::self()->smallIcon( "todo" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showTodoView() ),
                mACollection, "view_todo" );
-  new KAction( i18n("&Journal"),
+  new TDEAction( i18n("&Journal"),
                KOGlobals::self()->smallIcon( "journal" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showJournalView() ),
                mACollection, "view_journal" );
-  new KAction( i18n("&Timeline View"),
+  new TDEAction( i18n("&Timeline View"),
                KOGlobals::self()->smallIcon( "timeline" ), 0,
                mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ),
                mACollection, "view_timeline" );
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  new KAction( i18n("&Refresh"), 0,
+  new TDEAction( i18n("&Refresh"), 0,
                     TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ),
                     mACollection, "update" );
 // TODO:
-//   new KAction( i18n("Hide &Completed To-dos"), 0,
+//   new TDEAction( i18n("Hide &Completed To-dos"), 0,
 //                     mCalendarView, TQT_SLOT( toggleHideCompleted() ),
 //                     mACollection, "hide_completed_todos" );
 
-  mFilterAction = new KSelectAction( i18n("F&ilter"), 0,
+  mFilterAction = new TDESelectAction( i18n("F&ilter"), 0,
                   mACollection, "filter_select" );
   mFilterAction->setEditable( false );
   connect( mFilterAction, TQT_SIGNAL( activated(int) ),
@@ -403,16 +403,16 @@ void ActionManager::initActions()
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   // TODO: try to find / create better icons for the following 4 actions
-  new KAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0,
+  new TDEAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ),
                     mACollection, "zoom_in_horizontally" );
-  new KAction( i18n( "Zoom Out Horizontally" ), "viewmag-", 0,
+  new TDEAction( i18n( "Zoom Out Horizontally" ), "viewmag-", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ),
                     mACollection, "zoom_out_horizontally" );
-  new KAction( i18n( "Zoom In Vertically" ), "viewmag+", 0,
+  new TDEAction( i18n( "Zoom In Vertically" ), "viewmag+", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ),
                     mACollection, "zoom_in_vertically" );
-  new KAction( i18n( "Zoom Out Vertically" ), "viewmag-", 0,
+  new TDEAction( i18n( "Zoom Out Vertically" ), "viewmag-", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ),
                     mACollection, "zoom_out_vertically" );
 
@@ -421,11 +421,11 @@ void ActionManager::initActions()
 
   //************************** Actions MENU *********************************
 
-  new KAction( i18n("Go to &Today"), "today", 0,
+  new TDEAction( i18n("Go to &Today"), "today", 0,
                     TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ),
                     mACollection, "go_today" );
   bool isRTL = TQApplication::reverseLayout();
-  action = new KAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
+  action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
                         TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ),
                         mACollection, "go_previous" );
 
@@ -437,7 +437,7 @@ void ActionManager::initActions()
   connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
            TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/
 
-  action = new KAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
+  action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
                         TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ),
                         mACollection, "go_next" );
   /*
@@ -447,47 +447,47 @@ void ActionManager::initActions()
 
 
   //************************** Actions MENU *********************************
-  new KAction( i18n("New E&vent..."),
+  new TDEAction( i18n("New E&vent..."),
                KOGlobals::self()->smallIcon( "newappointment" ), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()),
                mACollection, "new_event" );
-  new KAction( i18n("New &To-do..."),
+  new TDEAction( i18n("New &To-do..."),
                KOGlobals::self()->smallIcon( "newtodo" ), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()),
                mACollection, "new_todo" );
-  action = new KAction( i18n("New Su&b-to-do..."), 0,
+  action = new TDEAction( i18n("New Su&b-to-do..."), 0,
                         TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ),
                         mACollection, "new_subtodo" );
   action->setEnabled( false );
   connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ),
            action,TQT_SLOT( setEnabled( bool ) ) );
-  new KAction( i18n("New &Journal..."),
+  new TDEAction( i18n("New &Journal..."),
                KOGlobals::self()->smallIcon( "newjournal" ), 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()),
                mACollection, "new_journal" );
 
-  mShowIncidenceAction = new KAction( i18n("&Show"), 0,
+  mShowIncidenceAction = new TDEAction( i18n("&Show"), 0,
                                       TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ),
                                       mACollection, "show_incidence" );
-  mEditIncidenceAction = new KAction( i18n("&Edit..."), 0,
+  mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0,
                                       TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ),
                                       mACollection, "edit_incidence" );
-  mDeleteIncidenceAction = new KAction( i18n("&Delete"), Key_Delete,
+  mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete,
                                         TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()),
                                         mACollection, "delete_incidence" );
 
-  action = new KAction( i18n("&Make Sub-to-do Independent"), 0,
+  action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0,
                         TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ),
                         mACollection, "unsub_todo" );
   action->setEnabled( false );
   connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ),
            action,TQT_SLOT( setEnabled( bool ) ) );
 // TODO: Add item to move the incidence to different resource
-//   mAssignResourceAction = new KAction( i18n("Assign &Resource..."), 0,
+//   mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0,
 //                                        mCalendarView, TQT_SLOT( assignResource()),
 //                                        mACollection, "assign_resource" );
 // TODO: Add item to quickly toggle the reminder of a given incidence
-//   mToggleAlarmAction = new KToggleAction( i18n("&Activate Reminder"), 0,
+//   mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0,
 //                                         mCalendarView, TQT_SLOT( toggleAlarm()),
 //                                         mACollection, "activate_alarm" );
 
@@ -495,12 +495,12 @@ void ActionManager::initActions()
 
 
   //************************** SCHEDULE MENU ********************************
-  mPublishEvent = new KAction( i18n("&Publish Item Information..."), "mail_send", 0,
+  mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail_send", 0,
                                TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ),
                                mACollection, "schedule_publish" );
   mPublishEvent->setEnabled( false );
 
-  mSendInvitation = new KAction( i18n( "Send &Invitation to Attendees" ),
+  mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ),
                                  "mail_generic", 0,
                                  TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()),
                                  mACollection, "schedule_request" );
@@ -508,21 +508,21 @@ void ActionManager::initActions()
   connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
            mSendInvitation, TQT_SLOT(setEnabled(bool)) );
 
-  mRequestUpdate = new KAction( i18n( "Re&quest Update" ), 0,
+  mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0,
                                 TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()),
                                 mACollection, "schedule_refresh" );
   mRequestUpdate->setEnabled( false );
   connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
            mRequestUpdate, TQT_SLOT(setEnabled(bool)) );
 
-  mSendCancel = new KAction( i18n( "Send &Cancelation to Attendees" ), 0,
+  mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0,
                              TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()),
                              mACollection, "schedule_cancel" );
   mSendCancel->setEnabled( false );
   connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
            mSendCancel, TQT_SLOT(setEnabled(bool)) );
 
-  mSendStatusUpdate = new KAction( i18n( "Send Status &Update" ),
+  mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ),
                                    "mail_reply", 0,
                                    TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()),
                                    mACollection, "schedule_reply" );
@@ -530,30 +530,30 @@ void ActionManager::initActions()
   connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
            mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) );
 
-  mRequestChange = new KAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
+  mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
                                 TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()),
                                 mACollection, "schedule_counter" );
   mRequestChange->setEnabled( false );
   connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
            mRequestChange, TQT_SLOT(setEnabled(bool)) );
 
-  mForwardEvent = new KAction( i18n("&Send as iCalendar..."), "mail_forward", 0,
+  mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail_forward", 0,
                                TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()),
                                mACollection, "schedule_forward" );
   mForwardEvent->setEnabled( false );
 
-  action = new KAction( i18n("&Mail Free Busy Information..."), 0,
+  action = new TDEAction( i18n("&Mail Free Busy Information..."), 0,
                         TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ),
                         mACollection, "mail_freebusy" );
   action->setEnabled( true );
 
-  action = new KAction( i18n("&Upload Free Busy Information"), 0,
+  action = new TDEAction( i18n("&Upload Free Busy Information"), 0,
                         TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ),
                         mACollection, "upload_freebusy" );
   action->setEnabled( true );
 
   if ( !mIsPart ) {
-      action = new KAction( i18n("&Addressbook"),"contents",0,
+      action = new TDEAction( i18n("&Addressbook"),"contents",0,
                             TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ),
                             mACollection,"addressbook" );
   }
@@ -564,13 +564,13 @@ void ActionManager::initActions()
   //************************** SETTINGS MENU ********************************
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  mDateNavigatorShowAction = new KToggleAction( i18n("Show Date Navigator"), 0,
+  mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0,
                       TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ),
                       mACollection, "show_datenavigator" );
-  mTodoViewShowAction = new KToggleAction ( i18n("Show To-do View"), 0,
+  mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0,
                       TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ),
                       mACollection, "show_todoview" );
-  mEventViewerShowAction = new KToggleAction ( i18n("Show Item Viewer"), 0,
+  mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0,
                       TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ),
                       mACollection, "show_eventviewer" );
   TDEConfig *config = KOGlobals::self()->config();
@@ -589,10 +589,10 @@ void ActionManager::initActions()
   toggleEventViewer();
 
   if ( !mMainWindow->hasDocument() ) {
-    mResourceViewShowAction = new KToggleAction ( i18n("Show Resource View"), 0,
+    mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0,
                         TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ),
                         mACollection, "show_resourceview" );
-    mResourceButtonsAction = new KToggleAction( i18n("Show &Resource Buttons"), 0,
+    mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0,
                         TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ),
                         mACollection, "show_resourcebuttons" );
     mResourceViewShowAction->setChecked(
@@ -607,21 +607,21 @@ void ActionManager::initActions()
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  new KAction( i18n("Configure &Date && Time..."), 0,
+  new TDEAction( i18n("Configure &Date && Time..."), 0,
                     TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ),
                     mACollection, "conf_datetime" );
 // TODO: Add an item to show the resource management dlg
-//   new KAction( i18n("Manage &Resources..."), 0,
+//   new TDEAction( i18n("Manage &Resources..."), 0,
 //                     TQT_TQOBJECT(this), TQT_SLOT( manageResources() ),
 //                     mACollection, "conf_resources" );
-  new KAction( i18n("Manage View &Filters..."), "configure", 0,
+  new TDEAction( i18n("Manage View &Filters..."), "configure", 0,
                TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ),
                mACollection, "edit_filters" );
-  new KAction( i18n("Manage C&ategories..."), 0,
+  new TDEAction( i18n("Manage C&ategories..."), 0,
                TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ),
                mACollection, "edit_categories" );
   if ( mIsPart ) {
-    new KAction( i18n("&Configure Calendar..."), "configure", 0,
+    new TDEAction( i18n("&Configure Calendar..."), "configure", 0,
                  TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
                  mACollection, "korganizer_configure" );
     KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
@@ -638,7 +638,7 @@ void ActionManager::initActions()
   //**************************** HELP MENU **********************************
   KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection,
                         "help_tipofday" );
-//   new KAction( i18n("Show Intro Page"), 0,
+//   new TDEAction( i18n("Show Intro Page"), 0,
 //                     mCalendarView,TQT_SLOT( showIntro() ),
 //                     mACollection,"show_intro" );
 
@@ -1434,7 +1434,7 @@ class ActionManager::ActionStringsVisitor : public IncidenceBase::Visitor
   public:
     ActionStringsVisitor() : mShow( 0 ), mEdit( 0 ), mDelete( 0 ) {}
 
-    bool act( IncidenceBase *incidence, KAction *show, KAction *edit, KAction *del )
+    bool act( IncidenceBase *incidence, TDEAction *show, TDEAction *edit, TDEAction *del )
     {
       mShow = show;
       mEdit = edit;
@@ -1463,9 +1463,9 @@ class ActionManager::ActionStringsVisitor : public IncidenceBase::Visitor
       if ( mDelete ) mDelete->setText( i18n("&Delete") );
       return true;
     }
-    KAction *mShow;
-    KAction *mEdit;
-    KAction *mDelete;
+    TDEAction *mShow;
+    TDEAction *mEdit;
+    TDEAction *mDelete;
 };
 
 void ActionManager::processIncidenceSelection( Incidence *incidence, const TQDate & )
@@ -1667,7 +1667,7 @@ void ActionManager::openEventEditor( const TQString & summary,
   if ( attachmentMimetype != "message/rfc822" ) {
     action = KOPrefs::Link;
   } else if ( KOPrefs::instance()->defaultEmailAttachMethod() == KOPrefs::Ask ) {
-    KPopupMenu *menu = new KPopupMenu( 0 );
+    TDEPopupMenu *menu = new TDEPopupMenu( 0 );
     menu->insertItem( i18n("Attach as &link"), KOPrefs::Link );
     menu->insertItem( i18n("Attach &inline"), KOPrefs::InlineFull );
     menu->insertItem( i18n("Attach inline &without attachments"), KOPrefs::InlineBody );
@@ -1790,7 +1790,7 @@ void ActionManager::openTodoEditor(const TQString & summary,
   if ( attachmentMimetype != "message/rfc822" ) {
     action = KOPrefs::TodoAttachLink;
   } else if ( KOPrefs::instance()->defaultTodoAttachMethod() == KOPrefs::TodoAttachAsk ) {
-    KPopupMenu *menu = new KPopupMenu( 0 );
+    TDEPopupMenu *menu = new TDEPopupMenu( 0 );
     menu->insertItem( i18n("Attach as &link"), KOPrefs::TodoAttachLink );
     menu->insertItem( i18n("Attach &inline"), KOPrefs::TodoAttachInlineFull );
     menu->insertSeparator();