diff options
Diffstat (limited to 'korganizer/actionmanager.cpp')
| -rw-r--r-- | korganizer/actionmanager.cpp | 304 |
1 files changed, 152 insertions, 152 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index f8a4e4ad..abde9092 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -127,7 +127,7 @@ void ActionManager::init() mWindowList = new KOWindowList; // Show tip of the day, when the first calendar is shown. if ( !mIsPart ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showTipOnStart() ) ); } // Note: We need this ActionManager to be fully constructed, and // parent() to have a valid reference to it before the following @@ -138,27 +138,27 @@ void ActionManager::init() // set up autoSaving stuff mAutoSaveTimer = new TQTimer( this ); - connect( mAutoSaveTimer,TQT_SIGNAL( timeout() ), TQT_SLOT( checkAutoSave() ) ); + connect( mAutoSaveTimer,TQ_SIGNAL( timeout() ), TQ_SLOT( checkAutoSave() ) ); if ( KOPrefs::instance()->mAutoSave && KOPrefs::instance()->mAutoSaveInterval > 0 ) { mAutoSaveTimer->start( 1000 * 60 * KOPrefs::instance()->mAutoSaveInterval ); } mAutoArchiveTimer = new TQTimer( this ); - connect( mAutoArchiveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotAutoArchive() ) ); + connect( mAutoArchiveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotAutoArchive() ) ); // First auto-archive should be in 5 minutes (like in kmail). if ( KOPrefs::instance()->mAutoArchive ) mAutoArchiveTimer->start( 5 * 60 * 1000, true ); // singleshot setTitle(); - connect( mCalendarView, TQT_SIGNAL( modifiedChanged( bool ) ), TQT_SLOT( setTitle() ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( modifiedChanged( bool ) ), TQ_SLOT( setTitle() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), TQ_SLOT( updateConfig() ) ); - connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); - connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ), - TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) ); + connect( mCalendarView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); + connect( mCalendarView, TQ_SIGNAL( exportHTML( HTMLExportSettings * ) ), + this, TQ_SLOT( exportHTML( HTMLExportSettings * ) ) ); processIncidenceSelection( 0, TQDate() ); @@ -198,13 +198,13 @@ void ActionManager::createCalendarResources() mCalendarView->addExtension( &factory ); mResourceView = factory.resourceView(); - connect( mCalendarResources, TQT_SIGNAL( calendarChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - connect( mCalendarResources, TQT_SIGNAL( signalErrorMessage( const TQString & ) ), - mCalendarView, TQT_SLOT( showErrorMessage( const TQString & ) ) ); + connect( mCalendarResources, TQ_SIGNAL( calendarChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + connect( mCalendarResources, TQ_SIGNAL( signalErrorMessage( const TQString & ) ), + mCalendarView, TQ_SLOT( showErrorMessage( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), - TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), + TQ_SLOT( updateConfig() ) ); initCalendar( mCalendarResources ); } @@ -227,58 +227,58 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if ( mIsPart ) { if ( mMainWindow->hasDocument() ) { - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(file_new()), mACollection, "korganizer_openNew" ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection, "korganizer_open" ); - mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT(file_new()), mACollection, "korganizer_openNew" ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection, "korganizer_open" ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection, "korganizer_openRecent" ); - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection, + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection, "korganizer_revert" ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection, "korganizer_saveAs" ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection, "korganizer_save" ); } - KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection, "korganizer_print" ); } else { - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( file_new() ), mACollection ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection ); - mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT( file_new() ), mACollection ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection ); if ( mMainWindow->hasDocument() ) { - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection ); + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection ); } - KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection ); } //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new TDEAction( 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, this, TQ_SLOT( file_merge() ), mACollection, "import_icalendar" ); - new TDEAction( 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, this, TQ_SLOT( file_icalimport() ), mACollection, "import_ical" ); new TDEAction( i18n("Get &Hot New Stuff..."), 0, this, - TQT_SLOT( downloadNewStuff() ), mACollection, + TQ_SLOT( downloadNewStuff() ), mACollection, "downloadnewstuff" ); new TDEAction( i18n("Export &Web Page..."), "webexport", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ), + mCalendarView, TQ_SLOT( exportWeb() ), mACollection, "export_web" ); new TDEAction( i18n("&iCalendar..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ), + mCalendarView, TQ_SLOT( exportICalendar() ), mACollection, "export_icalendar" ); new TDEAction( i18n("&vCalendar..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ), + mCalendarView, TQ_SLOT( exportVCalendar() ), mACollection, "export_vcalendar" ); - new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this), - TQT_SLOT( uploadNewStuff() ), mACollection, + new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this, + TQ_SLOT( uploadNewStuff() ), mACollection, "uploadnewstuff" ); - new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ), + new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQ_SLOT( file_archive() ), mACollection, "file_archive" ); new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection, + mCalendarView, TQ_SLOT( purgeCompleted() ), mACollection, "purge_completed" ); @@ -289,45 +289,45 @@ void ActionManager::initActions() KOrg::History *h = mCalendarView->history(); if ( mIsPart ) { // edit menu - mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView, TQ_SLOT( edit_cut() ), mACollection, "korganizer_cut" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView, TQ_SLOT( edit_copy() ), mACollection, "korganizer_copy" ); - pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView, TQ_SLOT( edit_paste() ), mACollection, "korganizer_paste" ); - mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection, "korganizer_undo" ); - mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection, "korganizer_redo" ); } else { - mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView,TQ_SLOT( edit_cut() ), mACollection ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView,TQ_SLOT( edit_copy() ), mACollection ); - pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView,TQ_SLOT( edit_paste() ), mACollection ); - mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection ); - mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection ); + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection ); + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection ); } mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ), + mCalendarView, TQ_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection, "korganizer_find" ); } else { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection ); } pasteAction->setEnabled( false ); mUndoAction->setEnabled( false ); mRedoAction->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL( pasteEnabled( bool ) ), - pasteAction, TQT_SLOT( setEnabled( bool ) ) ); - connect( h, TQT_SIGNAL( undoAvailable( const TQString & ) ), - TQT_SLOT( updateUndoAction( const TQString & ) ) ); - connect( h, TQT_SIGNAL( redoAvailable( const TQString & ) ), - TQT_SLOT( updateRedoAction( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( pasteEnabled( bool ) ), + pasteAction, TQ_SLOT( setEnabled( bool ) ) ); + connect( h, TQ_SIGNAL( undoAvailable( const TQString & ) ), + TQ_SLOT( updateUndoAction( const TQString & ) ) ); + connect( h, TQ_SIGNAL( redoAvailable( const TQString & ) ), + TQ_SLOT( updateRedoAction( const TQString & ) ) ); @@ -337,83 +337,83 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("What's &Next"), KOGlobals::self()->smallIcon( "whatsnext" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ), + mCalendarView->viewManager(), TQ_SLOT( showWhatsNextView() ), mACollection, "view_whatsnext" ); new TDEAction( i18n("&Day"), KOGlobals::self()->smallIcon( "1day" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showDayView() ), + mCalendarView->viewManager(), TQ_SLOT( showDayView() ), mACollection, "view_day" ); mNextXDays = new TDEAction( "", KOGlobals::self()->smallIcon( "xdays" ), 0, mCalendarView->viewManager(), - TQT_SLOT( showNextXView() ), + TQ_SLOT( showNextXView() ), mACollection, "view_nextx" ); mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days", KOPrefs::instance()->mNextXDays ) ); new TDEAction( i18n("W&ork Week"), KOGlobals::self()->smallIcon( "5days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWorkWeekView() ), mACollection, "view_workweek" ); new TDEAction( i18n("&Week"), KOGlobals::self()->smallIcon( "7days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWeekView() ), mACollection, "view_week" ); new TDEAction( i18n("&Month"), KOGlobals::self()->smallIcon( "month" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showMonthView() ), + mCalendarView->viewManager(), TQ_SLOT( showMonthView() ), mACollection, "view_month" ); new TDEAction( i18n("&List"), KOGlobals::self()->smallIcon( "list" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showListView() ), + mCalendarView->viewManager(), TQ_SLOT( showListView() ), mACollection, "view_list" ); new TDEAction( i18n("&To-do List"), KOGlobals::self()->smallIcon( "todo" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTodoView() ), + mCalendarView->viewManager(), TQ_SLOT( showTodoView() ), mACollection, "view_todo" ); new TDEAction( i18n("&Journal"), KOGlobals::self()->smallIcon( "journal" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showJournalView() ), + mCalendarView->viewManager(), TQ_SLOT( showJournalView() ), mACollection, "view_journal" ); new TDEAction( i18n("&Timeline View"), KOGlobals::self()->smallIcon( "timeline" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ), + mCalendarView->viewManager(), TQ_SLOT( showTimelineView() ), mACollection, "view_timeline" ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("&Refresh"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ), + mCalendarView, TQ_SLOT( updateView() ), mACollection, "update" ); // TODO: // new TDEAction( i18n("Hide &Completed To-dos"), 0, -// mCalendarView, TQT_SLOT( toggleHideCompleted() ), +// mCalendarView, TQ_SLOT( toggleHideCompleted() ), // mACollection, "hide_completed_todos" ); mFilterAction = new TDESelectAction( i18n("F&ilter"), 0, mACollection, "filter_select" ); mFilterAction->setEditable( false ); - connect( mFilterAction, TQT_SIGNAL( activated(int) ), - mCalendarView, TQT_SLOT( filterActivated( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( newFilterListSignal( const TQStringList & ) ), - mFilterAction, TQT_SLOT( setItems( const TQStringList & ) ) ); - connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ), - mFilterAction, TQT_SLOT( setCurrentItem( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( filterChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) ); + connect( mFilterAction, TQ_SIGNAL( activated(int) ), + mCalendarView, TQ_SLOT( filterActivated( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( newFilterListSignal( const TQStringList & ) ), + mFilterAction, TQ_SLOT( setItems( const TQStringList & ) ) ); + connect( mCalendarView, TQ_SIGNAL( selectFilterSignal( int ) ), + mFilterAction, TQ_SLOT( setCurrentItem( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( filterChanged() ), + this, TQ_SLOT( setTitle() ) ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // TODO: try to find / create better icons for the following 4 actions new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutHorizontally() ), mACollection, "zoom_out_horizontally" ); new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInVertically() ), mACollection, "zoom_in_vertically" ); new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutVertically() ), mACollection, "zoom_out_vertically" ); @@ -422,73 +422,73 @@ void ActionManager::initActions() //************************** Actions MENU ********************************* new TDEAction( i18n("Go to &Today"), "today", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ), + mCalendarView,TQ_SLOT( goToday() ), mACollection, "go_today" ); bool isRTL = TQApplication::reverseLayout(); action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ), + mCalendarView,TQ_SLOT( goPrevious() ), mACollection, "go_previous" ); // Changing the action text by setText makes the toolbar button disappear. // This has to be fixed first, before the connects below can be reenabled. /* - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - action, TQT_SLOT( setText( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/ + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + action, TQ_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + this, TQ_SLOT( dumpText( const TQString & ) ) );*/ action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ), + mCalendarView,TQ_SLOT( goNext() ), mACollection, "go_next" ); /* - connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ), - action,TQT_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView,TQ_SIGNAL( changeNavStringNext( const TQString & ) ), + action,TQ_SLOT( setText( const TQString & ) ) ); */ //************************** Actions MENU ********************************* new TDEAction( i18n("New E&vent..."), KOGlobals::self()->smallIcon( "newappointment" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()), + mCalendarView, TQ_SLOT(newEvent()), mACollection, "new_event" ); new TDEAction( i18n("New &To-do..."), KOGlobals::self()->smallIcon( "newtodo" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()), + mCalendarView, TQ_SLOT(newTodo()), mACollection, "new_todo" ); action = new TDEAction( i18n("New Su&b-to-do..."), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ), + mCalendarView,TQ_SLOT( newSubTodo() ), mACollection, "new_subtodo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( todoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); new TDEAction( i18n("New &Journal..."), KOGlobals::self()->smallIcon( "newjournal" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()), + mCalendarView, TQ_SLOT(newJournal()), mACollection, "new_journal" ); mShowIncidenceAction = new TDEAction( i18n("&Show"), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ), + mCalendarView,TQ_SLOT( showIncidence() ), mACollection, "show_incidence" ); mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ), + mCalendarView,TQ_SLOT( editIncidence() ), mACollection, "edit_incidence" ); mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()), + mCalendarView,TQ_SLOT( deleteIncidence()), mACollection, "delete_incidence" ); action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ), + mCalendarView,TQ_SLOT( todo_unsub() ), mACollection, "unsub_todo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( subtodoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); // TODO: Add item to move the incidence to different resource // mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0, -// mCalendarView, TQT_SLOT( assignResource()), +// mCalendarView, TQ_SLOT( assignResource()), // mACollection, "assign_resource" ); // TODO: Add item to quickly toggle the reminder of a given incidence // mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0, -// mCalendarView, TQT_SLOT( toggleAlarm()), +// mCalendarView, TQ_SLOT( toggleAlarm()), // mACollection, "activate_alarm" ); @@ -496,65 +496,65 @@ void ActionManager::initActions() //************************** SCHEDULE MENU ******************************** mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ), + mCalendarView, TQ_SLOT( schedule_publish() ), mACollection, "schedule_publish" ); mPublishEvent->setEnabled( false ); mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ), "mail_generic", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()), + mCalendarView, TQ_SLOT(schedule_request()), mACollection, "schedule_request" ); mSendInvitation->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendInvitation, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendInvitation, TQ_SLOT(setEnabled(bool)) ); mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()), + mCalendarView, TQ_SLOT(schedule_refresh()), mACollection, "schedule_refresh" ); mRequestUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestUpdate, TQ_SLOT(setEnabled(bool)) ); mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()), + mCalendarView, TQ_SLOT(schedule_cancel()), mACollection, "schedule_cancel" ); mSendCancel->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendCancel, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendCancel, TQ_SLOT(setEnabled(bool)) ); mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), "mail-reply-sender", 0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), + mCalendarView,TQ_SLOT(schedule_reply()), mACollection, "schedule_reply" ); mSendStatusUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mSendStatusUpdate, TQ_SLOT(setEnabled(bool)) ); mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()), + mCalendarView, TQ_SLOT(schedule_counter()), mACollection, "schedule_counter" ); mRequestChange->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestChange, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestChange, TQ_SLOT(setEnabled(bool)) ); mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()), + mCalendarView, TQ_SLOT(schedule_forward()), mACollection, "schedule_forward" ); mForwardEvent->setEnabled( false ); action = new TDEAction( i18n("&Mail Free Busy Information..."), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ), + mCalendarView, TQ_SLOT( mailFreeBusy() ), mACollection, "mail_freebusy" ); action->setEnabled( true ); action = new TDEAction( i18n("&Upload Free Busy Information"), 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ), + mCalendarView, TQ_SLOT( uploadFreeBusy() ), mACollection, "upload_freebusy" ); action->setEnabled( true ); if ( !mIsPart ) { action = new TDEAction( i18n("&Addressbook"),"contents",0, - TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ), + mCalendarView,TQ_SLOT( openAddressbook() ), mACollection,"addressbook" ); } @@ -565,13 +565,13 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ), + this, TQ_SLOT( toggleDateNavigator() ), mACollection, "show_datenavigator" ); mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ), + this, TQ_SLOT( toggleTodoView() ), mACollection, "show_todoview" ); mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ), + this, TQ_SLOT( toggleEventViewer() ), mACollection, "show_eventviewer" ); TDEConfig *config = KOGlobals::self()->config(); config->setGroup( "Settings" ); @@ -590,10 +590,10 @@ void ActionManager::initActions() if ( !mMainWindow->hasDocument() ) { mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ), + this, TQ_SLOT( toggleResourceView() ), mACollection, "show_resourceview" ); mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ), + this, TQ_SLOT( toggleResourceButtons() ), mACollection, "show_resourcebuttons" ); mResourceViewShowAction->setChecked( config->readBoolEntry( "ResourceViewVisible", true ) ); @@ -608,38 +608,38 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("Configure &Date && Time..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ), + this, TQ_SLOT( configureDateTime() ), mACollection, "conf_datetime" ); // TODO: Add an item to show the resource management dlg // new TDEAction( i18n("Manage &Resources..."), 0, -// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ), +// this, TQ_SLOT( manageResources() ), // mACollection, "conf_resources" ); new TDEAction( i18n("Manage View &Filters..."), "configure", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ), + mCalendarView, TQ_SLOT( editFilters() ), mACollection, "edit_filters" ); new TDEAction( i18n("Manage C&ategories..."), 0, - TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ), + mCalendarView->dialogManager(), TQ_SLOT( showCategoryEditDialog() ), mACollection, "edit_categories" ); if ( mIsPart ) { new TDEAction( i18n("&Configure Calendar..."), "configure", 0, - TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), + mCalendarView, TQ_SLOT( edit_options() ), mACollection, "korganizer_configure" ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection, "korganizer_configure_shortcuts" ); } else { - KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), + KStdAction::preferences( mCalendarView, TQ_SLOT( edit_options() ), mACollection ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection ); + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection ); } //**************************** HELP MENU ********************************** - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection, + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), mACollection, "help_tipofday" ); // new TDEAction( i18n("Show Intro Page"), 0, -// mCalendarView,TQT_SLOT( showIntro() ), +// mCalendarView,TQ_SLOT( showIntro() ), // mACollection,"show_intro" ); @@ -1293,8 +1293,8 @@ void ActionManager::configureDateTime() TDEProcess *proc = new TDEProcess; *proc << "tdecmshell" << "language"; - connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); + connect( proc,TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); if ( !proc->start() ) { KMessageBox::sorry( dialogParent(), @@ -1558,7 +1558,7 @@ TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar() cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView(); } if ( cV ) { - p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); + p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); } return p; } @@ -1935,8 +1935,8 @@ bool ActionManager::queryClose() // FIXME: Put main window into a state indicating final saving. mIsClosing = true; // FIXME: Close main window when save is finished -// connect( mCalendarResources, TQT_SIGNAL( calendarSaved() ), -// mMainWindow, TQT_SLOT( close() ) ); +// connect( mCalendarResources, TQ_SIGNAL( calendarSaved() ), +// mMainWindow, TQ_SLOT( close() ) ); } if ( mCalendarResources->isSaving() ) { kdDebug(5850) << "ActionManager::queryClose(): isSaving" << endl; @@ -2012,12 +2012,12 @@ void ActionManager::importCalendar( const KURL &url ) PreviewDialog *dialog; dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); - connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), - TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); - connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), - TQT_SLOT( openURL( const KURL &, bool ) ) ); - connect( dialog, TQT_SIGNAL( addResource( const KURL & ) ), - TQT_SLOT( addResource( const KURL & ) ) ); + connect( dialog, TQ_SIGNAL( dialogFinished( PreviewDialog * ) ), + TQ_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); + connect( dialog, TQ_SIGNAL( openURL( const KURL &, bool ) ), + TQ_SLOT( openURL( const KURL &, bool ) ) ); + connect( dialog, TQ_SIGNAL( addResource( const KURL & ) ), + TQ_SLOT( addResource( const KURL & ) ) ); if ( dialog->loadCalendar() ) { dialog->show(); @@ -2046,7 +2046,7 @@ void ActionManager::slotAutoArchive() return; mAutoArchiveTimer->stop(); EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), mCalendarView, TQT_SLOT( updateView() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), mCalendarView, TQ_SLOT( updateView() ) ); archiver.runAuto( mCalendarView->calendar(), mCalendarView, false /*no gui*/ ); // restart timer with the correct delay ( especially useful for the first time ) slotAutoArchivingSettingsModified(); |