diff options
Diffstat (limited to 'korganizer')
27 files changed, 169 insertions, 169 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(); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 1d7d99157..3494ecffe 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -45,11 +45,11 @@ namespace KOrg { class MainWindow; } -class KAction; -class KActionCollection; -class KRecentFilesAction; -class KSelectAction; -class KToggleAction; +class TDEAction; +class TDEActionCollection; +class TDERecentFilesAction; +class TDESelectAction; +class TDEToggleAction; class TDEConfig; class TDEProcess; class KTempFile; @@ -387,41 +387,41 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface static KOWindowList *mWindowList; // Actions - KRecentFilesAction *mRecent; - KToggleAction *mResourceButtonsAction; + TDERecentFilesAction *mRecent; + TDEToggleAction *mResourceButtonsAction; - KToggleAction *mDateNavigatorShowAction; - KToggleAction *mTodoViewShowAction; - KToggleAction *mResourceViewShowAction; - KToggleAction *mEventViewerShowAction; -// KToggleAction *mToggleAlarmAction; + TDEToggleAction *mDateNavigatorShowAction; + TDEToggleAction *mTodoViewShowAction; + TDEToggleAction *mResourceViewShowAction; + TDEToggleAction *mEventViewerShowAction; +// TDEToggleAction *mToggleAlarmAction; - KAction *mShowIncidenceAction; - KAction *mEditIncidenceAction; - KAction *mDeleteIncidenceAction; -// KAction *mAssignResourceAction; + TDEAction *mShowIncidenceAction; + TDEAction *mEditIncidenceAction; + TDEAction *mDeleteIncidenceAction; +// TDEAction *mAssignResourceAction; - KAction *mCutAction; - KAction *mCopyAction; - KAction *mDeleteAction; - KAction *mNextXDays; - KAction *mPublishEvent; - KAction *mForwardEvent; + TDEAction *mCutAction; + TDEAction *mCopyAction; + TDEAction *mDeleteAction; + TDEAction *mNextXDays; + TDEAction *mPublishEvent; + TDEAction *mForwardEvent; - KAction *mSendInvitation; - KAction *mSendCancel; - KAction *mSendStatusUpdate; + TDEAction *mSendInvitation; + TDEAction *mSendCancel; + TDEAction *mSendStatusUpdate; - KAction *mRequestChange; - KAction *mRequestUpdate; + TDEAction *mRequestChange; + TDEAction *mRequestUpdate; - KAction *mUndoAction; - KAction *mRedoAction; + TDEAction *mUndoAction; + TDEAction *mRedoAction; - KSelectAction *mFilterAction; + TDESelectAction *mFilterAction; KXMLGUIClient *mGUIClient; - KActionCollection *mACollection; + TDEActionCollection *mACollection; CalendarView *mCalendarView; KOrg::MainWindow *mMainWindow; bool mIsPart; diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h index 0a8aa7fe9..64d3dbfb8 100644 --- a/korganizer/customlistviewitem.h +++ b/korganizer/customlistviewitem.h @@ -29,13 +29,13 @@ #include <klistview.h> template<class T> -class CustomListViewItem : public KListViewItem +class CustomListViewItem : public TDEListViewItem { public: - CustomListViewItem( T data, KListView *parent ) : - KListViewItem( parent ), mData( data ) { updateItem(); }; - CustomListViewItem( T data, KListView *parent, KListViewItem* after ) : - KListViewItem( parent, after ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, TDEListView *parent ) : + TDEListViewItem( parent ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, TDEListView *parent, TDEListViewItem* after ) : + TDEListViewItem( parent, after ), mData( data ) { updateItem(); }; ~CustomListViewItem() {}; void updateItem() {}; diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h index dcda1bee5..f8d32f7d7 100644 --- a/korganizer/interfaces/korganizer/mainwindow.h +++ b/korganizer/interfaces/korganizer/mainwindow.h @@ -24,8 +24,8 @@ #include <tqwidget.h> -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class ActionManager; @@ -76,7 +76,7 @@ class MainWindow /** Return actionCollection of this main window. */ - virtual KActionCollection *getActionCollection() const = 0; + virtual TDEActionCollection *getActionCollection() const = 0; /** Show status mesage in status bar. */ diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index cf6fa1021..a8a8095ea 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -515,7 +515,7 @@ void KODayMatrix::dropEvent( TQDropEvent *e ) } else if ( keybstate & ShiftMask ) { action = DRAG_MOVE; } else { - KPopupMenu *menu = new KPopupMenu( this ); + TDEPopupMenu *menu = new TDEPopupMenu( this ); if ( existingEvent || existingTodo ) { menu->insertItem( i18n("Move"), DRAG_MOVE, 0 ); if (existingEvent) diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 74e908889..ae8e15af1 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -488,14 +488,14 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, topLayout->addWidget( mRemoveBtn ); connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) ); - mContextMenu = new KPopupMenu( this ); + mContextMenu = new TDEPopupMenu( this ); - KActionCollection* ac = new KActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); + TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); - mOpenAction = new KAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); + mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); mOpenAction->plug( mContextMenu ); - mSaveAsAction = new KAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); + mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); mSaveAsAction->plug( mContextMenu ); mContextMenu->insertSeparator(); @@ -503,16 +503,16 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, mCopyAction->plug( mContextMenu ); mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac ); mCutAction->plug( mContextMenu ); - KAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); + TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); action->plug( mContextMenu ); mContextMenu->insertSeparator(); - mDeleteAction = new KAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); + mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); mDeleteAction->plug( mContextMenu ); mDeleteAction->setShortcut( Key_Delete ); mContextMenu->insertSeparator(); - mEditAction = new KAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); + mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); mEditAction->plug( mContextMenu ); selectionChanged(); @@ -579,7 +579,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) probablyWeHaveUris = true; } - KPopupMenu menu; + TDEPopupMenu menu; int items=0; if ( probablyWeHaveUris ) { menu.insertItem( i18n( "&Link here" ), DRAG_LINK, items++ ); diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h index 479ce36a8..7d5b89d5a 100644 --- a/korganizer/koeditorattachments.h +++ b/korganizer/koeditorattachments.h @@ -49,7 +49,7 @@ class TQMimeSource; class TQPushButton; class TQPopupMenu; -class KAction; +class TDEAction; class KLineEdit; class KURLRequester; class KTempDir; @@ -140,12 +140,12 @@ class KOEditorAttachments : public TQWidget AttachmentIconView *mAttachments; TQPushButton *mRemoveBtn; TQPopupMenu *mContextMenu, *mAddMenu; - KAction *mOpenAction; - KAction *mSaveAsAction; - KAction *mCopyAction; - KAction *mCutAction; - KAction *mDeleteAction; - KAction *mEditAction; + TDEAction *mOpenAction; + TDEAction *mSaveAsAction; + TDEAction *mCopyAction; + TDEAction *mCutAction; + TDEAction *mDeleteAction; + TDEAction *mEditAction; }; diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index adeb9bb00..ebc70200b 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -92,14 +92,14 @@ void CustomListViewItem<KCal::Attendee *>::updateItem() } KOAttendeeListView::KOAttendeeListView ( TQWidget *parent, const char *name ) - : KListView(parent, name) + : TDEListView(parent, name) { setAcceptDrops( true ); setAllColumnsShowFocus( true ); setSorting( -1 ); } -/** KOAttendeeListView is a child class of KListView which supports +/** KOAttendeeListView is a child class of TDEListView which supports * dropping of attendees (e.g. from kaddressbook) onto it. If an attendeee * was dropped, the signal dropped(Attendee*) is emitted. Valid drop classes * are KVCardDrag and TQTextDrag. @@ -265,7 +265,7 @@ void KOEditorDetails::insertAttendee( Attendee *a, bool goodEmailAddress ) // lastItem() is O(n), but for n very small that should be fine AttendeeListItem *item = new AttendeeListItem( - a, mListView, static_cast<KListViewItem*>( mListView->lastItem() ) ); + a, mListView, static_cast<TDEListViewItem*>( mListView->lastItem() ) ); mListView->setSelected( item, true ); emit updateAttendeeSummary( mListView->childCount() ); } diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 10d61e213..bb4f7b109 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -52,12 +52,12 @@ class AddresseeLineEdit; typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem; -/** KOAttendeeListView is a child class of KListView which supports +/** KOAttendeeListView is a child class of TDEListView which supports * dropping of attendees (e.g. from kaddressbook) onto it. If an attendeee * was dropped, the signal dropped(Attendee*) is emitted. Valid drop classes * are KVCardDrag and TQTextDrag. */ -class KOAttendeeListView : public KListView +class KOAttendeeListView : public TDEListView { Q_OBJECT @@ -117,7 +117,7 @@ class KOEditorDetails : public KOAttendeeEditor private: bool mDisableItemUpdate; - KListView *mListView; + TDEListView *mListView; // KOEditorFreeBusy *mFreeBusy; }; diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 3c5dd5196..3562bc16b 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -195,7 +195,7 @@ void KOEventPopupMenu::forward() KOrg::MainWindow *w = ActionManager::findInstance( KURL() ); if ( !w || !mCurrentIncidence ) return; - KActionCollection *ac = w->getActionCollection(); - KAction *action = ac->action( "schedule_forward" ); + TDEActionCollection *ac = w->getActionCollection(); + TDEAction *action = ac->action( "schedule_forward" ); action->activate(); } diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 388e35699..89b4851e2 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -171,7 +171,7 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e ) return; } - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem( i18n( "Open Attachment" ), 0 ); menu->insertItem( i18n( "Save Attachment As..." ), 1 ); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 189a43b7f..d33f185d9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -58,7 +58,7 @@ enum { KOListViewToolTip::KOListViewToolTip( TQWidget* parent, Calendar *calendar, - KListView *lv ) + TDEListView *lv ) :TQToolTip( parent ), mCalendar( calendar ) { eventlist = lv; @@ -204,7 +204,7 @@ KOListView::KOListView( Calendar *calendar, mActiveItem = 0; mIsNonInteractive = nonInteractive; - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->addColumn( i18n("Summary") ); mListView->addColumn( i18n("Reminder") ); // alarm set? mListView->setColumnAlignment( Reminder_Column, AlignHCenter ); diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index bee6eb4a0..70ba080ce 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -44,14 +44,14 @@ class KOListView; class KOListViewToolTip : public TQToolTip { public: - KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv ); + KOListViewToolTip ( TQWidget* parent, Calendar *calendar, TDEListView* lv ); protected: void maybeTip( const TQPoint &pos ); private: Calendar *mCalendar; - KListView* eventlist; + TDEListView* eventlist; }; @@ -117,7 +117,7 @@ class KOListView : public KOEventView private: class ListItemVisitor; - KListView *mListView; + TDEListView *mListView; KOEventPopupMenu *mPopupMenu; KOListViewItem *mActiveItem; TQDict<Incidence> mUidDict; diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index bd005bc17..55de923ac 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -62,11 +62,11 @@ static int defSuspendVal = 5; static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks -class AlarmListItem : public KListViewItem +class AlarmListItem : public TDEListViewItem { public: AlarmListItem( const TQString &uid, TQListView *parent ) - : KListViewItem( parent ), mUid( uid ), mNotified( false ) + : TDEListViewItem( parent ), mUid( uid ), mNotified( false ) { } @@ -90,7 +90,7 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co AlarmListItem *pItem = static_cast<AlarmListItem *>( item ); return pItem->mHappening.secsTo( mHappening ); } else { - return KListViewItem::compare( item, iCol, bAscending ); + return TDEListViewItem::compare( item, iCol, bAscending ); } } @@ -126,7 +126,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); - mIncidenceListView = new KListView( mSplitter ); + mIncidenceListView = new TDEListView( mSplitter ); mIncidenceListView->addColumn( i18n( "Summary" ) ); mIncidenceListView->addColumn( i18n( "Date, Time" ) ); mIncidenceListView->setSorting( 0, true ); diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index d3e3af411..949c17f7d 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -38,7 +38,7 @@ using namespace KCal; class AlarmListItem; class KOEventViewer; class KComboBox; -class KListView; +class TDEListView; class TQSpinBox; class TQSplitter; @@ -100,7 +100,7 @@ class AlarmDialog : public KDialogBase { TQValueList<AlarmListItem*> selectedItems() const; CalendarResources *mCalendar; - KListView *mIncidenceListView; + TDEListView *mIncidenceListView; KOEventViewer *mDetailView; TQSpinBox *mSuspendSpin; diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 051fe446e..d20d30f9c 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -79,9 +79,9 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) // Disable standard quit behaviour. We have to intercept the quit even, if the // main window is hidden. - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); const char *quitName = KStdAction::name( KStdAction::Quit ); - KAction *quit = ac->action( quitName ); + TDEAction *quit = ac->action( quitName ); if ( !quit ) { kdDebug(5890) << "No Quit standard action." << endl; } else { diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index 4c15fb39e..76505f7f4 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -38,9 +38,9 @@ #include <tdeparts/mainwindow.h> class KTempFile; -class KRecentFilesAction; +class TDERecentFilesAction; class KOWindowList; -class KToggleAction; +class TDEToggleAction; class TDEProcess; class KONewStuff; class ActionManager; @@ -55,7 +55,7 @@ typedef KOrg::MainWindow KOrgMainWindow; typedef KParts::MainWindow KPartsMainWindow; /** - This is the main class for KOrganizer. It extends the KDE KMainWindow. + This is the main class for KOrganizer. It extends the KDE TDEMainWindow. it provides the main view that the user sees upon startup, as well as menus, buttons, etc. etc. @@ -78,7 +78,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow KOrg::CalendarViewBase *view() const; ActionManager *actionManager() { return mActionManager; } - KActionCollection *getActionCollection() const { return actionCollection(); } + TDEActionCollection *getActionCollection() const { return actionCollection(); } /** Open calendar file from URL. Merge into current calendar, if \a merge is diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 416e39b90..21e96462c 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -81,7 +81,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, virtual KXMLGUIClient *mainGuiClient() { return this; } virtual TQWidget *topLevelWidget(); virtual ActionManager *actionManager(); - virtual KActionCollection *getActionCollection() const { return actionCollection(); } + virtual TDEActionCollection *getActionCollection() const { return actionCollection(); } virtual void showStatusMessage( const TQString &message ); virtual bool isCurrentlyActivePart(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f065d5777..703ec040b 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -101,7 +101,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) KOTodoListView::KOTodoListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) + : TDEListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) { mOldCurrent = 0; mMousePressed = false; @@ -128,7 +128,7 @@ bool KOTodoListView::event(TQEvent *e) if(e->type()==TQEvent::ApplicationPaletteChange) { - KListView::event(e); + TDEListView::event(e); i=(KOTodoViewItem *)itemAtIndex(tmp); while(i!=0) @@ -140,7 +140,7 @@ bool KOTodoListView::event(TQEvent *e) } - return (KListView::event(e) || e->type()==TQEvent::ApplicationPaletteChange); + return (TDEListView::event(e) || e->type()==TQEvent::ApplicationPaletteChange); } void KOTodoListView::contentsDragEnterEvent(TQDragEnterEvent *e) diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index a7728159e..48a3da844 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -69,7 +69,7 @@ class KOTodoListViewToolTip : public TQToolTip }; -class KOTodoListView : public KListView +class KOTodoListView : public TDEListView { Q_OBJECT diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e69d61adb..5d277ac8d 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -170,9 +170,9 @@ void KOViewManager::goMenu( bool enable ) { KOrg::MainWindow *w = ActionManager::findInstance( KURL() ); if ( w ) { - KActionCollection *ac = w->getActionCollection(); + TDEActionCollection *ac = w->getActionCollection(); if ( ac ) { - KAction *action; + TDEAction *action; action = ac->action( "go_today" ); if ( action ) { action->setEnabled( enable ); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e84ae08ba..dc4dfe4ca 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -69,10 +69,10 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/exchangeui.rc"); - new KAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), + new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), actionCollection(), "exchange_download"); - KAction *action = new KAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), + TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), actionCollection(), "exchange_upload"); TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)), this, TQT_SLOT(slotIncidenceSelected(Incidence *))); @@ -80,13 +80,13 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), action,TQT_SLOT(setEnabled(bool))); - action = new KAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), + action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), actionCollection(), "exchange_delete"); TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), action,TQT_SLOT(setEnabled(bool))); action->setEnabled( false ); - new KAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), + new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), actionCollection(), "exchange_configure"); connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) ); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index f7e35effb..8177e797a 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/projectviewui.rc"); - new KAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), + new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), actionCollection(), "view_project"); } diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index d43cd8e60..21b073b38 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : setXMLFile( "plugins/timespanviewui.rc" ); - new KAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), + new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), actionCollection(), "view_timespan" ); } diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index c92915715..bdeb116d4 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -127,7 +127,7 @@ ResourceView *ResourceViewFactory::resourceView() const } ResourceItem::ResourceItem( ResourceCalendar *resource, ResourceView *view, - KListView *parent ) + TDEListView *parent ) : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), mIsSubresource( false ), mResourceIdentifier( TQString() ), @@ -303,7 +303,7 @@ ResourceView::ResourceView( CalendarResources *calendar, mDeleteButton->setDisabled( true ); mEditButton->setDisabled( true ); - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->header()->hide(); TQWhatsThis::add( mListView, i18n( "<qt><p>Select on this list the active KOrganizer " diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index b4d6a70b5..1a073c2b2 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -34,7 +34,7 @@ namespace KCal { class ResourceCalendar; } using namespace KCal; -class KListView; +class TDEListView; class ResourceView; class TQPushButton; @@ -57,7 +57,7 @@ class ResourceViewFactory : public CalendarViewExtension::Factory class ResourceItem : public TQCheckListItem { public: - ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *parent ); + ResourceItem( ResourceCalendar *resource, ResourceView *view, TDEListView *parent ); ResourceItem( ResourceCalendar *resource, const TQString &identifier, const TQString &label, ResourceView *view, ResourceItem *parent ); @@ -148,7 +148,7 @@ class ResourceView : public CalendarViewExtension void updateResourceList(); private: - KListView *mListView; + TDEListView *mListView; CalendarResources *mCalendar; CalendarView *mCalendarView; TQPushButton *mAddButton; diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 7fd65a105..1732a775a 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListBox" row="1" column="0" rowspan="3" colspan="1"> + <widget class="TDEListBox" row="1" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>m_listBox</cstring> </property> |