diff options
Diffstat (limited to 'korganizer')
151 files changed, 1325 insertions, 1340 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index f8a4e4ad6..abde90927 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(); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index ebfed5155..d7b8c4173 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -72,7 +72,7 @@ using namespace KCal; */ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface { - Q_OBJECT + TQ_OBJECT public: ActionManager( KXMLGUIClient *client, CalendarView *widget, diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp index df1417897..e0519ba47 100644 --- a/korganizer/agendaview.cpp +++ b/korganizer/agendaview.cpp @@ -27,9 +27,9 @@ AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) : { KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } } diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h index 32b58d3c6..6e48f6996 100644 --- a/korganizer/agendaview.h +++ b/korganizer/agendaview.h @@ -26,7 +26,7 @@ namespace KOrg { /** Base class for single/multi agenda views. */ class AgendaView : public KOEventView { - Q_OBJECT + TQ_OBJECT public: AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 ); diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 989be2619..7b8eae469 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -76,7 +76,7 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) TQButtonGroup* radioBG = new TQButtonGroup( this ); radioBG->hide(); // just for the exclusive behavior - connect( radioBG, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotActionChanged() ) ); + connect( radioBG, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotActionChanged() ) ); TQHBoxLayout *dateLayout = new TQHBoxLayout(0); mArchiveOnceRB = new TQRadioButton(i18n("Archive now items older than:"),topFrame); @@ -147,10 +147,10 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) i18n("Select this option to delete old events and to-dos without saving them. " "It is not possible to recover the events later.")); topLayout->addWidget(mDeleteCb); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), mArchiveFile, TQT_SLOT(setDisabled(bool))); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableUser1())); - connect(mArchiveFile->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotEnableUser1())); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), mArchiveFile, TQ_SLOT(setDisabled(bool))); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableUser1())); + connect(mArchiveFile->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotEnableUser1())); // Load settings from KOPrefs mExpiryTimeNumInput->setValue( KOPrefs::instance()->mExpiryTime ); @@ -194,7 +194,7 @@ void ArchiveDialog::slotActionChanged() void ArchiveDialog::slotUser1() { EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), this, TQT_SLOT( slotEventsDeleted() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), this, TQ_SLOT( slotEventsDeleted() ) ); KOPrefs::instance()->mAutoArchive = mAutoArchiveRB->isChecked(); KOPrefs::instance()->mExpiryTime = mExpiryTimeNumInput->value(); diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h index 4d43f5da9..2b22fe4fb 100644 --- a/korganizer/archivedialog.h +++ b/korganizer/archivedialog.h @@ -40,7 +40,7 @@ using namespace KCal; class ArchiveDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 907603a99..dbee755fc 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -131,18 +131,18 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) mExtensions.setAutoDelete( true ); - mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) ); - mDateChecker = new DateChecker( TQT_TQOBJECT(this) ); + mDateNavigator = new DateNavigator( this ); + mDateChecker = new DateChecker( this ); TQBoxLayout *topLayout = new TQVBoxLayout( this ); #ifndef KORG_NOSPLITTER // create the main layout frames. - mPanner = new TQSplitter( Qt::Horizontal, this, + mPanner = new TQSplitter( TQt::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); - mLeftSplitter = new TQSplitter( Qt::Vertical, mPanner, + mLeftSplitter = new TQSplitter( TQt::Vertical, mPanner, "CalendarView::LeftFrame" ); // mPanner->setResizeMode( mLeftSplitter, TQSplitter::Stretch ); @@ -200,64 +200,64 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) #endif // Signals emited by mDateNavigator - connect( mDateNavigator, TQT_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), - TQT_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); + connect( mDateNavigator, TQ_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), + TQ_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); // Signals emited by mNavigatorBar - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), - mDateNavigator, TQT_SLOT( selectNextMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), + mDateNavigator, TQ_SLOT( selectNextMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); // Signals emited by mDateNavigatorContainer - connect( mDateNavigatorContainer, TQT_SIGNAL( weekClicked( const TQDate & ) ), - this, TQT_SLOT( selectWeek( const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goPrevious() ), - mDateNavigator, TQT_SLOT( selectPrevious() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goNext() ), - mDateNavigator, TQT_SLOT( selectNext() ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - mDateNavigator, TQT_SLOT( selectDates( const KCal::DateList & ) ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), - TQT_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), - TQT_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); - - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mTodoList, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - TQT_SIGNAL( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mDateNavigatorContainer, TQT_SLOT( updateToday() ) ); - - connect( this, TQT_SIGNAL( configChanged() ), - mDateNavigatorContainer, TQT_SLOT( updateConfig() ) ); - - connect( this, TQT_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), - mEventViewer, TQT_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( weekClicked( const TQDate & ) ), + this, TQ_SLOT( selectWeek( const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goPrevious() ), + mDateNavigator, TQ_SLOT( selectPrevious() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goNext() ), + mDateNavigator, TQ_SLOT( selectNext() ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + mDateNavigator, TQ_SLOT( selectDates( const KCal::DateList & ) ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), + TQ_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), + TQ_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); + + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mTodoList, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + TQ_SIGNAL( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mDateNavigatorContainer, TQ_SLOT( updateToday() ) ); + + connect( this, TQ_SIGNAL( configChanged() ), + mDateNavigatorContainer, TQ_SLOT( updateConfig() ) ); + + connect( this, TQ_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), + mEventViewer, TQ_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); //TODO: do a pretty Summary, TQString s; @@ -277,13 +277,13 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) KOGlobals::self()-> setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( checkClipboard() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( checkClipboard() ) ); - connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); - disconnect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - this, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); + disconnect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); kdDebug(5850) << "CalendarView::CalendarView() done" << endl; } @@ -307,11 +307,11 @@ void CalendarView::setCalendar( Calendar *cal ) delete mHistory; mHistory = new History( mCalendar ); - connect( mHistory, TQT_SIGNAL( undone() ), TQT_SLOT( updateView() ) ); - connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( undone() ), TQ_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( redone() ), TQ_SLOT( updateView() ) ); if ( mChanger ) delete mChanger; - setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) ); + setIncidenceChanger( new IncidenceChanger( mCalendar, this ) ); mCalendar->registerObserver( this ); @@ -326,21 +326,21 @@ void CalendarView::setIncidenceChanger( IncidenceChangerBase *changer ) { mChanger = changer; emit newIncidenceChanger( mChanger ); - connect( mChanger, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - this, TQT_SLOT( incidenceAdded( Incidence* ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - this, TQT_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceToBeDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceToBeDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + this, TQ_SLOT( incidenceAdded( Incidence* ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + this, TQ_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceToBeDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceToBeDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( schedule( Scheduler::Method, Incidence*) ), - this, TQT_SLOT( schedule( Scheduler::Method, Incidence*) ) ); + connect( mChanger, TQ_SIGNAL( schedule( Scheduler::Method, Incidence*) ), + this, TQ_SLOT( schedule( Scheduler::Method, Incidence*) ) ); - connect( this, TQT_SIGNAL( cancelAttendees( Incidence * ) ), - mChanger, TQT_SLOT( cancelAttendees( Incidence * ) ) ); + connect( this, TQ_SIGNAL( cancelAttendees( Incidence * ) ), + mChanger, TQ_SLOT( cancelAttendees( Incidence * ) ) ); } Calendar *CalendarView::calendar() @@ -357,7 +357,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar() cV = mViewManager->multiAgendaView()->selectedAgendaView(); } if ( cV ) { - p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); + p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() ); } return p; } @@ -1776,7 +1776,7 @@ void CalendarView::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); KOrg::BaseView *currentView = mViewManager->currentView(); @@ -1802,8 +1802,8 @@ void CalendarView::exportWeb() // seem to load the config theirselves if ( settings ) settings->readConfig(); ExportWebDialog *dlg = new ExportWebDialog( settings, this ); - connect( dlg, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ), - this, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); + connect( dlg, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ), + this, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); dlg->show(); } @@ -2472,8 +2472,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) void CalendarView::connectIncidenceEditor( KOIncidenceEditor *editor ) { - connect( this, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - editor, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( this, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + editor, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); editor->setIncidenceChanger( mChanger ); } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index e9b3d6728..3d1d76238 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -80,7 +80,7 @@ class CalendarViewExtension : public TQWidget */ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 2be3d060e..ebe734652 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -55,8 +55,8 @@ void DateChecker::enableRollover( RolloverType r ) case FollowMonth: if ( !mUpdateTimer ) { mUpdateTimer = new TQTimer( this, "mUpdateTimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( possiblyPastMidnight() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( possiblyPastMidnight() ) ); } mUpdateTimer->start( 0, true ); mLastDayChecked = TQDate::currentDate(); diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h index a2d191a3b..5665f26d0 100644 --- a/korganizer/datechecker.h +++ b/korganizer/datechecker.h @@ -36,7 +36,7 @@ class NavigatorBar; class DateChecker: public TQObject { - Q_OBJECT + TQ_OBJECT public: DateChecker( TQObject *parent = 0, const char *name = 0 ); diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index 4418745d4..f34c1b281 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h @@ -35,7 +35,7 @@ */ class DateNavigator : public TQObject { - Q_OBJECT + TQ_OBJECT public: DateNavigator( TQObject *parent = 0, const char *name = 0 ); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index bb965ba24..3ff76feca 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -68,26 +68,26 @@ DateNavigatorContainer::~DateNavigatorContainer() void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) { - connect( v, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( v, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( weekClicked( const TQDate & ) ), - TQT_SIGNAL( weekClicked( const TQDate & ) ) ); - - connect( v, TQT_SIGNAL( goPrevious() ), TQT_SIGNAL( goPrevious() ) ); - connect( v, TQT_SIGNAL( goNext() ), TQT_SIGNAL( goNext() ) ); - - connect( v, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( v, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - - connect( v, TQT_SIGNAL( prevMonthClicked() ), this, TQT_SLOT( goPrevMonth() ) ); - connect( v, TQT_SIGNAL( nextMonthClicked() ), this, TQT_SLOT( goNextMonth() ) ); - - connect( v, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( v, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( v, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( v, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( weekClicked( const TQDate & ) ), + TQ_SIGNAL( weekClicked( const TQDate & ) ) ); + + connect( v, TQ_SIGNAL( goPrevious() ), TQ_SIGNAL( goPrevious() ) ); + connect( v, TQ_SIGNAL( goNext() ), TQ_SIGNAL( goNext() ) ); + + connect( v, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( v, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + + connect( v, TQ_SIGNAL( prevMonthClicked() ), this, TQ_SLOT( goPrevMonth() ) ); + connect( v, TQ_SIGNAL( nextMonthClicked() ), this, TQ_SLOT( goNextMonth() ) ); + + connect( v, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( v, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); } void DateNavigatorContainer::setCalendar( Calendar *cal ) @@ -211,7 +211,7 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * ) kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl; kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl; #endif - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); } void DateNavigatorContainer::resizeAllContents() @@ -332,7 +332,7 @@ TQPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset ) TQPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth ); TQPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth ); - return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second ); + return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second ); } #include "datenavigatorcontainer.moc" diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index 17c983e7a..6a4d97ec3 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -31,7 +31,7 @@ class KDateNavigator; class DateNavigatorContainer: public TQFrame { - Q_OBJECT + TQ_OBJECT public: DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h index 8fb99ab95..f6b02477e 100644 --- a/korganizer/eventarchiver.h +++ b/korganizer/eventarchiver.h @@ -46,7 +46,7 @@ using namespace KCal; */ class EventArchiver : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 156ed7027..a6b09b780 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -81,8 +81,8 @@ ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent // setupFreeBusyPage(); // setupAdvancedPage(); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( reject() ) ); readConfig(); updateState(); @@ -149,9 +149,9 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget( typeGroup ); // addWidBool( mSettings->weekViewItem(), typeGroup ); mMonthViewCheckBox = addWidBool( mSettings->monthViewItem(), typeGroup )->checkBox(); - connect( mMonthViewCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mMonthViewCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); mEventListCheckBox = addWidBool( mSettings->eventViewItem(), typeGroup )->checkBox(); - connect( mEventListCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mEventListCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); addWidBool( mSettings->todoViewItem(), typeGroup ); // addWidBool( mSettings->journalViewItem(), typeGroup ); // addWidBool( mSettings->freeBusyViewItem(), typeGroup ); @@ -162,8 +162,8 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget(destGroup); KPrefsWidPath *pathWid = addWidPath( mSettings->outputFileItem(), destGroup, "text/html", KFile::File ); - connect( pathWid->urlRequester(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( pathWid->urlRequester(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotTextChanged( const TQString & ) ) ); topLayout->addStretch( 1 ); } diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h index d3f77ff8f..79ca87c1c 100644 --- a/korganizer/exportwebdialog.h +++ b/korganizer/exportwebdialog.h @@ -37,7 +37,7 @@ using namespace KCal; */ class ExportWebDialog : public KDialogBase, public KPrefsWidManager { - Q_OBJECT + TQ_OBJECT public: ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0, diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index d0f43c948..131b65369 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -234,9 +234,6 @@ <property name="text"> <string>Show all except selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>1</number> </property> @@ -251,9 +248,6 @@ <property name="text"> <string>Show only selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>0</number> </property> @@ -268,9 +262,6 @@ <property name="text"> <string>Change...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -281,9 +272,6 @@ <property name="text"> <string>Hide to-dos not assigned to me</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>This option hides all to-dos from your list which are assigned to someone else.<br> Only to-dos which have least one attendee will be checked. If you are not in the list of attendees the to-do will be hidden.</string> @@ -309,9 +297,9 @@ Only to-dos which have least one attendee will be checked. If you are not in th <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>updateFilter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index 74f5a48cb..6a2ef703f 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -53,11 +53,11 @@ FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters, { setMainWidget( mFilterEdit = new FilterEdit(filters, this)); - connect(mFilterEdit, TQT_SIGNAL(dataConsistent(bool)), - TQT_SLOT(setDialogConsistent(bool))); + connect(mFilterEdit, TQ_SIGNAL(dataConsistent(bool)), + TQ_SLOT(setDialogConsistent(bool))); updateFilterList(); - connect( mFilterEdit, TQT_SIGNAL( editCategories() ), TQT_SIGNAL( editCategories() ) ); - connect( mFilterEdit, TQT_SIGNAL( filterChanged() ), TQT_SIGNAL( filterChanged() ) ); + connect( mFilterEdit, TQ_SIGNAL( editCategories() ), TQ_SIGNAL( editCategories() ) ); + connect( mFilterEdit, TQ_SIGNAL( filterChanged() ), TQ_SIGNAL( filterChanged() ) ); } FilterEditDialog::~FilterEditDialog() @@ -99,11 +99,11 @@ FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent) TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) ); TQWhatsThis::add( mDeleteButton, i18n( "Press this button to remove the currently active filter." ) ); - connect( mRulesList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(filterSelected()) ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bNewPressed() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bDeletePressed() ) ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( updateSelectedName(const TQString &) ) ); - connect( mCatEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCategorySelection() ) ); + connect( mRulesList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(filterSelected()) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bNewPressed() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bDeletePressed() ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged(const TQString &) ), TQ_SLOT( updateSelectedName(const TQString &) ) ); + connect( mCatEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCategorySelection() ) ); } FilterEdit::~FilterEdit() { @@ -231,10 +231,10 @@ void FilterEdit::editCategorySelection() if ( !mCategorySelectDialog ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KOPrefs::instance(), this, "filterCatSelect" ); connect( mCategorySelectDialog, - TQT_SIGNAL( categoriesSelected( const TQStringList & ) ), - TQT_SLOT( updateCategorySelection( const TQStringList & ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - TQT_SIGNAL( editCategories() ) ); + TQ_SIGNAL( categoriesSelected( const TQStringList & ) ), + TQ_SLOT( updateCategorySelection( const TQStringList & ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + TQ_SIGNAL( editCategories() ) ); } mCategorySelectDialog->setSelected( current->categoryList() ); diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h index 73a0df8e0..3c19d613a 100644 --- a/korganizer/filtereditdialog.h +++ b/korganizer/filtereditdialog.h @@ -44,7 +44,7 @@ using namespace KCal; */ class FilterEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0); @@ -69,7 +69,7 @@ class FilterEditDialog : public KDialogBase class FilterEdit : public FilterEdit_base { - Q_OBJECT + TQ_OBJECT public: FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 9aa7ed82f..8f41a837c 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -82,10 +82,10 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); TDEIO::Scheduler::scheduleJob( job ); } @@ -339,8 +339,8 @@ void FreeBusyManager::publishFreeBusy() KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); } } @@ -406,15 +406,15 @@ bool FreeBusyManager::processRetrieveQueue() FreeBusyDownloadJob *job = new FreeBusyDownloadJob( email, sourceURL, this, "freebusy_download_job" ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( processRetrieveQueue() ) ); + TQ_SLOT( processRetrieveQueue() ) ); - connect( job, TQT_SIGNAL( freeBusyDownloadError( const TQString& ) ), - this, TQT_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloadError( const TQString& ) ), + this, TQ_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); return true; } diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h index 124dbdb3e..6650dc4dc 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -54,7 +54,7 @@ class FreeBusyManager; */ class FreeBusyDownloadJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: FreeBusyDownloadJob( const TQString &email, const KURL &url, @@ -79,7 +79,7 @@ class FreeBusyDownloadJob : public TQObject class FreeBusyManager : public TQObject, public KCal::FreeBusyCache { - Q_OBJECT + TQ_OBJECT public: FreeBusyManager( TQObject *parent, const char *name ); diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h index 9447a7f11..a0363ce88 100644 --- a/korganizer/freebusyurldialog.h +++ b/korganizer/freebusyurldialog.h @@ -35,7 +35,7 @@ class Attendee; class FreeBusyUrlDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0, @@ -50,7 +50,7 @@ class FreeBusyUrlDialog : public KDialogBase class FreeBusyUrlWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0, diff --git a/korganizer/history.h b/korganizer/history.h index d0b7e5755..db6c5f21d 100644 --- a/korganizer/history.h +++ b/korganizer/history.h @@ -38,7 +38,7 @@ namespace KOrg { class History : public TQObject { - Q_OBJECT + TQ_OBJECT public: History( KCal::Calendar * ); diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index 4272f5dac..6edc9f71d 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -50,7 +50,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) topLayout->addWidget( new TQLabel( txt, topFrame ) ); - TQButtonGroup *radioBox = new TQButtonGroup( 1, Qt::Horizontal, topFrame ); + TQButtonGroup *radioBox = new TQButtonGroup( 1, TQt::Horizontal, topFrame ); radioBox->setFlat( true ); topLayout->addWidget( radioBox ); diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h index f6161ea51..c70633b82 100644 --- a/korganizer/importdialog.h +++ b/korganizer/importdialog.h @@ -34,7 +34,7 @@ class TQRadioButton; class ImportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ImportDialog( const KURL &url, TQWidget *parent, bool isPart ); diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h index ee684e7c6..2a5235bfc 100644 --- a/korganizer/incidencechanger.h +++ b/korganizer/incidencechanger.h @@ -32,7 +32,7 @@ namespace KCal { class IncidenceChanger : public KOrg::IncidenceChangerBase { - Q_OBJECT + TQ_OBJECT public: IncidenceChanger( Calendar *cal, TQObject *parent ) diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index fa47ab7a5..ce3e2145c 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -58,7 +58,7 @@ namespace KOrg { */ class KDE_EXPORT BaseView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h index ba26ce021..730e2936a 100644 --- a/korganizer/interfaces/korganizer/incidencechangerbase.h +++ b/korganizer/interfaces/korganizer/incidencechangerbase.h @@ -38,7 +38,7 @@ namespace KOrg { class IncidenceChangerBase : public TQObject { -Q_OBJECT +TQ_OBJECT public: IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) : diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 0e7230482..cb0b68844 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -39,7 +39,7 @@ class Part : public KParts::Part typedef TQPtrList<Part> List; Part( MainWindow *parent, const char *name ) - : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {} + : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {} virtual ~Part() {} diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 0ceec9546..08d57be5d 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -75,8 +75,8 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : mTitle = new JournalTitleLable( this ); mTitle->setMargin(2); mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ), - this, TQT_SLOT( emitNewJournal() ) ); + connect( mTitle, TQ_SIGNAL( linkClicked( const TQString & ) ), + this, TQ_SLOT( emitNewJournal() ) ); } JournalDateEntry::~JournalDateEntry() @@ -120,16 +120,16 @@ void JournalDateEntry::addJournal( Journal *j ) entry->setIncidenceChanger( mChanger ); mEntries.insert( j, entry ); - connect( this, TQT_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), - entry, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); - connect( this, TQT_SIGNAL( setDateSignal( const TQDate & ) ), - entry, TQT_SLOT( setDate( const TQDate & ) ) ); - connect( this, TQT_SIGNAL( flushEntries() ), - entry, TQT_SLOT( flushEntry() ) ); - connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ), - this, TQT_SIGNAL( deleteIncidence( Incidence* ) ) ); - connect( entry, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), - this, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); + connect( this, TQ_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), + entry, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( this, TQ_SIGNAL( setDateSignal( const TQDate & ) ), + entry, TQ_SLOT( setDate( const TQDate & ) ) ); + connect( this, TQ_SIGNAL( flushEntries() ), + entry, TQ_SLOT( flushEntry() ) ); + connect( entry, TQ_SIGNAL( deleteIncidence( Incidence* ) ), + this, TQ_SIGNAL( deleteIncidence( Incidence* ) ) ); + connect( entry, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), + this, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); } Journal::List JournalDateEntry::journals() const @@ -203,8 +203,8 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mLayout->addWidget( mTimeCheck, 0, 2 ); mTimeEdit = new KTimeEdit( this ); mLayout->addWidget( mTimeEdit, 0, 3 ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(timeCheckBoxToggled(bool)) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(timeCheckBoxToggled(bool)) ); TQWhatsThis::add( mTimeCheck, i18n("Determines whether this journal entry has " "a time associated with it") ); TQWhatsThis::add( mTimeEdit, i18n( "Sets the time associated with this journal " @@ -217,7 +217,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") ); mLayout->addWidget( mDeleteButton, 0, 4 ); - connect( mDeleteButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(deleteItem()) ); + connect( mDeleteButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(deleteItem()) ); mEditButton = new TQToolButton( this, "editButton" ); mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) ); @@ -225,7 +225,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mEditButton, i18n("Edit this journal entry") ); TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") ); mLayout->addWidget( mEditButton, 0, 5 ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editItem() ) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editItem() ) ); #ifndef KORG_NOPRINTER mPrintButton = new TQToolButton( this, "printButton" ); @@ -234,15 +234,15 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mPrintButton, i18n("Print this journal entry") ); TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") ); mLayout->addWidget( mPrintButton, 0, 6 ); - connect( mPrintButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( printItem() ) ); + connect( mPrintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( printItem() ) ); #endif mEditor = new KTextEdit(this); mLayout->addMultiCellWidget( mEditor, 1, 2, 0, 6 ); - connect( mTitleEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setDirty()) ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDirty()) ); - connect( mTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), TQT_SLOT(setDirty()) ); - connect( mEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(setDirty()) ); + connect( mTitleEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setDirty()) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDirty()) ); + connect( mTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), TQ_SLOT(setDirty()) ); + connect( mEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(setDirty()) ); mEditor->installEventFilter(this); @@ -283,7 +283,7 @@ void JournalEntry::printItem() if ( mJournal ) { KOCoreHelper helper; CalPrinter printer( this, 0, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mJournal ); diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index f74ab8484..9988dbaf9 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h @@ -48,7 +48,7 @@ namespace KCal { using namespace KCal; class JournalEntry : public TQWidget { - Q_OBJECT + TQ_OBJECT public: typedef ListBase<JournalEntry> List; @@ -113,7 +113,7 @@ class JournalEntry : public TQWidget { class JournalDateEntry : public TQVBox { - Q_OBJECT + TQ_OBJECT public: typedef ListBase<JournalDateEntry> List; diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 230c992dc..94f74a661 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -53,12 +53,12 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mNavigatorBar = new NavigatorBar( this ); topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); int i; TQString generalFont = TDEGlobalSettings::generalFont().family(); @@ -84,13 +84,13 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mDayMatrix = new KODayMatrix( this, "KDateNavigator::dayMatrix" ); - connect( mDayMatrix, TQT_SIGNAL( selected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( selected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); topLayout->addMultiCellWidget( mDayMatrix, 2, 7, 1, 7 ); @@ -288,7 +288,7 @@ bool KDateNavigator::eventFilter( TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::MouseButtonPress ) { int i; for( i = 0; i < 6; ++i ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) { + if ( o == mWeeknos[ i ] ) { TQDate weekstart = mDayMatrix->getDate( i * 7 ); emit weekClicked( weekstart ); break; diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 113951381..8da31b02c 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -44,7 +44,7 @@ class KODayMatrix; class KDateNavigator: public TQFrame { - Q_OBJECT + TQ_OBJECT public: KDateNavigator( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index b242c3065..b7a0e1de5 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) setMargin(0); setBackgroundColor(TQt::red); minutes = new TQTimer(this); - connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation())); + connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation())); minutes->start(0, true); mTimeBox = new TQLabel(this); @@ -255,10 +255,10 @@ void KOAgenda::init() // Grab key strokes for keyboard navigation of agenda. Seems to have no // effect. Has to be fixed. - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); - connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) ); - connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) ); + connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) ); + connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) ); mStartCell = TQPoint( 0, 0 ); mEndCell = TQPoint( 0, 0 ); @@ -274,7 +274,7 @@ void KOAgenda::init() mClickedItem = 0; mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; @@ -291,7 +291,7 @@ void KOAgenda::init() viewport()->update(); viewport()->setBackgroundMode( NoBackground ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); setMinimumSize( 30, int( mGridSpacingY + 1 ) ); // setMaximumHeight(mGridSpacingY * mRows + 5); @@ -305,8 +305,8 @@ void KOAgenda::init() calculateWorkingHours(); - connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( checkScrollBoundaries( int ) ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( checkScrollBoundaries( int ) ) ); // Create the Marcus Bains line. if( mAllDayMode ) { @@ -384,19 +384,19 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonRelease: case TQEvent::MouseMove: - return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) ); + return eventFilter_mouse( object, static_cast<TQMouseEvent*>( event ) ); #ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: - return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) ); + return eventFilter_wheel( object, static_cast<TQWheelEvent*>( event ) ); #endif case TQEvent::KeyPress: case TQEvent::KeyRelease: - return eventFilter_key( object, TQT_TQKEYEVENT( event ) ); + return eventFilter_key( object, static_cast<TQKeyEvent*>( event ) ); case ( TQEvent::Leave ): if ( !mActionItem ) setCursor( arrowCursor ); - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) ) + if ( object == viewport() ) emit leaveAgenda(); return true; @@ -422,8 +422,8 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de ) { #ifndef KORG_NODND TQPoint viewportPos; - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) { - viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() ); + if ( object != viewport() && object != this ) { + viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() ); } else { viewportPos = de->pos(); } @@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de ) // FIXME: This is a bad hack, as the viewportToContents seems to be off by // 2000 (which is the left upper corner of the viewport). It works correctly // for agendaItems. - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) { + if ( object == this ) { pos = viewportPos + TQPoint( contentsX(), contentsY() ); } else { pos = viewportToContents( viewportPos ); @@ -526,10 +526,10 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke ) case Key_Alt: break; default: - mTypeAheadEvents.append( TQT_TQEVENT( new TQKeyEvent( ke->type(), ke->key(), + mTypeAheadEvents.append( new TQKeyEvent( ke->type(), ke->key(), ke->ascii(), ke->state(), ke->text(), ke->isAutoRepeat(), - ke->count() ) ) ); + ke->count() ) ); if ( !mTypeAhead ) { mTypeAhead = true; emitNewEventForSelection(); @@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) TQPoint viewportPos; bool accepted=false; if ( ( e->state() & ShiftButton) == ShiftButton ) { - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) { + if ( object != viewport() ) { viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() ); } else { viewportPos = e->pos(); @@ -574,19 +574,19 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) // e->type()<<" delta: "<< e->delta()<< endl; emit zoomView( -e->delta() , contentsToGrid( viewportToContents( viewportPos ) ), - Qt::Horizontal ); + TQt::Horizontal ); accepted=true; } if ( ( e->state() & ControlButton ) == ControlButton ){ - if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) { + if ( object != viewport() ) { viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() ); } else { viewportPos = e->pos(); } emit zoomView( -e->delta() , contentsToGrid( viewportToContents( viewportPos ) ), - Qt::Vertical ); + TQt::Vertical ); emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos )))); accepted=true; } @@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) { TQPoint viewportPos; - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { + if (object != viewport()) { viewportPos = ((TQWidget *)object)->mapToParent(me->pos()); } else { viewportPos = me->pos(); @@ -606,8 +606,8 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) switch (me->type()) { case TQEvent::MouseButtonPress: // kdDebug(5850) << "koagenda: filtered button press" << endl; - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { - if (me->button() == Qt::RightButton) { + if (object != viewport()) { + if (me->button() == TQt::RightButton) { mClickedItem = dynamic_cast<KOAgendaItem *>(object); if (mClickedItem) { selectItem(mClickedItem); @@ -615,7 +615,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) mClickedItem->incidence(), mClickedItem->itemDate() ); } else { - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } } else { KOAgendaItem* item = dynamic_cast<KOAgendaItem *>(object); @@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) Incidence *incidence = item->incidence(); if ( incidence->isReadOnly() ) { mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); } else { mActionItem = item; mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence ); @@ -635,11 +635,11 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) // null. selectItem( item ); } else { - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } } } else { - if ( me->button() == Qt::RightButton ) { + if ( me->button() == TQt::RightButton ) { // if mouse pointer is not in selection, select the cell below the cursor TQPoint gpos = contentsToGrid( viewportToContents( viewportPos ) ); if ( !ptInSelection( gpos ) ) { @@ -657,12 +657,12 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) if ( !ptInSelection( gpos ) ) { selectItem(0); mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); setCursor(arrowCursor); startSelectAction(viewportPos); } } - return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda + return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda } break; @@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) // avoid an offset of a few pixels. Don't ask me why... TQPoint indicatorPos = gridToContents(contentsToGrid( viewportToContents( viewportPos ))); - if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) { + if (object != viewport()) { KOAgendaItem *moveItem = dynamic_cast<KOAgendaItem *>(object); if (moveItem && !moveItem->incidence()->isReadOnly() ) { if (!mActionItem) @@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) break; } case TQEvent::MouseButtonDblClick: - if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) { + if (object == viewport()) { selectItem(0); TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar(); emit newEventSignal( p.first, p.second ); @@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) emit startDragSignal( mActionItem->incidence() ); setCursor( arrowCursor ); mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; return; @@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) placeSubCells( mActionItem ); setCursor( arrowCursor ); mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); mActionType = NOP; mItemMoved = false; return; @@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction() } mActionItem = 0; - mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); + mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() ); mItemMoved = false; if ( multiModify ) { @@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) ); if ( YBottom <= YTop ) { kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl; @@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd, mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) ); agendaItem->setCellXY( XBegin, 0, 0 ); agendaItem->setCellXRight( XEnd ); @@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item ) } mItemsToDelete.append( thisItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) ); return taken; } @@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev ) mGridSpacingY = mDesiredGridSpacingY; } calculateWorkingHours(); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); emit gridSpacingYChanged( mGridSpacingY * 4 ); TQScrollView::resizeEvent(ev); } diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index 05a0af9d9..d123f463f 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h @@ -52,7 +52,7 @@ using namespace KCal; class MarcusBains : public TQFrame { - Q_OBJECT + TQ_OBJECT public: MarcusBains( KOAgenda *agenda = 0, const char *name = 0 ); @@ -73,7 +73,7 @@ class MarcusBains : public TQFrame class KOAgenda : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView, @@ -198,7 +198,7 @@ class KOAgenda : public TQScrollView void droppedToDo( Todo*todo, const TQPoint &gpos, bool allDay ); void enableAgendaUpdate( bool enable ); - void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ); + void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ); void mousePosSignal(const TQPoint &pos); void enterAgenda(); diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 9ab341ed9..eea5f68ff 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -74,7 +74,7 @@ struct MultiItemInfo */ class KOAgendaItem : public TQWidget, public KOrg::CellItem { - Q_OBJECT + TQ_OBJECT public: KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd, diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 7e68deebd..1bde3dbea 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -284,7 +284,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, // Create agenda splitter #ifndef KORG_NOSPLITTER - mSplitterAgenda = new TQSplitter(Qt::Vertical,this); + mSplitterAgenda = new TQSplitter(TQt::Vertical,this); topLayout->addWidget(mSplitterAgenda); #if KDE_IS_VERSION( 3, 1, 93 ) @@ -315,7 +315,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mExpandButton->setPixmap( mNotExpandedPixmap ); mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); + connect( mExpandButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); @@ -373,27 +373,27 @@ KOAgendaView::KOAgendaView( Calendar *cal, updateTimeBarWidth(); // Scrolling - connect(mAgenda->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged())); + connect(mAgenda->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged())); connect( mAgenda, - TQT_SIGNAL( zoomView( const int, const TQPoint & ,const Qt::Orientation ) ), - TQT_SLOT( zoomView( const int, const TQPoint &, const Qt::Orientation ) ) ); + TQ_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), + TQ_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); - connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(setContentsPos(int))); + connect(mTimeLabels->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(setContentsPos(int))); // Create Events, depends on type of agenda - connect( mAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); - connect( mAllDayAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); + connect( mAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); + connect( mAllDayAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); // event indicator update - connect( mAgenda, TQT_SIGNAL(lowerYChanged(int)), - TQT_SLOT(updateEventIndicatorTop(int))); - connect( mAgenda, TQT_SIGNAL(upperYChanged(int)), - TQT_SLOT(updateEventIndicatorBottom(int))); + connect( mAgenda, TQ_SIGNAL(lowerYChanged(int)), + TQ_SLOT(updateEventIndicatorTop(int))); + connect( mAgenda, TQ_SIGNAL(upperYChanged(int)), + TQ_SLOT(updateEventIndicatorBottom(int))); if ( !readOnly() ) { connectAgenda( mAgenda, mAgendaPopup, mAllDayAgenda ); @@ -417,53 +417,53 @@ KOAgendaView::~KOAgendaView() void KOAgendaView::connectAgenda( KOAgenda *agenda, TQPopupMenu *popup, KOAgenda *otherAgenda ) { - connect( agenda, TQT_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), - popup, TQT_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), + popup, TQ_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showNewEventPopupSignal()), - TQT_SLOT(showNewEventPopup()) ); + connect( agenda, TQ_SIGNAL(showNewEventPopupSignal()), + TQ_SLOT(showNewEventPopup()) ); // Create/Show/Edit/Delete Event - connect( agenda, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + connect( agenda, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - otherAgenda, TQT_SLOT(clearSelection()) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - TQT_SIGNAL(timeSpanSelectionChanged()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + otherAgenda, TQ_SLOT(clearSelection()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + TQ_SIGNAL(timeSpanSelectionChanged()) ); - connect( agenda, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( agenda, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( agenda, TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); - connect( agenda, TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + connect( agenda, TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); + connect( agenda, TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); - connect( agenda, TQT_SIGNAL(itemModified(KOAgendaItem *)), - TQT_SLOT(updateEventDates(KOAgendaItem *)) ); + connect( agenda, TQ_SIGNAL(itemModified(KOAgendaItem *)), + TQ_SLOT(updateEventDates(KOAgendaItem *)) ); - connect( agenda, TQT_SIGNAL(enableAgendaUpdate(bool)), - TQT_SLOT(enableAgendaUpdate(bool)) ); + connect( agenda, TQ_SIGNAL(enableAgendaUpdate(bool)), + TQ_SLOT(enableAgendaUpdate(bool)) ); // drag signals - connect( agenda, TQT_SIGNAL(startDragSignal(Incidence *)), - TQT_SLOT(startDrag(Incidence *)) ); + connect( agenda, TQ_SIGNAL(startDragSignal(Incidence *)), + TQ_SLOT(startDrag(Incidence *)) ); // synchronize selections - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - otherAgenda, TQT_SLOT(deselectItem()) ); - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + otherAgenda, TQ_SLOT(deselectItem()) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); // rescheduling of todos by d'n'd - connect( agenda, TQT_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), - TQT_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); + connect( agenda, TQ_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), + TQ_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); } @@ -561,7 +561,7 @@ void KOAgendaView::zoomOutHorizontally( const TQDate &date ) } void KOAgendaView::zoomView( const int delta, const TQPoint &pos, - const Qt::Orientation orient ) + const TQt::Orientation orient ) { static TQDate zoomDate; static TQTimer *t = new TQTimer( this ); @@ -569,7 +569,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos, //Zoom to the selected incidence, on the other way // zoom to the date on screen after the first mousewheel move. - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { TQDate date=mAgenda->selectedIncidenceDate(); if ( date.isValid() ) zoomDate=date; @@ -584,7 +584,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos, else zoomInHorizontally( zoomDate ); } else { - // Qt::Vertical zoom + // Vertical zoom TQPoint posConstentsOld = mAgenda->gridToContents(pos); if ( delta > 0 ) { zoomOutVertically(); @@ -682,7 +682,7 @@ void KOAgendaView::createDayLabels( bool force ) if ( !mIsSideBySide ) mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()); mDayLabels->show(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateDayLabelSizes() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateDayLabelSizes() ) ); } void KOAgendaView::enableAgendaUpdate( bool enable ) @@ -1117,7 +1117,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) if ( !result ) { mPendingChanges = true; - TQTimer::singleShot( 0, this, TQT_SLOT(updateView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateView()) ); return; } @@ -1131,7 +1131,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) // recreated. All others have to!!! if ( incidence->doesRecur() ) { mUpdateItem = incidence; - TQTimer::singleShot( 0, this, TQT_SLOT( doUpdateItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateItem() ) ); } enableAgendaUpdate( true ); diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 887cc9573..bbc9c2357 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -50,7 +50,7 @@ namespace KOrg { class EventIndicator : public TQFrame { - Q_OBJECT + TQ_OBJECT public: enum Location { Top, Bottom }; @@ -74,7 +74,7 @@ class EventIndicator : public TQFrame class KOAlternateLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel, @@ -107,7 +107,7 @@ class KOAlternateLabel : public TQLabel */ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer { - Q_OBJECT + TQ_OBJECT public: KOAgendaView( Calendar *cal, @@ -197,7 +197,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void zoomView( const int delta, const TQPoint &pos, - const Qt::Orientation orient=Qt::Horizontal ); + const TQt::Orientation orient=TQt::Horizontal ); void clearTimeSpanSelection(); diff --git a/korganizer/koapp.h b/korganizer/koapp.h index 782e69942..59ead1a01 100644 --- a/korganizer/koapp.h +++ b/korganizer/koapp.h @@ -29,7 +29,7 @@ class KOrganizerApp : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KOrganizerApp(); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index d95618c87..5c8ddc39f 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -109,9 +109,9 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mNameEdit->setClickMessage( i18n("Click to add a new attendee") ); attendeeLabel->setBuddy( mNameEdit ); mNameEdit->installEventFilter( this ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( updateAttendee() ) ); - connect( mNameEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(expandAttendee()) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( updateAttendee() ) ); + connect( mNameEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(expandAttendee()) ); topLayout->addMultiCellWidget( mNameEdit, 0, 0, 1, 2 ); whatsThis = i18n("Edits the role of the attendee selected " @@ -125,8 +125,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) TQWhatsThis::add( mRoleCombo, whatsThis ); mRoleCombo->insertStringList( Attendee::roleList() ); attendeeRoleLabel->setBuddy( mRoleCombo ); - connect( mRoleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mRoleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRoleCombo, 1, 1 ); mDelegateLabel = new TQLabel( parent ); @@ -151,8 +151,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) ); statusLabel->setBuddy( mStatusCombo ); - connect( mStatusCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mStatusCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mStatusCombo, 2, 1 ); topLayout->setColStretch( 2, 1 ); @@ -163,7 +163,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "selected in the list above to request " "a response concerning attendance.") ); mRsvpButton->setText( i18n("Re&quest response") ); - connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) ); + connect( mRsvpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRsvpButton, 2, 2 ); TQWidget *buttonBox = new TQWidget( parent ); @@ -179,7 +179,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "from your addressbook, click the 'Select Addressee' " "button instead.") ); buttonLayout->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addNewAttendee() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addNewAttendee() ) ); mRemoveButton = new TQPushButton( i18n("&Remove"), buttonBox ); TQWhatsThis::add( mRemoveButton, @@ -193,7 +193,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) i18n("Opens your address book, allowing you to select " "new attendees from it.") ); buttonLayout->addWidget( mAddressBookButton ); - connect( mAddressBookButton, TQT_SIGNAL( clicked() ), TQT_SLOT( openAddressBook() ) ); + connect( mAddressBookButton, TQ_SIGNAL( clicked() ), TQ_SLOT( openAddressBook() ) ); topLayout->addMultiCellWidget( buttonBox, 0, 3, 3, 3 ); @@ -277,7 +277,7 @@ void KOAttendeeEditor::addNewAttendee() // We don't want the hint again mNameEdit->setClickMessage( "" ); mNameEdit->setFocus(); - TQTimer::singleShot( 0, mNameEdit, TQT_SLOT( selectAll() ) ); + TQTimer::singleShot( 0, mNameEdit, TQ_SLOT( selectAll() ) ); } void KOAttendeeEditor::readEvent(KCal::Incidence * incidence) @@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe() bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev) { - if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn && + if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn && currentAttendee() == 0 ) { addNewAttendee(); } diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 3454f81d2..042419fdf 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -46,7 +46,7 @@ namespace KCal { */ class KOAttendeeEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KOAttendeeEditor( TQWidget *parent, const char *name = 0 ); diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index 5341e1d03..dc6a76eab 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -39,8 +39,8 @@ KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const ch mEventViewer = new KOEventViewer( calendar, this ); setMainWidget( mEventViewer ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCancel() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotOk( ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotOk( ) ) ); // FIXME: Set a sensible size (based on the content?). setMinimumSize( 300, 200 ); diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h index 1af7c47c5..5be67874b 100644 --- a/korganizer/kocounterdialog.h +++ b/korganizer/kocounterdialog.h @@ -38,7 +38,7 @@ class KOEventViewer; */ class KOCounterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 5d95b81e7..0a575a77d 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -125,9 +125,9 @@ void KODayMatrix::setCalendar( Calendar *cal ) mCalendar->registerObserver( this ); CalendarResources *calres = dynamic_cast<CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } setAcceptDrops( mCalendar ); @@ -725,5 +725,5 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month ) d = d.addDays( -7 ); // Start on the second line } - return tqMakePair( d, d.addDays( NUMDAYS-1 ) ); + return qMakePair( d, d.addDays( NUMDAYS-1 ) ); } diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 79231b467..9b3db818a 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -104,7 +104,7 @@ class DynamicTip : public TQToolTip */ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer { - Q_OBJECT + TQ_OBJECT public: /** constructor to create a day matrix widget. diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 20ed0259c..17bb056ce 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -93,8 +93,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : // don't set any specific parent for the dialog, as its kept around and reused // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); - connect( mainView, TQT_SIGNAL( categoriesChanged() ), - mCategoryEditDialog, TQT_SLOT( reload() ) ); + connect( mainView, TQ_SIGNAL( categoriesChanged() ), + mCategoryEditDialog, TQ_SLOT( reload() ) ); KOGlobals::fitDialogToScreen( mCategoryEditDialog ); } @@ -123,20 +123,20 @@ void KODialogManager::showOptionsDialog() // mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable ); // mOptionsDialog = new TDEConfigureDialog( mMainView ); connect( mOptionsDialog->dialog(), - TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig() ) ); + TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig() ) ); #else mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" ); - connect( mOptionsDialog, TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig( const TQCString& ) ) ); + connect( mOptionsDialog, TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig( const TQCString& ) ) ); #if 0 - connect( mOptionsDialog, TQT_SIGNAL( applyClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); - connect( mOptionsDialog, TQT_SIGNAL( okClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( applyClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( okClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); // @TODO Find a way to do this with KCMultiDialog - connect(mCategoryEditDialog,TQT_SIGNAL(categoryConfigChanged()), - mOptionsDialog,TQT_SLOT(updateCategories())); + connect(mCategoryEditDialog,TQ_SIGNAL(categoryConfigChanged()), + mOptionsDialog,TQ_SLOT(updateCategories())); #endif TQStringList modules; @@ -172,13 +172,13 @@ void KODialogManager::showSearchDialog() { if ( !mSearchDialog ) { mSearchDialog = new SearchDialog( mMainView->calendar(), mMainView ); - connect( mSearchDialog, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( mMainView, TQT_SIGNAL(closingDown()),mSearchDialog,TQT_SLOT(reject()) ); + connect( mSearchDialog, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( mMainView, TQ_SIGNAL(closingDown()),mSearchDialog,TQ_SLOT(reject()) ); } // make sure the widget is on top again mSearchDialog->show(); @@ -190,10 +190,10 @@ void KODialogManager::showArchiveDialog() #ifndef KORG_NOARCHIVE if (!mArchiveDialog) { mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); - connect(mArchiveDialog,TQT_SIGNAL(eventsDeleted()), - mMainView,TQT_SLOT(updateView())); - connect(mArchiveDialog,TQT_SIGNAL(autoArchivingSettingsModified()), - mMainView,TQT_SLOT(slotAutoArchivingSettingsModified())); + connect(mArchiveDialog,TQ_SIGNAL(eventsDeleted()), + mMainView,TQ_SLOT(updateView())); + connect(mArchiveDialog,TQ_SIGNAL(autoArchivingSettingsModified()), + mMainView,TQ_SLOT(slotAutoArchivingSettingsModified())); } mArchiveDialog->show(); mArchiveDialog->raise(); @@ -207,12 +207,12 @@ void KODialogManager::showFilterEditDialog( TQPtrList<CalFilter> *filters ) { if ( !mFilterEditDialog ) { mFilterEditDialog = new FilterEditDialog( filters, mMainView ); - connect( mFilterEditDialog, TQT_SIGNAL( filterChanged() ), - mMainView, TQT_SLOT( updateFilter() ) ); - connect( mFilterEditDialog, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mFilterEditDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( filterChanged() ), + mMainView, TQ_SLOT( updateFilter() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mFilterEditDialog, TQ_SLOT( updateCategoryConfig() ) ); } mFilterEditDialog->show(); mFilterEditDialog->raise(); @@ -241,29 +241,29 @@ void KODialogManager::connectTypeAhead( KOEventEditor *editor, { if ( editor && agenda ) { agenda->setTypeAheadReceiver( editor->typeAheadReceiver() ); - connect( editor, TQT_SIGNAL( focusReceivedSignal() ), - agenda, TQT_SLOT( finishTypeAhead() ) ); + connect( editor, TQ_SIGNAL( focusReceivedSignal() ), + agenda, TQ_SLOT( finishTypeAhead() ) ); } } void KODialogManager::connectEditor( KOIncidenceEditor*editor ) { - connect( editor, TQT_SIGNAL( deleteIncidenceSignal( Incidence * ) ), - mMainView, TQT_SLOT( deleteIncidence( Incidence * ) ) ); - - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - editor, TQT_SIGNAL( updateCategoryConfig() ) ); - connect( editor, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - - connect( editor, TQT_SIGNAL( dialogClose( Incidence * ) ), - mMainView, TQT_SLOT( dialogClosing( Incidence * ) ) ); - connect( editor, TQT_SIGNAL( editCanceled( Incidence * ) ), - mMainView, TQT_SLOT( editCanceled( Incidence * ) ) ); - connect( mMainView, TQT_SIGNAL( closingDown() ), editor, TQT_SLOT( reject() ) ); - - connect( editor, TQT_SIGNAL( deleteAttendee( Incidence * ) ), - mMainView, TQT_SIGNAL( cancelAttendees( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( deleteIncidenceSignal( Incidence * ) ), + mMainView, TQ_SLOT( deleteIncidence( Incidence * ) ) ); + + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + editor, TQ_SIGNAL( updateCategoryConfig() ) ); + connect( editor, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + + connect( editor, TQ_SIGNAL( dialogClose( Incidence * ) ), + mMainView, TQ_SLOT( dialogClosing( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( editCanceled( Incidence * ) ), + mMainView, TQ_SLOT( editCanceled( Incidence * ) ) ); + connect( mMainView, TQ_SIGNAL( closingDown() ), editor, TQ_SLOT( reject() ) ); + + connect( editor, TQ_SIGNAL( deleteAttendee( Incidence * ) ), + mMainView, TQ_SIGNAL( cancelAttendees( Incidence * ) ) ); } KOTodoEditor *KODialogManager::getTodoEditor() diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h index 4fbb70560..64f1b405f 100644 --- a/korganizer/kodialogmanager.h +++ b/korganizer/kodialogmanager.h @@ -50,7 +50,7 @@ using namespace KCal; */ class KODialogManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: KODialogManager( CalendarView * ); diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 1415eef59..e7d1beb96 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -206,25 +206,25 @@ KOEditorAlarms::KOEditorAlarms( const TQCString &type, mWidget->mAlarmList->setResizeMode( TQListView::LastColumn ); mWidget->mAlarmList->setColumnWidthMode( 0, TQListView::Maximum ); mWidget->mAlarmList->setColumnWidthMode( 1, TQListView::Maximum ); - connect( mWidget->mAlarmList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); - connect( mWidget->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); - connect( mWidget->mDuplicateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDuplicate() ) ); - - connect( mWidget->mAlarmOffset, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mOffsetUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mBeforeAfter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeats, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAlarmType, TQT_SIGNAL(clicked(int)), TQT_SLOT( changed() ) ); - connect( mWidget->mDisplayText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); - connect( mWidget->mSoundFile, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mApplication, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAppArguments, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailAddress, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); + connect( mWidget->mAlarmList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( mWidget->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); + connect( mWidget->mDuplicateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDuplicate() ) ); + + connect( mWidget->mAlarmOffset, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mOffsetUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mBeforeAfter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeats, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAlarmType, TQ_SIGNAL(clicked(int)), TQ_SLOT( changed() ) ); + connect( mWidget->mDisplayText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); + connect( mWidget->mSoundFile, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mApplication, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAppArguments, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailAddress, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); init(); diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h index f713fcf9d..188557334 100644 --- a/korganizer/koeditoralarms.h +++ b/korganizer/koeditoralarms.h @@ -33,7 +33,7 @@ class AlarmListViewItem; class KOEditorAlarms : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KOEditorAlarms( const TQCString &type, diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 48b9acddf..669fd6365 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -189,7 +189,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, i18n( "Type any string you desire here for the name of the attachment" ) ); grid->addMultiCellWidget( mLabelEdit, 0, 0, 1, 2 ); - KSeparator *sep = new KSeparator( Qt::Horizontal, topFrame ); + KSeparator *sep = new KSeparator( TQt::Horizontal, topFrame ); grid->addMultiCellWidget( sep, 1, 1, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Type:" ), topFrame ); @@ -224,10 +224,10 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, i18n( "Enter the path to the attachment file or use the " "file browser by pressing the adjacent button" ) ); grid->addMultiCellWidget( mURLRequester, 4, 4, 1, 2 ); - connect( mURLRequester, TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(urlSelected(const TQString &)) ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); + connect( mURLRequester, TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(urlSelected(const TQString &)) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); urlChanged( item->uri() ); } else { uint size = item->attachment()->size(); @@ -324,8 +324,8 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) setMaxItemWidth( TQMAX(maxItemWidth(), 250) ); setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 ); - connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); + connect( this, TQ_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + this, TQ_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); } KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment ) @@ -462,12 +462,12 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Displays a list of current items (files, mail, etc.) " "that have been associated with this event or to-do. ") ); topLayout->addWidget( mAttachments ); - connect( mAttachments, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), - TQT_SLOT( showAttachment( TQIconViewItem * ) ) ); - connect( mAttachments, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( mAttachments, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); + connect( mAttachments, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + TQ_SLOT( showAttachment( TQIconViewItem * ) ) ); + connect( mAttachments, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( mAttachments, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); TQPushButton *addButton = new TQPushButton( this ); addButton->setIconSet( SmallIconSet( "add" ) ); @@ -477,7 +477,7 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, "to add to this event or to-do as link or as " "inline data." ) ); topLayout->addWidget( addButton ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()) ); mRemoveBtn = new TQPushButton( this ); mRemoveBtn->setIconSet( SmallIconSet( "remove" ) ); @@ -486,33 +486,33 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Removes the attachment selected in the list above " "from this event or to-do.") ); topLayout->addWidget( mRemoveBtn ); - connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) ); + connect( mRemoveBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()) ); mContextMenu = new TDEPopupMenu( this ); - TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); + TDEActionCollection* ac = new TDEActionCollection( this, this ); - mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); + mOpenAction = new TDEAction( i18n("Open"), 0, this, TQ_SLOT(slotShow()), ac ); mOpenAction->plug( mContextMenu ); - mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); + mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQ_SLOT(slotSaveAs()), ac ); mSaveAsAction->plug( mContextMenu ); mContextMenu->insertSeparator(); - mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); + mCopyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), ac ); mCopyAction->plug( mContextMenu ); - mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac ); + mCutAction = KStdAction::cut(this, TQ_SLOT(slotCut()), ac ); mCutAction->plug( mContextMenu ); - TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); + TDEAction *action = KStdAction::paste(this, TQ_SLOT(slotPaste()), ac ); action->plug( mContextMenu ); mContextMenu->insertSeparator(); - mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); + mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQ_SLOT(slotRemove()), ac ); mDeleteAction->plug( mContextMenu ); mDeleteAction->setShortcut( Key_Delete ); mContextMenu->insertSeparator(); - mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); + mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQ_SLOT(slotEdit()), ac ); mEditAction->plug( mContextMenu ); selectionChanged(); @@ -691,7 +691,7 @@ void KOEditorAttachments::slotEdit() AttachmentEditDialog *dialog = new AttachmentEditDialog( attitem, mAttachments ); dialog->mInline->setEnabled( false ); dialog->setModal( false ); - connect( dialog, TQT_SIGNAL(hidden()), dialog, TQT_SLOT(delayedDestruct()) ); + connect( dialog, TQ_SIGNAL(hidden()), dialog, TQ_SLOT(delayedDestruct()) ); dialog->show(); } } @@ -854,7 +854,7 @@ void KOEditorAttachments::readIncidence( KCal::Incidence *i ) addAttachment( (*it) ); } if ( mAttachments->count() > 0 ) { - TQTimer::singleShot( 0, mAttachments, TQT_SLOT(arrangeItemsInGrid()) ); + TQTimer::singleShot( 0, mAttachments, TQ_SLOT(arrangeItemsInGrid()) ); } } diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h index b89dd0b33..adeded3a4 100644 --- a/korganizer/koeditorattachments.h +++ b/korganizer/koeditorattachments.h @@ -56,7 +56,7 @@ class KTempDir; class AttachmentEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 ); @@ -80,7 +80,7 @@ class AttachmentEditDialog : public KDialogBase class KOEditorAttachments : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KOEditorAttachments( int spacing = 8, TQWidget *parent = 0, @@ -151,7 +151,7 @@ class KOEditorAttachments : public TQWidget class AttachmentIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT friend class KOEditorAttachments; diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 95d211762..9d570f168 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -208,17 +208,17 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, mListView->setFixedHeight( 78 ); } - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateAttendeeInput() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateAttendeeInput() ) ); #ifndef KORG_NODND - connect( mListView, TQT_SIGNAL( dropped( Attendee * ) ), - TQT_SLOT( slotInsertAttendee( Attendee * ) ) ); + connect( mListView, TQ_SIGNAL( dropped( Attendee * ) ), + TQ_SLOT( slotInsertAttendee( Attendee * ) ) ); #endif topLayout->addWidget( mListView ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeAttendee()) ); updateAttendeeInput(); } diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 97fac51cc..418c8edb5 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -59,7 +59,7 @@ typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem; */ class KOAttendeeListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: KOAttendeeListView (TQWidget *parent=0, const char *name=0); @@ -78,7 +78,7 @@ signals: class KOEditorDetails : public KOAttendeeEditor { - Q_OBJECT + TQ_OBJECT public: KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0); diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 88c5414b3..05db9b5de 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -263,15 +263,15 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, scaleCombo->insertItem( i18n( "Month" ) ); scaleCombo->insertItem( i18n( "Automatic" ) ); scaleCombo->setCurrentItem( 0 ); // start with "hour" - connect( scaleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotScaleChanged( int ) ) ); + connect( scaleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotScaleChanged( int ) ) ); controlLayout->addWidget( scaleCombo ); TQPushButton *button = new TQPushButton( i18n( "Center on Start" ), this ); TQWhatsThis::add( button, i18n("Centers the Gantt chart on the start time " "and day of this event.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenterOnStart() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenterOnStart() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -280,7 +280,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, TQWhatsThis::add( button, i18n("Moves the event to a date and time when all the " "attendees are free.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPickDate() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPickDate() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -290,7 +290,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, i18n("Reloads Free/Busy data for all attendees from " "the corresponding servers.") ); controlLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( manualReload() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( manualReload() ) ); mGanttView = new KDGanttView( this, "mGanttView" ); TQWhatsThis::add( mGanttView, @@ -330,37 +330,37 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mEventRectangle->setColor( TQt::magenta ); mGanttView->addIntervalBackgroundColor( mEventRectangle ); - connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &, + connect( mGanttView, TQ_SIGNAL ( timeIntervalSelected( const TQDateTime &, const TQDateTime & ) ), - mGanttView, TQT_SLOT( zoomToSelection( const TQDateTime &, + mGanttView, TQ_SLOT( zoomToSelection( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGanttView, TQT_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), - TQT_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); - connect( mGanttView, TQT_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), - this, TQT_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); - - connect( mGanttView, TQT_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), - this, TQT_SLOT(updateAttendeeInput()) ); - connect( mGanttView, TQT_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), - this, TQT_SLOT(listViewClicked(int, KDGanttViewItem*)) ); + connect( mGanttView, TQ_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), + TQ_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); + connect( mGanttView, TQ_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), + this, TQ_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); + + connect( mGanttView, TQ_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), + this, TQ_SLOT(updateAttendeeInput()) ); + connect( mGanttView, TQ_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), + this, TQ_SLOT(listViewClicked(int, KDGanttViewItem*)) ); FreeBusyManager *m = KOGroupware::instance()->freeBusyManager(); - connect( m, TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); + connect( m, TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), + TQ_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoReload() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoReload() ) ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeAttendee()) ); slotOrganizerChanged( mOrganizerCombo->currentText() ); - connect( mOrganizerCombo, TQT_SIGNAL( activated(const TQString&) ), - this, TQT_SLOT( slotOrganizerChanged(const TQString&) ) ); + connect( mOrganizerCombo, TQ_SIGNAL( activated(const TQString&) ), + this, TQ_SLOT( slotOrganizerChanged(const TQString&) ) ); //suppress the buggy consequences of clicks on the time header widget mGanttView->timeHeaderWidget()->installEventFilter( this ); @@ -923,7 +923,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu() void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item) { - if ( button == Qt::LeftButton && item == 0 ) + if ( button == TQt::LeftButton && item == 0 ) addNewAttendee(); } @@ -983,7 +983,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer) bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event ) { - if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) && + if ( watched == mGanttView->timeHeaderWidget() && event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) { return true; } else { diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h index c5201fc23..2af15f44d 100644 --- a/korganizer/koeditorfreebusy.h +++ b/korganizer/koeditorfreebusy.h @@ -44,7 +44,7 @@ namespace KCal { class KOEditorFreeBusy : public KOAttendeeEditor { - Q_OBJECT + TQ_OBJECT public: KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0, diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 304fea93f..c8c70277e 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -114,8 +114,8 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mSummaryEdit = new FocusLineEdit( parent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); - connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); + connect( mSummaryEdit, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); headerLayout->addWidget(mSummaryEdit,1,1); summaryLabel->setBuddy( mSummaryEdit ); @@ -152,7 +152,7 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mCategoriesButton = new TQPushButton( parent ); mCategoriesButton->setText(i18n("Select...")); TQWhatsThis::add( mCategoriesButton, whatsThis ); - connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories())); + connect(mCategoriesButton,TQ_SIGNAL(clicked()),TQ_SLOT(selectCategories())); thirdLineLayout->addWidget( mCategoriesButton ); } @@ -209,7 +209,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) i18n( "Push this button to create an advanced set of reminders " "for this event or to-do." ) ); TQToolTip::add( mAlarmAdvancedButton, i18n( "Set an advanced reminder" ) ); - connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) ); + connect( mAlarmAdvancedButton, TQ_SIGNAL(clicked()), TQ_SLOT(editAlarms()) ); alarmLayout->addWidget( mAlarmAdvancedButton ); mSimpleAlarmBox = new TQHBox( parent ); @@ -247,17 +247,17 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) mAlarmTimeEdit->setEnabled( false ); mAlarmIncrCombo->setEnabled( false ); mAlarmInfoLabel->setEnabled( false ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQ_SLOT(setEnabled(bool)) ); } void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout) { mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent ); - connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( mAttachments, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SIGNAL( openURL( const KURL & ) ) ); topLayout->addWidget( mAttachments, 1 ); } @@ -290,8 +290,8 @@ void KOEditorGeneral::selectCategories() KOGlobals::fitDialogToScreen( categoryDialog ); categoryDialog->setSelected( mCategories ); - connect(categoryDialog, TQT_SIGNAL(editCategories()), this, TQT_SIGNAL(openCategoryDialog())); - connect(this, TQT_SIGNAL(updateCategoryConfig()), categoryDialog, TQT_SLOT(updateCategoryConfig())); + connect(categoryDialog, TQ_SIGNAL(editCategories()), this, TQ_SIGNAL(openCategoryDialog())); + connect(this, TQ_SIGNAL(updateCategoryConfig()), categoryDialog, TQ_SLOT(updateCategoryConfig())); if ( categoryDialog->exec() ) { setCategories( categoryDialog->selectedCategories() ); @@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text ) TQObject *KOEditorGeneral::typeAheadReceiver() const { - return TQT_TQOBJECT(mSummaryEdit); + return mSummaryEdit; } void KOEditorGeneral::updateAttendeeSummary(int count) diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index c387792ad..b005d6080 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -48,7 +48,7 @@ using namespace KCal; class FocusLineEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: FocusLineEdit( TQWidget *parent ); @@ -65,7 +65,7 @@ class FocusLineEdit : public TQLineEdit class KOEditorGeneral : public TQObject { - Q_OBJECT + TQ_OBJECT public: KOEditorGeneral (TQObject* parent=0,const char* name=0); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 49b4d9691..2772fbeec 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -60,10 +60,10 @@ KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent, const char* name) : KOEditorGeneral( parent, name) { - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( setDuration() ) ); - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( emitDateTimeStr() )); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( setDuration() ) ); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( emitDateTimeStr() )); } KOEditorGeneralEvent::~KOEditorGeneralEvent() @@ -95,7 +95,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); - TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal, i18n("Date && Time"),parent); TQWhatsThis::add( timeGroupBox, i18n("Sets options related to the date and time of the " @@ -130,22 +130,22 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); - connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); + connect(mAlldayEventCheckbox, TQ_SIGNAL(toggled(bool)),TQ_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time - connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(startTimeChanged(TQTime))); - connect(mEndTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(endTimeChanged(TQTime))); + connect(mStartTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(startTimeChanged(TQTime))); + connect(mEndTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(endTimeChanged(TQTime))); // date widgets are checked if they contain a valid date - connect(mStartDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(startDateChanged(const TQDate&))); - connect(mEndDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(endDateChanged(const TQDate&))); + connect(mStartDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(startDateChanged(const TQDate&))); + connect(mEndDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 2, 0 ); @@ -154,7 +154,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -206,12 +206,12 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la barLayout->addWidget( label ); barLayout->addStretch( 1 ); TQPushButton *button = new TQPushButton( i18n("Accept"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(acceptInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(acceptInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); button = new TQPushButton( i18n("Decline"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(declineInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(declineInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); mInvitationBar->hide(); diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index c6ace2b1d..0483d4006 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -41,7 +41,7 @@ using namespace KCal; class KOEditorGeneralEvent : public KOEditorGeneral { - Q_OBJECT + TQ_OBJECT public: KOEditorGeneralEvent (TQObject* parent=0,const char* name=0); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 9b27c0638..34191bed4 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -47,7 +47,7 @@ KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent, const char *name ) - : KOEditorGeneral( TQT_TQOBJECT(parent), name ) + : KOEditorGeneral( parent, name ) { setType( "Journal" ); } @@ -94,8 +94,8 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout mTimeEdit = new KTimeEdit( parent ); dateLayout->addWidget( mTimeEdit ); - connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)), - mTimeEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mTimeCheckBox, TQ_SIGNAL(toggled(bool)), + mTimeEdit, TQ_SLOT(setEnabled(bool)) ); dateLayout->addStretch(); setTime( TQTime( -1, -1, -1 ) ); diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h index 0a2eef182..0de0be427 100644 --- a/korganizer/koeditorgeneraljournal.h +++ b/korganizer/koeditorgeneraljournal.h @@ -47,7 +47,7 @@ using namespace KCal; class KOEditorGeneralJournal : public KOEditorGeneral { - Q_OBJECT + TQ_OBJECT public: KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 ); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 5af7fd60f..b871575be 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -96,7 +96,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) kdDebug(5850) << k_funcinfo << endl; TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); - TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal, i18n("Date && Time"),parent); timeLayout->addWidget(timeGroupBox); @@ -113,46 +113,46 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); layoutTimeBox->addWidget(mStartCheck,0,0); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableStartEdit(bool))); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); layoutTimeBox->addWidget(mStartDateEdit,0,1); - connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); + connect(mStartDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); layoutTimeBox->addWidget(mStartTimeEdit,0,2); - connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); + connect(mStartTimeEdit,TQ_SIGNAL(timeChanged(TQTime)),TQ_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); layoutTimeBox->addWidget(mDueCheck,1,0); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableDueEdit(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SIGNAL(dueDateEditToggle(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); layoutTimeBox->addWidget(mDueDateEdit,1,1); - connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); + connect(mDueDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); layoutTimeBox->addWidget(mDueTimeEdit,1,2); - connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); + connect(mDueTimeEdit,TQ_SIGNAL(timeChanged( TQTime )),TQ_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); layoutTimeBox->addWidget( mTimeButton, 0, 3 ); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableTimeEdits(bool))); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 3, 0 ); @@ -161,7 +161,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -195,7 +195,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQWhatsThis::add( mCompletedToggle, i18n( "Click this checkbox to toggle the completed percentage of the to-do " "between 0% or 100%" ) ); - connect( mCompletedToggle, TQT_SIGNAL(clicked()), TQT_SLOT(completedChanged()) ); + connect( mCompletedToggle, TQ_SIGNAL(clicked()), TQ_SLOT(completedChanged()) ); completionLayout->addWidget( mCompletedToggle ); label->setBuddy( mCompletedToggle ); @@ -209,7 +209,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQString label = i18n( "Percent complete", "%1 %" ).arg( i ); mCompletedCombo->insertItem( label ); } - connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); + connect( mCompletedCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(completedChanged(int)) ); completionLayout->addWidget( mCompletedCombo ); mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent ); diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h index 3ccf9c818..07395f1ee 100644 --- a/korganizer/koeditorgeneraltodo.h +++ b/korganizer/koeditorgeneraltodo.h @@ -41,7 +41,7 @@ using namespace KCal; class KOEditorGeneralTodo : public KOEditorGeneral { - Q_OBJECT + TQ_OBJECT public: KOEditorGeneralTodo (TQObject* parent=0,const char* name=0); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index ac372db76..5a5beae69 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -578,7 +578,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - TQGroupBox *groupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("E&xceptions"), + TQGroupBox *groupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("E&xceptions"), this ); topLayout->addWidget( groupBox ); @@ -620,12 +620,12 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : boxLayout->setRowStretch( 4, 1 ); boxLayout->setColStretch( 1, 3 ); - connect( addExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( addException() ) ); - connect( changeExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( changeException() ) ); - connect( deleteExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( deleteException() ) ); + connect( addExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( addException() ) ); + connect( changeExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( changeException() ) ); + connect( deleteExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( deleteException() ) ); } void ExceptionsWidget::addException() @@ -700,7 +700,7 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mRangeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"), + mRangeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Recurrence Range"), this ); TQWhatsThis::add( mRangeGroupBox, i18n("Sets a range for which these recurrence rules will " @@ -765,12 +765,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, endDateLayout->addStretch( 1 ); - connect( mNoEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDurationButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); + connect( mNoEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDurationButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); } void RecurrenceRangeWidget::setDefaults( const TQDateTime &from ) @@ -887,11 +887,11 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : topLayout->addWidget( mTypeCombo ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( emitChoice() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( emitChoice() ) ); } else { mTypeCombo = 0; - TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, this ); + TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, this ); ruleButtonGroup->setFrameStyle( TQFrame::NoFrame ); topLayout->addWidget( ruleButtonGroup ); @@ -912,14 +912,14 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : i18n("Sets the event or to-do to recur yearly according " "to the specified rules.") ); - connect( mDailyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mWeeklyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mMonthlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mYearlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); + connect( mDailyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mWeeklyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mMonthlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mYearlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); } } @@ -975,12 +975,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : TQWhatsThis::add( mEnabledCheck, i18n("Enables recurrence for this event or to-do according " "to the specified rules.") ); - connect( mEnabledCheck, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setRecurrenceEnabled( bool ) ) ); + connect( mEnabledCheck, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setRecurrenceEnabled( bool ) ) ); topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); - mTimeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Appointment Time "), + mTimeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Appointment Time "), this ); TQWhatsThis::add( mTimeGroupBox, i18n("Displays appointment time information.") ); @@ -998,9 +998,9 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : // mDateTimeLabel = new TQLabel( timeFrame ); // layoutTimeFrame->addWidget( mDateTimeLabel ); - Qt::Orientation orientation; - if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal; - else orientation = Qt::Vertical; + TQt::Orientation orientation; + if ( KOPrefs::instance()->mCompactDialogs ) orientation = TQt::Horizontal; + else orientation = TQt::Vertical; mRuleBox = new TQGroupBox( 1, orientation, i18n("Recurrence Rule"), this ); TQWhatsThis::add( mRuleBox, @@ -1013,8 +1013,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : } mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); - connect( mRecurrenceChooser, TQT_SIGNAL( chosen( int ) ), - TQT_SLOT( showCurrentRule( int ) ) ); + connect( mRecurrenceChooser, TQ_SIGNAL( chosen( int ) ), + TQ_SLOT( showCurrentRule( int ) ) ); if ( !KOPrefs::instance()->mCompactDialogs ) { TQFrame *ruleSepFrame = new TQFrame( mRuleBox ); @@ -1047,16 +1047,16 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : i18n("Options concerning the time range during which " "this event or to-do should recur.") ); topLayout->addWidget( mRecurrenceRangeButton, 3, 0 ); - connect( mRecurrenceRangeButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showRecurrenceRangeDialog() ) ); + connect( mRecurrenceRangeButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showRecurrenceRangeDialog() ) ); mExceptionsWidget = 0; mExceptionsDialog = new ExceptionsDialog( this ); mExceptions = mExceptionsDialog; mExceptionsButton = new TQPushButton( i18n("Exceptions..."), this ); topLayout->addWidget( mExceptionsButton, 4, 0 ); - connect( mExceptionsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showExceptionsDialog() ) ); + connect( mExceptionsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showExceptionsDialog() ) ); } else { mRecurrenceRangeWidget = new RecurrenceRangeWidget( this ); diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 00224b0c5..04f979c96 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -148,7 +148,7 @@ class RecurYearly : public RecurBase class RecurrenceChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT public: RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 ); @@ -182,7 +182,7 @@ class ExceptionsBase class ExceptionsWidget : public TQWidget, public ExceptionsBase { - Q_OBJECT + TQ_OBJECT public: ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 ); @@ -230,7 +230,7 @@ class RecurrenceRangeBase class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase { - Q_OBJECT + TQ_OBJECT public: RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 ); @@ -281,7 +281,7 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase class KOEditorRecurrence : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 ); @@ -348,7 +348,7 @@ class KOEditorRecurrence : public TQWidget class KOEditorRecurrenceDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KOEditorRecurrenceDialog( TQWidget *parent ); diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index ef2dc5df9..6bc3c0bef 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -70,39 +70,39 @@ void KOEventEditor::init() setupDesignerTabs( "event" ); // Propagate date time settings to recurrence tab - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); // Propagate date time settings to gantt tab and back - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mFreeBusy, TQT_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mGeneral, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - - connect( mGeneral, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); - - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); - connect( this, TQT_SIGNAL( updateCategoryConfig() ), - mGeneral, TQT_SIGNAL( updateCategoryConfig() ) ); - - connect( mFreeBusy, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); - - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); - - connect( mGeneral, TQT_SIGNAL(acceptInvitation()), - mFreeBusy, TQT_SLOT(acceptForMe()) ); - connect( mGeneral, TQT_SIGNAL(declineInvitation()), - mFreeBusy, TQT_SLOT(declineForMe()) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mFreeBusy, TQ_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mGeneral, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + + connect( mGeneral, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); + + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); + connect( this, TQ_SIGNAL( updateCategoryConfig() ), + mGeneral, TQ_SIGNAL( updateCategoryConfig() ) ); + + connect( mFreeBusy, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); + + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); + + connect( mGeneral, TQ_SIGNAL(acceptInvitation()), + mFreeBusy, TQ_SLOT(acceptForMe()) ); + connect( mGeneral, TQ_SIGNAL(declineInvitation()), + mFreeBusy, TQ_SLOT(declineForMe()) ); } void KOEventEditor::reload() @@ -116,7 +116,7 @@ void KOEventEditor::reload() void KOEventEditor::setupGeneral() { - mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) ); + mGeneral = new KOEditorGeneralEvent( this ); if( KOPrefs::instance()->mCompactDialogs ) { TQFrame *topFrame = addPage(i18n("General")); @@ -154,10 +154,10 @@ void KOEventEditor::setupGeneral() mGeneral->initTime(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h index bb2405ebb..4b3c99ea6 100644 --- a/korganizer/koeventeditor.h +++ b/korganizer/koeventeditor.h @@ -47,7 +47,7 @@ using namespace KCal; */ class KOEventEditor : public KOIncidenceEditor { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 73a0942ef..1ab4b89ee 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -50,44 +50,44 @@ KOEventPopupMenu::KOEventPopupMenu() mCurrentDate = TQDate(); mHasAdditionalItems = false; - insertItem( i18n("&Show"), this, TQT_SLOT( popupShow() ) ); + insertItem( i18n("&Show"), this, TQ_SLOT( popupShow() ) ); mEditOnlyItems.append( - insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) ); + insertItem(i18n("&Edit..."), this, TQ_SLOT( popupEdit() ) ) ); #ifndef KORG_NOPRINTER insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), - this, TQT_SLOT( print() ) ); + this, TQ_SLOT( print() ) ); #endif //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"), - this, TQT_SLOT( popupCut() ) ) ); + this, TQ_SLOT( popupCut() ) ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"), - this, TQT_SLOT( popupCopy() ) ) ); + this, TQ_SLOT( popupCopy() ) ) ); // paste is always possible insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"), - this, TQT_SLOT( popupPaste() ) ); + this, TQ_SLOT( popupPaste() ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"), - this, TQT_SLOT( popupDelete() ) ) ); + this, TQ_SLOT( popupDelete() ) ) ); //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("bell"), i18n("&Toggle Reminder"), - this, TQT_SLOT( popupAlarm() ) ) ); + this, TQ_SLOT( popupAlarm() ) ) ); //------------------------------------------------------------------------ mRecurrenceItems.append( insertSeparator() ); mRecurrenceItems.append( insertItem( i18n("&Dissociate This Occurrence"), - this, TQT_SLOT( dissociateOccurrence() ) ) ); + this, TQ_SLOT( dissociateOccurrence() ) ) ); mRecurrenceItems.append( insertItem( i18n("&Dissociate Future Occurrences"), - this, TQT_SLOT( dissociateFutureOccurrence() ) ) ); + this, TQ_SLOT( dissociateFutureOccurrence() ) ) ); insertSeparator(); insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."), - this, TQT_SLOT(forward()) ); + this, TQ_SLOT(forward()) ); } void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd ) @@ -142,7 +142,7 @@ void KOEventPopupMenu::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mCurrentIncidence ); diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h index cc8468852..21c7b6aa4 100644 --- a/korganizer/koeventpopupmenu.h +++ b/korganizer/koeventpopupmenu.h @@ -37,7 +37,7 @@ class Incidence; using namespace KCal; class KOEventPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: KOEventPopupMenu(); diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 9bd038d2a..7ac375734 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -61,24 +61,24 @@ KOEventPopupMenu *KOEventView::eventPopup() { KOEventPopupMenu *eventPopup = new KOEventPopupMenu; - connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - TQT_SIGNAL(cutIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - TQT_SIGNAL(copyIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); - connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); - connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + TQ_SIGNAL(cutIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + TQ_SIGNAL(copyIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); + connect( eventPopup, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); + connect( eventPopup, TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); return eventPopup; } diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h index a5441a83f..d8b2a67ab 100644 --- a/korganizer/koeventview.h +++ b/korganizer/koeventview.h @@ -54,7 +54,7 @@ class TQPopupMenu; */ class KOEventView : public KOrg::BaseView { - Q_OBJECT + TQ_OBJECT public: diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index ddd4fcde7..7d36b4aa9 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -43,7 +43,7 @@ KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char * : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("") { mIncidence = 0; - connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) ); + connect( this, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(message(const TQString &)) ); } KOEventViewer::~KOEventViewer() diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 5aa897ac2..7758cfdc9 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -39,7 +39,7 @@ using namespace KCal; */ class KDE_EXPORT KOEventViewer : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT public: explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 7e783695b..12a2f79dd 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -43,7 +43,7 @@ KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, setMinimumSize( 500, 500 ); resize( 520, 500 ); } - connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedDestruct()) ); } KOEventViewerDialog::~KOEventViewerDialog() diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 4c6a8f37d..48c02c8a3 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -40,7 +40,7 @@ class KOEventViewer; */ class KDE_EXPORT KOEventViewerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0, diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 6e86c8575..5c8342ac3 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -84,10 +84,10 @@ KOGroupware::KOGroupware( CalendarView* view, KCal::CalendarResources* cal ) watcher->addDir( locateLocal( "data", "korganizer/income.cancel/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.reply/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.delegated/" ) ); - connect( watcher, TQT_SIGNAL( dirty( const TQString& ) ), - this, TQT_SLOT( incomingDirChanged( const TQString& ) ) ); + connect( watcher, TQ_SIGNAL( dirty( const TQString& ) ), + this, TQ_SLOT( incomingDirChanged( const TQString& ) ) ); // Now set the ball rolling - TQTimer::singleShot( 0, this, TQT_SLOT(initialCheckForChanges()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initialCheckForChanges()) ); } void KOGroupware::initialCheckForChanges() @@ -103,12 +103,12 @@ void KOGroupware::initialCheckForChanges() void KOGroupware::slotViewNewIncidenceChanger( IncidenceChangerBase* changer ) { // Call slot perhapsUploadFB if an incidence was added, changed or removed - connect( changer, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); } FreeBusyManager *KOGroupware::freeBusyManager() @@ -116,10 +116,10 @@ FreeBusyManager *KOGroupware::freeBusyManager() if ( !mFreeBusyManager ) { mFreeBusyManager = new FreeBusyManager( this, "freebusymanager" ); mFreeBusyManager->setCalendar( mCalendar ); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( mView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - this, TQT_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( mView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + this, TQ_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); slotViewNewIncidenceChanger( mView->incidenceChanger() ); } diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h index ce253dfcf..c4205637d 100644 --- a/korganizer/kogroupware.h +++ b/korganizer/kogroupware.h @@ -64,7 +64,7 @@ using namespace KOrg; class KOGroupware : public TQObject { - Q_OBJECT + TQ_OBJECT public: static KOGroupware* create( CalendarView*, KCal::CalendarResources* ); diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 83c5799f7..13626feb7 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -620,12 +620,12 @@ For security reasons, it is not recommended to store your password in the config <include location="global" impldecl="in declaration">kdemacros.h</include> <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotChanged()</slot> -</Q_SLOTS> +</slots> <exportmacro>KDE_EXPORT</exportmacro> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 40851e994..499a4580c 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -75,8 +75,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption, setButtonText( Default, i18n("&Templates...") ); } - connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotManageTemplates() ) ); - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( delayedDestruct() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotManageTemplates() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( delayedDestruct() ) ); } KOIncidenceEditor::~KOIncidenceEditor() @@ -139,12 +139,12 @@ void KOIncidenceEditor::slotManageTemplates() kdDebug(5850) << "KOIncidenceEditor::manageTemplates()" << endl; TemplateManagementDialog * const d = new TemplateManagementDialog( this, templates() ); - connect( d, TQT_SIGNAL( loadTemplate( const TQString& ) ), - this, TQT_SLOT( slotLoadTemplate( const TQString& ) ) ); - connect( d, TQT_SIGNAL( templatesChanged( const TQStringList& ) ), - this, TQT_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); - connect( d, TQT_SIGNAL( saveTemplate( const TQString& ) ), - this, TQT_SLOT( slotSaveTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( loadTemplate( const TQString& ) ), + this, TQ_SLOT( slotLoadTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( templatesChanged( const TQStringList& ) ), + this, TQ_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); + connect( d, TQ_SIGNAL( saveTemplate( const TQString& ) ), + this, TQ_SLOT( slotSaveTemplate( const TQString& ) ) ); d->exec(); return; } @@ -296,8 +296,8 @@ void KOIncidenceEditor::setupEmbeddedURLPage( const TQString &label, topFrame ); topLayout->addWidget( wid ); mEmbeddedURLPages.append( topFrame ); - connect( wid, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SLOT( openURL( const KURL & ) ) ); + connect( wid, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SLOT( openURL( const KURL & ) ) ); // TODO: Call this method only when the tab is actually activated! wid->loadContents(); } diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h index 8c397d7ca..991049295 100644 --- a/korganizer/koincidenceeditor.h +++ b/korganizer/koincidenceeditor.h @@ -56,7 +56,7 @@ using namespace KOrg; */ class KOIncidenceEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h index 14433c21d..2dd2ae3a8 100644 --- a/korganizer/kojournaleditor.h +++ b/korganizer/kojournaleditor.h @@ -45,7 +45,7 @@ class KOEditorGeneralJournal; */ class KOJournalEditor : public KOIncidenceEditor { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 3bc78156f..252bbc53f 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -71,24 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) entry->setDate( dt ); entry->setIncidenceChanger( mChanger ); entry->show(); - connect( this, TQT_SIGNAL(flushEntries()), - entry, TQT_SIGNAL(flushEntries()) ); + connect( this, TQ_SIGNAL(flushEntries()), + entry, TQ_SIGNAL(flushEntries()) ); - connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), - entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); + connect( this, TQ_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), + entry, TQ_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); - connect( this, TQT_SIGNAL(journalEdited(Journal *)), - entry, TQT_SLOT(journalEdited(Journal *)) ); - connect( this, TQT_SIGNAL(journalDeleted(Journal *)), - entry, TQT_SLOT(journalDeleted(Journal *)) ); + connect( this, TQ_SIGNAL(journalEdited(Journal *)), + entry, TQ_SLOT(journalEdited(Journal *)) ); + connect( this, TQ_SIGNAL(journalDeleted(Journal *)), + entry, TQ_SLOT(journalDeleted(Journal *)) ); - connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)), - this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)), - this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( entry, TQ_SIGNAL(editIncidence(Incidence *,const TQDate &)), + this, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( entry, TQ_SIGNAL(deleteIncidence(Incidence *)), + this, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), - this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( entry, TQ_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), + this, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); mEntries.insert( dt, entry ); } diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index e229a99f1..f2ff84a29 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h @@ -40,7 +40,7 @@ class TQVBox; */ class KOJournalView : public KOrg::BaseView { - Q_OBJECT + TQ_OBJECT public: KOJournalView( Calendar *calendar, TQWidget *parent = 0, diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index aa97348ca..df52e88a7 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -135,9 +135,9 @@ bool KOListView::ListItemVisitor::visit( Event *e ) TQString endDateTime; mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtStart(), e->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( TQt::ISODate ) ); mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) ); - mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::ISODate ) ); + mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) ); mItem->setText( Categories_Column, e->categoriesStr() ); return true; @@ -167,14 +167,14 @@ bool KOListView::ListItemVisitor::visit( Todo *t ) if ( t->hasStartDate() ) { mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtStart(), t->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( TQt::ISODate ) ); } else { mItem->setText( StartDateTime_Column, "---" ); } if ( t->hasDueDate() ) { mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtDue(), t->doesFloat() ) ); - mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::ISODate ) ); + mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( TQt::ISODate ) ); } else { mItem->setText( EndDateTime_Column, "---" ); } @@ -190,7 +190,7 @@ bool KOListView::ListItemVisitor::visit( Journal *j ) // Just use the first line mItem->setText( Summary_Column, j->description().section( "\n", 0, 0 ) ); mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( j->dtStart(), j->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( TQt::ISODate ) ); return true; } @@ -227,21 +227,21 @@ KOListView::KOListView( Calendar *calendar, /* mPopupMenu->insertSeparator(); mPopupMenu->insertItem(i18n("Show Dates"), this, - TQT_SLOT(showDates())); + TQ_SLOT(showDates())); mPopupMenu->insertItem(i18n("Hide Dates"), this, - TQT_SLOT(hideDates())); + TQ_SLOT(hideDates())); */ - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); // setMinimumSize(100,100); mListView->restoreLayout( KOGlobals::self()->config(), "KOListView Layout" ); diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index 70ba080ce..71f304af4 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -67,7 +67,7 @@ class KOListViewToolTip : public TQToolTip */ class KOListView : public KOEventView { - Q_OBJECT + TQ_OBJECT public: explicit KOListView( Calendar *calendar, diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index 9c843b59d..641d5106c 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -41,9 +41,9 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, dialog->setButtonOK( button3 ); dialog->setButtonText( KDialogBase::Yes, button1.text() ); dialog->setButtonText( KDialogBase::No, button2.text() ); - TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotYes())); - TQObject::connect( dialog->actionButton( KDialogBase::No ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotNo())); -// TQObject::connect( dialog, TQT_SIGNAL( noClicked() ), dialog, TQT_SLOT(slotNo())); + TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotYes())); + TQObject::connect( dialog->actionButton( KDialogBase::No ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotNo())); +// TQObject::connect( dialog, TQ_SIGNAL( noClicked() ), dialog, TQ_SLOT(slotNo())); bool checkboxResult = false; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ab61181ca..23b477e1f 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e ) { TQListBox::mousePressEvent( e ); - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { emit rightClick(); } } @@ -259,7 +259,7 @@ void MonthViewItem::paint( TQPainter *p ) } if ( !bgColor.isValid() ) { - bgColor = palette().color( TQPalette::Normal, + bgColor = palette().color( TQPalette::Active, sel ? TQColorGroup::Highlight : TQColorGroup::Background ); } @@ -286,7 +286,7 @@ void MonthViewItem::paint( TQPainter *p ) } if ( !frameColor.isValid() ) { - frameColor = palette().color( TQPalette::Normal, + frameColor = palette().color( TQPalette::Active, sel ? TQColorGroup::Highlight : TQColorGroup::Foreground ); } else { @@ -405,13 +405,13 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) updateConfig(); - connect( mItemList, TQT_SIGNAL( doubleClicked( TQListBoxItem *) ), - TQT_SLOT( defaultAction( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( rightButtonPressed( TQListBoxItem *, + connect( mItemList, TQ_SIGNAL( doubleClicked( TQListBoxItem *) ), + TQ_SLOT( defaultAction( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( rightButtonPressed( TQListBoxItem *, const TQPoint &) ), - TQT_SLOT( contextMenu( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( clicked( TQListBoxItem * ) ), - TQT_SLOT( select() ) ); + TQ_SLOT( contextMenu( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( clicked( TQListBoxItem * ) ), + TQ_SLOT( select() ) ); } void MonthViewCell::setDate( const TQDate &date ) @@ -861,10 +861,10 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name mCells.insert( row * mDaysPerWeek + col, cell ); dayLayout->addWidget( cell, row + 2, col ); - connect( cell, TQT_SIGNAL(defaultAction(Incidence *)), - TQT_SLOT(defaultAction(Incidence *)) ); - connect( cell, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( cell, TQ_SIGNAL(defaultAction(Incidence *)), + TQ_SLOT(defaultAction(Incidence *)) ); + connect( cell, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); } dayLayout->setRowStretch( row + 2, 1 ); } diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index d9b63bd98..706a2e9fb 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -50,7 +50,7 @@ class KOMonthCellToolTip : public TQToolTip class KNoScrollListBox: public TQListBox { - Q_OBJECT + TQ_OBJECT public: KNoScrollListBox(TQWidget *parent=0, const char *name=0); @@ -134,7 +134,7 @@ class KOMonthView; */ class MonthViewCell : public TQWidget { - Q_OBJECT + TQ_OBJECT public: class CreateItemVisitor; @@ -244,7 +244,7 @@ class MonthViewCell : public TQWidget */ class KOMonthView: public KOEventView { - Q_OBJECT + TQ_OBJECT public: KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 3e4f98bfa..60fd3e45c 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -92,15 +92,15 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) KPrefsWidBool *emailControlCenter = addWidBool( KOPrefs::instance()->emailControlCenterItem(), topFrame ); - connect(emailControlCenter->checkBox(),TQT_SIGNAL(toggled(bool)), - TQT_SLOT(toggleEmailSettings(bool))); + connect(emailControlCenter->checkBox(),TQ_SIGNAL(toggled(bool)), + TQ_SLOT(toggleEmailSettings(bool))); mUserEmailSettings = new TQGrid( 2, topFrame ); addWidString( KOPrefs::instance()->userNameItem(), mUserEmailSettings ); addWidString( KOPrefs::instance()->userEmailItem(), mUserEmailSettings ); - TQGroupBox *saveGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Saving Calendar"), + TQGroupBox *saveGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Saving Calendar"), topFrame); addWidBool( KOPrefs::instance()->htmlWithSaveItem(), saveGroup ); @@ -109,8 +109,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) TQHBox *intervalBox = new TQHBox( saveGroup ); addWidInt( KOPrefs::instance()->autoSaveIntervalItem(), intervalBox ); - connect( autoSave->checkBox(), TQT_SIGNAL( toggled( bool ) ), - intervalBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( autoSave->checkBox(), TQ_SIGNAL( toggled( bool ) ), + intervalBox, TQ_SLOT( setEnabled( bool ) ) ); intervalBox->setSpacing( KDialog::spacingHint() ); new TQWidget( intervalBox ); @@ -171,8 +171,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( timeZoneLabel, whatsThis ); mTimeZoneCombo = new TQComboBox( timeZoneBox ); - connect( mTimeZoneCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mTimeZoneCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); FILE *f; char tempstring[101] = "Unknown"; @@ -264,8 +264,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( holidayLabel, whatsThis ); mHolidayCombo = new TQComboBox( holidayRegBox ); - connect( mHolidayCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mHolidayCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); TQWhatsThis::add( mHolidayCombo, whatsThis ); @@ -319,7 +319,7 @@ class KOPrefsDialogTime : public KPrefsModule topLayout->addWidget( defaultDuration->label(), 4, 0 ); topLayout->addWidget( defaultDuration->timeEdit(), 4, 1 ); - TQGroupBox *remindersGroupBox = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *remindersGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n( "Reminders" ), topFrame ); topLayout->addMultiCellWidget( remindersGroupBox, 5, 5, 0, 1 ); @@ -328,10 +328,10 @@ class KOPrefsDialogTime : public KPrefsModule new TQLabel( i18n( "Default reminder time:" ), remindersBox ); mReminderTimeSpin = new KIntSpinBox( remindersBox ); - connect( mReminderTimeSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderTimeSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo = new KComboBox( remindersBox ); - connect( mReminderUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo->insertItem( i18n( "minute(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "hour(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "day(s)" ) ); @@ -351,8 +351,8 @@ class KOPrefsDialogTime : public KPrefsModule KURLRequester *rq = addWidPath( KOPrefs::instance()->audioFilePathItem(), audioFileRemindersBox, filter )->urlRequester(); rq->setEnabled( cb->isChecked() ); - connect( cb, TQT_SIGNAL(toggled(bool)), - rq, TQT_SLOT(setEnabled( bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), + rq, TQ_SLOT(setEnabled( bool)) ); TQHBox *eventRemindersBox = new TQHBox( remindersGroupBox ); addWidBool( KOPrefs::instance()->defaultEventRemindersItem(), eventRemindersBox )->checkBox(); @@ -364,10 +364,10 @@ class KOPrefsDialogTime : public KPrefsModule topLayout->addWidget( alarmDefaultLabel, 6, 0 ); mAlarmTimeDefaultCheckBox = new TQCheckBox( topFrame ); topLayout->addWidget( mAlarmTimeDefaultCheckBox, 6, 1 ); - connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mAlarmTimeDefaultCheckBox, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotWidChanged() ) ); - TQGroupBox *workingHoursGroup = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal, i18n("Working Hours"), topFrame); topLayout->addMultiCellWidget( workingHoursGroup, 7, 7, 0, 1 ); @@ -390,8 +390,8 @@ class KOPrefsDialogTime : public KPrefsModule "this box, or the working hours will not be " "marked with color." ) ); - connect( mWorkDays[ index ], TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mWorkDays[ index ], TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotWidChanged() ) ); } TQHBox *workStartBox = new TQHBox(workingHoursGroup); @@ -510,7 +510,7 @@ class KOPrefsDialogViews : public KPrefsModule topLayout->addWidget( showTodosAgenda->checkBox() ); /*** Date Navigator Group ***/ - TQGroupBox *dateNavGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *dateNavGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Date Navigator"), topFrame ); addWidBool( KOPrefs::instance()->dailyRecurItem(), dateNavGroup ); @@ -520,7 +520,7 @@ class KOPrefsDialogViews : public KPrefsModule /*** Agenda View Group ***/ - TQGroupBox *agendaGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *agendaGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Agenda View"), topFrame ); @@ -542,8 +542,8 @@ class KOPrefsDialogViews : public KPrefsModule KPrefsWidBool *marcusBainsShowSeconds = addWidBool( KOPrefs::instance()->marcusBainsShowSecondsItem(), agendaGroup ); - connect( marcusBainsEnabled->checkBox(), TQT_SIGNAL( toggled( bool ) ), - marcusBainsShowSeconds->checkBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( marcusBainsEnabled->checkBox(), TQ_SIGNAL( toggled( bool ) ), + marcusBainsShowSeconds->checkBox(), TQ_SLOT( setEnabled( bool ) ) ); addWidBool( KOPrefs::instance()->selectionStartsEditorItem(), agendaGroup ); @@ -554,7 +554,7 @@ class KOPrefsDialogViews : public KPrefsModule topLayout->addWidget( agendaGroup ); /*** Month View Group ***/ - TQGroupBox *monthGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *monthGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Month View"), topFrame ); addWidBool( KOPrefs::instance()->enableMonthScrollItem(), monthGroup ); @@ -564,7 +564,7 @@ class KOPrefsDialogViews : public KPrefsModule /*** Todo View Group ***/ - TQGroupBox *todoGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *todoGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("To-do View"), topFrame ); addWidBool( KOPrefs::instance()->fullViewTodoItem(), todoGroup ); @@ -700,7 +700,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) topLayout->addWidget( unsetCategoryColor->button(), 6, 1 ); // categories colors - TQGroupBox *categoryGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Categories"), + TQGroupBox *categoryGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Categories"), topFrame); topLayout->addMultiCellWidget(categoryGroup,7,7,0,1); @@ -711,17 +711,17 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here the event category you want to modify. " "You can change the selected category color using " "the button below." ) ); - connect(mCategoryCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateCategoryColor())); + connect(mCategoryCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateCategoryColor())); mCategoryButton = new KColorButton(categoryGroup); TQWhatsThis::add( mCategoryButton, i18n( "Choose here the color of the event category selected " "using the combo box above." ) ); - connect(mCategoryButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setCategoryColor())); + connect(mCategoryButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setCategoryColor())); updateCategoryColor(); // resources colors - TQGroupBox *resourceGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Resources"), + TQGroupBox *resourceGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Resources"), topFrame); topLayout->addMultiCellWidget(resourceGroup,8,8,0,1); @@ -730,13 +730,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here resource you want to modify. " "You can change the selected resource color using " "the button below." ) ); - connect(mResourceCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateResourceColor())); + connect(mResourceCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateResourceColor())); mResourceButton = new KColorButton(resourceGroup); TQWhatsThis::add( mResourceButton, i18n( "Choose here the color of the resource selected " "using the combo box above." ) ); - connect(mResourceButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setResourceColor())); + connect(mResourceButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setResourceColor())); updateResources(); topLayout->setRowStretch(9,1); @@ -865,8 +865,8 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topFrame ); topLayout->addMultiCellWidget(useGroupwareBool->checkBox(),0,0,0,1); // FIXME: This radio button should only be available when KMail is chosen -// connect(thekmailradiobuttonupthere,TQT_SIGNAL(toggled(bool)), -// useGroupwareBool->checkBox(), TQT_SLOT(enabled(bool))); +// connect(thekmailradiobuttonupthere,TQ_SIGNAL(toggled(bool)), +// useGroupwareBool->checkBox(), TQ_SLOT(enabled(bool))); KPrefsWidBool *bcc = addWidBool( KOPrefs::instance()->bccItem(), topFrame ); @@ -927,10 +927,10 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topLayout->addWidget(del,6,1); //topLayout->setRowStretch(2,1); - connect(add, TQT_SIGNAL( clicked() ), this, TQT_SLOT(addItem()) ); - connect(del, TQT_SIGNAL( clicked() ), this, TQT_SLOT(removeItem()) ); - connect(aEmailsEdit,TQT_SIGNAL( textChanged(const TQString&) ), this,TQT_SLOT(updateItem())); - connect(mAMails,TQT_SIGNAL(selectionChanged(TQListViewItem *)),TQT_SLOT(updateInput())); + connect(add, TQ_SIGNAL( clicked() ), this, TQ_SLOT(addItem()) ); + connect(del, TQ_SIGNAL( clicked() ), this, TQ_SLOT(removeItem()) ); + connect(aEmailsEdit,TQ_SIGNAL( textChanged(const TQString&) ), this,TQ_SLOT(updateItem())); + connect(mAMails,TQ_SIGNAL(selectionChanged(TQListViewItem *)),TQ_SLOT(updateInput())); load(); } @@ -1018,7 +1018,7 @@ KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *pa : KPrefsModule( KOPrefs::instance(), parent, name ) { mGroupwarePage = new KOGroupwarePrefsPage( this ); - connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( mGroupwarePage, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); ( new TQVBoxLayout( this ) )->addWidget( mGroupwarePage ); load(); @@ -1127,12 +1127,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) buttonRowLayout->addWidget( mConfigureButton ); buttonRowLayout->addItem( new TQSpacerItem(1, 1, TQSizePolicy::Expanding) ); topLayout->addWidget( buttonRow ); - connect( mConfigureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( configure() ) ); + connect( mConfigureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( configure() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotWidChanged() ) ); load(); // usrReadConfig(); diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 28fc3ba71..e6fec99c3 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -40,7 +40,7 @@ class TQListView; class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: KOPrefsDialogMain( TQWidget *parent, const char *name ); @@ -53,7 +53,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: KOPrefsDialogColors( TQWidget *parent, const char *name ); @@ -84,7 +84,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name ); @@ -108,7 +108,7 @@ class KOGroupwarePrefsPage; class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name ); @@ -123,7 +123,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: KOPrefsDialogPlugins( TQWidget *parent, const char *name ); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index b38e6a794..806104831 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c // User3 => Dismiss Selected // Ok => Suspend - connect( calendar, TQT_SIGNAL(calendarChanged()), - this, TQT_SLOT(slotCalendarChanged()) ); + connect( calendar, TQ_SIGNAL(calendarChanged()), + this, TQ_SLOT(slotCalendarChanged()) ); TDEGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); @@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox ); topLayout->addWidget( label ); - mSplitter = new TQSplitter( Qt::Vertical, topBox ); + mSplitter = new TQSplitter( TQt::Vertical, topBox ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); @@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mIncidenceListView->setShowSortIndicator( true ); mIncidenceListView->setAllColumnsShowFocus( true ); mIncidenceListView->setSelectionMode( TQListView::Extended ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) ); - connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) ); + connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) ); mDetailView = new KOEventViewer( mCalendar, mSplitter ); mDetailView->setFocus(); // set focus here to start with to make it harder @@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSuspendUnit->insertItem( i18n("week(s)") ); mSuspendUnit->setCurrentItem( defSuspendUnit ); - connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) ); + connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) ); setMainWidget( mIncidenceListView ); mIncidenceListView->setMinimumSize( 500, 50 ); diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index 949c17f7d..d11dc591c 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -43,7 +43,7 @@ class TQSpinBox; class TQSplitter; class AlarmDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 081d91ca7..a5cb277e6 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); // Set up the context menu - mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) ); - mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) ); + mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) ); + mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) ); contextMenu()->setItemEnabled( mSuspendAll, false ); contextMenu()->setItemEnabled( mDismissAll, false ); contextMenu()->insertSeparator(); mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this, - TQT_SLOT( toggleAlarmsEnabled() ) ); + TQ_SLOT( toggleAlarmsEnabled() ) ); mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this, - TQT_SLOT( toggleAutostart() ) ); + TQ_SLOT( toggleAutostart() ) ); contextMenu()->setItemChecked( mAutostartId, autostart ); contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled ); @@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) kdDebug(5890) << "No Quit standard action." << endl; } else { #if KDE_IS_VERSION(3,3,90) - quit->disconnect( TQT_SIGNAL( activated() ), this, - TQT_SLOT( maybeQuit() ) ); - connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), this, + TQ_SLOT( maybeQuit() ) ); + connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), tqApp, - TQT_SLOT( closeAllWindows() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), tqApp, + TQ_SLOT( closeAllWindows() ) ); } - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) ); #endif TQToolTip::add(this, mName ); @@ -188,7 +188,7 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { kapp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h index 6f6cd7bdb..81c00a8c7 100644 --- a/korganizer/korgac/alarmdockwindow.h +++ b/korganizer/korgac/alarmdockwindow.h @@ -30,7 +30,7 @@ class AlarmDockWindow : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: AlarmDockWindow( const char *name = 0 ); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 2a87c7fd2..37478ca0e 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mDocker = new AlarmDockWindow; mDocker->show(); - connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) ); - connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) ); + connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) ); TDEConfig c( locate( "config", "korganizerrc" ) ); c.setGroup( "Time & Date" ); @@ -58,7 +58,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mCalendar->readConfig(); mCalendar->load(); - connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) ); + connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) ); TDEConfig *config = kapp->config(); config->setGroup( "Alarms" ); @@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar, if ( !mDialog ) { mDialog = new AlarmDialog( calendar ); - connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) ); - connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) ); - connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) ); - connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) ); + connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) ); + connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) ); + connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) ); + connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) ); } mDialog->addIncidence( incidence, dt, displayText ); diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h index a86288483..ef6e5d272 100644 --- a/korganizer/korgac/koalarmclient.h +++ b/korganizer/korgac/koalarmclient.h @@ -43,7 +43,7 @@ class Incidence; class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged { - Q_OBJECT + TQ_OBJECT public: KOAlarmClient( TQObject *parent = 0, const char *name = 0 ); diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 5646d709e..16bf76bc2 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -101,8 +101,8 @@ KOrganizer::KOrganizer( const char *name ) mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" ); setCentralWidget(mCalendarView); - mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false ); - (void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" ); + mActionManager = new ActionManager( this, mCalendarView, this, this, false ); + (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" ); } KOrganizer::~KOrganizer() @@ -128,8 +128,8 @@ void KOrganizer::init( bool document ) } mActionManager->init(); - connect( mActionManager, TQT_SIGNAL( actionNew( const KURL & ) ), - TQT_SLOT( newMainWindow( const KURL & ) ) ); + connect( mActionManager, TQ_SIGNAL( actionNew( const KURL & ) ), + TQ_SLOT( newMainWindow( const KURL & ) ) ); mActionManager->loadParts(); @@ -139,7 +139,7 @@ void KOrganizer::init( bool document ) KStatusBar *bar = statusBar(); bar->insertItem( "", ID_GENERAL, 10 ); - connect( bar, TQT_SIGNAL( pressed( int ) ), TQT_SLOT( statusBarPressed( int ) ) ); + connect( bar, TQ_SIGNAL( pressed( int ) ), TQ_SLOT( statusBarPressed( int ) ) ); KPIM::ProgressDialog *progressDialog = new KPIM::ProgressDialog( bar, this ); progressDialog->hide(); @@ -150,8 +150,8 @@ void KOrganizer::init( bool document ) bar->addWidget( progressWidget, 0, true ); - connect( mActionManager->view(), TQT_SIGNAL( statusMessage( const TQString & ) ), - TQT_SLOT( showStatusMessage( const TQString & ) ) ); + connect( mActionManager->view(), TQ_SIGNAL( statusMessage( const TQString & ) ), + TQ_SLOT( showStatusMessage( const TQString & ) ) ); setStandardToolBarMenuEnabled( true ); setTitle(); @@ -208,9 +208,9 @@ void KOrganizer::initActions() setStandardToolBarMenuEnabled( true ); createStandardStatusBarAction(); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars() ), actionCollection()); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); setAutoSaveSettings(); createGUI( 0 ); diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index 76505f7f4..566146042 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -64,7 +64,7 @@ typedef KParts::MainWindow KPartsMainWindow; */ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 1b607169c..ab1b3c120 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -81,7 +81,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, // create a canvas to insert our widget TQWidget *canvas = new TQWidget( parentWidget, widgetName ); - canvas->setFocusPolicy( TQ_ClickFocus ); + canvas->setFocusPolicy( TQWidget::ClickFocus ); setWidget( canvas ); mView = new CalendarView( canvas ); @@ -109,10 +109,10 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KOrganizerInfo" ); - connect( mView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - ie, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + ie, TQ_SIGNAL( textChanged( const TQString & ) ) ); mActionManager->init(); mActionManager->readSettings(); diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 21e96462c..e4d33902d 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -56,7 +56,7 @@ class TQDate; class KOrganizerPart: public KParts::ReadOnlyPart, public KOrg::MainWindow { - Q_OBJECT + TQ_OBJECT public: KOrganizerPart( TQWidget *parentWidget, const char *widgetName, diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index a93c6d686..fc2bf0cfa 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -62,18 +62,18 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, vbox->addWidget( mGantt ); - connect( mGantt, TQT_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), - TQT_SLOT(itemSelected(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), - TQT_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemRightClicked(KDGanttViewItem*)), - TQT_SLOT(itemRightClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(gvItemMoved(KDGanttViewItem*)), - TQT_SLOT(itemMoved(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(rescaling(KDGanttView::Scale)), - TQT_SLOT(overscale(KDGanttView::Scale)) ); - connect( mGantt, TQT_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), - TQT_SLOT( newEventWithHint( const TQDateTime& ) ) ); + connect( mGantt, TQ_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), + TQ_SLOT(itemSelected(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), + TQ_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemRightClicked(KDGanttViewItem*)), + TQ_SLOT(itemRightClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(gvItemMoved(KDGanttViewItem*)), + TQ_SLOT(itemMoved(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(rescaling(KDGanttView::Scale)), + TQ_SLOT(overscale(KDGanttView::Scale)) ); + connect( mGantt, TQ_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), + TQ_SLOT( newEventWithHint( const TQDateTime& ) ) ); } KOTimelineView::~KOTimelineView() diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 2d0e7c0d4..0e131897b 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -43,7 +43,7 @@ namespace KOrg { */ class KOTimelineView : public KOEventView { - Q_OBJECT + TQ_OBJECT public: KOTimelineView(Calendar *calendar, TQWidget *parent = 0, diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 9da336594..3a41d1ff9 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -68,21 +68,21 @@ void KOTodoEditor::init() setupRecurrence(); setupAttendeesTab(); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mGeneral, TQT_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mGeneral, TQ_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); - connect( mDetails, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); + connect( mDetails, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); } void KOTodoEditor::reload() @@ -94,7 +94,7 @@ void KOTodoEditor::reload() void KOTodoEditor::setupGeneral() { - mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this)); + mGeneral = new KOEditorGeneralTodo(this); if (KOPrefs::instance()->mCompactDialogs) { TQFrame *topFrame = addPage(i18n("General")); @@ -131,10 +131,10 @@ void KOTodoEditor::setupGeneral() mGeneral->iniStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); } diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h index a571d88b9..ebccd4d28 100644 --- a/korganizer/kotodoeditor.h +++ b/korganizer/kotodoeditor.h @@ -36,7 +36,7 @@ class KOEditorRecurrence; */ class KOTodoEditor : public KOIncidenceEditor { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 8ae2703fc..bbbb71dba 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -299,7 +299,7 @@ void KOTodoListView::contentsMousePressEvent(TQMouseEvent* e) treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + itemMargin() || p.x() < header()->sectionPos(header()->mapToIndex(0))) { - if (e->button()==Qt::LeftButton) { + if (e->button()==TQt::LeftButton) { mPressPos = e->pos(); mMousePressed = true; } @@ -424,16 +424,16 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) mPriority[ mPriorityPopupMenu->insertItem( i18n( "7" ) ) ] = 7; mPriority[ mPriorityPopupMenu->insertItem( i18n( "8" ) ) ] = 8; mPriority[ mPriorityPopupMenu->insertItem( i18n( "9 (lowest)" ) ) ] = 9; - connect( mPriorityPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPriority( int ) )); + connect( mPriorityPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPriority( int ) )); mPercentageCompletedPopupMenu = new TQPopupMenu(this); for (int i = 0; i <= 100; i+=10) { TQString label = TQString ("%1 %").arg (i); mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; } - connect( mPercentageCompletedPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPercentage( int ) ) ); + connect( mPercentageCompletedPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPercentage( int ) ) ); mMovePopupMenu = new KDatePickerPopup( KDatePickerPopup::NoDate | @@ -445,76 +445,76 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) KDatePickerPopup::Words ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( setNewDate( TQDate ) ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( copyTodoToDate( TQDate ) ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( setNewDate( TQDate ) ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( copyTodoToDate( TQDate ) ) ); mItemPopupMenu = new TQPopupMenu(this); mItemPopupMenu->insertItem(i18n("&Show"), this, - TQT_SLOT (showTodo())); + TQ_SLOT (showTodo())); mItemPopupMenu->insertItem(i18n("&Edit..."), this, - TQT_SLOT (editTodo()), 0, ePopupEdit ); + TQ_SLOT (editTodo()), 0, ePopupEdit ); #ifndef KORG_NOPRINTER - mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) ); + mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQ_SLOT( printTodo() ) ); #endif mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this, - TQT_SLOT (deleteTodo()), 0, ePopupDelete ); + TQ_SLOT (deleteTodo()), 0, ePopupDelete ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this, - TQT_SLOT (newTodo()) ); + TQ_SLOT (newTodo()) ); mItemPopupMenu->insertItem(i18n("New Su&b-to-do..."), this, - TQT_SLOT (newSubTodo())); + TQ_SLOT (newSubTodo())); mItemPopupMenu->insertItem( i18n("&Make this To-do Independent"), this, - TQT_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); + TQ_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); mItemPopupMenu->insertItem( i18n("Make all Sub-to-dos &Independent"), this, - TQT_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); + TQ_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem( i18n("&Copy To"), mCopyPopupMenu, ePopupCopyTo ); mItemPopupMenu->insertItem(i18n("&Move To"), mMovePopupMenu, ePopupMoveTo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(i18n("delete completed to-dos","Pur&ge Completed"), - this, TQT_SLOT( purgeCompleted() ) ); + this, TQ_SLOT( purgeCompleted() ) ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); mPopupMenu = new TQPopupMenu(this); mPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("&New To-do..."), this, - TQT_SLOT(newTodo()) ); + TQ_SLOT(newTodo()) ); mPopupMenu->insertItem(i18n("delete completed to-dos","&Purge Completed"), - this, TQT_SLOT(purgeCompleted())); + this, TQ_SLOT(purgeCompleted())); mDocPrefs = new DocPrefs( name ); // Double clicking conflicts with opening/closing the subtree - connect( mTodoListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, + connect( mTodoListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( editItem( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, + TQ_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( editItem( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( expanded( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( expanded( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); #if 0 - connect(mTodoListView,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(pressed(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(pressed(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); #endif - connect( mTodoListView, TQT_SIGNAL(selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); - connect( mQuickAdd, TQT_SIGNAL( returnPressed () ), - TQT_SLOT( addQuickTodo() ) ); + connect( mTodoListView, TQ_SIGNAL(selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); + connect( mQuickAdd, TQ_SIGNAL( returnPressed () ), + TQ_SLOT( addQuickTodo() ) ); new KOTodoListViewToolTip( mTodoListView->viewport(), calendar, mTodoListView ); } @@ -648,7 +648,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem ) { if ( todoItem ) { mItemsToDelete.append( todoItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( removeTodoItems() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( removeTodoItems() ) ); return true; } else return false; @@ -731,13 +731,13 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) } break; default: - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } } else { // use a TQTimer here, because when marking todos finished using // the checkbox, this slot gets called, but we cannot update the views // because we're still inside KOTodoViewItem::stateChange - TQTimer::singleShot(0,this,TQT_SLOT(updateView())); + TQTimer::singleShot(0,this,TQ_SLOT(updateView())); } } @@ -857,7 +857,7 @@ void KOTodoView::printTodo() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, BaseView::calendar(), &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mActiveItem->todo() ); @@ -1015,8 +1015,8 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem ) tempMenu->setItemChecked( index, true ); } - connect ( tempMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( changedCategories( int ) ) ); + connect ( tempMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( changedCategories( int ) ) ); return tempMenu; } @@ -1065,9 +1065,9 @@ void KOTodoView::itemStateChanged( TQListViewItem *item ) void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage ) { - mPercentChangedMap.append( tqMakePair( item, percentage ) ); + mPercentChangedMap.append( qMakePair( item, percentage ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processDelayedNewPercentage() ) ); } void KOTodoView::processDelayedNewPercentage() diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 662f6b136..e8204c74b 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -71,7 +71,7 @@ class KOTodoListViewToolTip : public TQToolTip class KOTodoListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: KOTodoListView( TQWidget *parent = 0, const char *name = 0 ); @@ -112,7 +112,7 @@ class KOTodoListView : public TDEListView */ class KOTodoView : public KOrg::BaseView { - Q_OBJECT + TQ_OBJECT public: KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2ee92b12d..b983d953b 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -225,60 +225,60 @@ void KOViewManager::connectView(KOrg::BaseView *view) if (!view) return; // selecting an incidence - connect( view, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - mMainView, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( view, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + mMainView, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); // showing/editing/deleting an incidence. The calendar view takes care of the action. - connect( view, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(copyIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(cutIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(pasteIncidenceSignal()), - mMainView, TQT_SLOT(pasteIncidence())); - connect( view, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - mMainView, TQT_SLOT(toggleAlarm(Incidence *)) ); - connect( view,TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); - connect( view,TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(copyIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(cutIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(pasteIncidenceSignal()), + mMainView, TQ_SLOT(pasteIncidence())); + connect( view, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + mMainView, TQ_SLOT(toggleAlarm(Incidence *)) ); + connect( view,TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); + connect( view,TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); // signals to create new incidences - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); - - connect( view, TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newSubTodoSignal(Todo *)), - mMainView, TQT_SLOT(newSubTodo(Todo *)) ); - - connect( view, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); + + connect( view, TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newSubTodoSignal(Todo *)), + mMainView, TQ_SLOT(newSubTodo(Todo *)) ); + + connect( view, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); // reload settings - connect(mMainView, TQT_SIGNAL(configChanged()), view, TQT_SLOT(updateConfig())); + connect(mMainView, TQ_SIGNAL(configChanged()), view, TQ_SLOT(updateConfig())); // Notifications about added, changed and deleted incidences - connect( mMainView, TQT_SIGNAL( dayPassed( const TQDate & ) ), - view, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( view, TQT_SIGNAL( startMultiModify( const TQString & ) ), - mMainView, TQT_SLOT( startMultiModify( const TQString & ) ) ); - connect( view, TQT_SIGNAL( endMultiModify() ), - mMainView, TQT_SLOT( endMultiModify() ) ); - - connect( mMainView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - view, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( mMainView, TQ_SIGNAL( dayPassed( const TQDate & ) ), + view, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( view, TQ_SIGNAL( startMultiModify( const TQString & ) ), + mMainView, TQ_SLOT( startMultiModify( const TQString & ) ) ); + connect( view, TQ_SIGNAL( endMultiModify() ), + mMainView, TQ_SLOT( endMultiModify() ) ); + + connect( mMainView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + view, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); view->setIncidenceChanger( mMainView->incidenceChanger() ); } @@ -287,12 +287,12 @@ void KOViewManager::connectTodoView( KOTodoView* todoView ) if (!todoView) return; // SIGNALS/SLOTS FOR TODO VIEW - connect( todoView, TQT_SIGNAL( purgeCompletedSignal() ), - mMainView, TQT_SLOT( purgeCompleted() ) ); - connect( todoView, TQT_SIGNAL( unSubTodoSignal() ), - mMainView, TQT_SLOT( todo_unsub() ) ); - connect( todoView, TQT_SIGNAL( unAllSubTodoSignal() ), - mMainView, TQT_SLOT( makeSubTodosIndependent() ) ); + connect( todoView, TQ_SIGNAL( purgeCompletedSignal() ), + mMainView, TQ_SLOT( purgeCompleted() ) ); + connect( todoView, TQ_SIGNAL( unSubTodoSignal() ), + mMainView, TQ_SLOT( todo_unsub() ) ); + connect( todoView, TQ_SIGNAL( unAllSubTodoSignal() ), + mMainView, TQ_SLOT( makeSubTodosIndependent() ) ); } void KOViewManager::zoomInHorizontally() @@ -357,8 +357,8 @@ void KOViewManager::showAgendaView() TQWidget *parent = mMainView->viewStack(); if ( !mAgendaViewTabs && showBoth ) { mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() ); - connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ), - this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); + connect( mAgendaViewTabs, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); parent = mAgendaViewTabs; TDEConfig *config = KOGlobals::self()->config(); @@ -374,13 +374,13 @@ void KOViewManager::showAgendaView() addView(mAgendaView); - connect(mAgendaView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaView, TQT_SLOT( setExpandedButton( bool ) ) ); + connect(mAgendaView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) ); + connect( mAgendaView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) ); mAgendaView->readSettings(); } @@ -391,13 +391,13 @@ void KOViewManager::showAgendaView() addView(mAgendaSideBySideView); -/* connect(mAgendaSideBySideView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaSideBySideView, TQT_SLOT( setExpandedButton( bool ) ) ); +/* connect(mAgendaSideBySideView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaSideBySideView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaSideBySideView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );*/ + connect( mAgendaSideBySideView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );*/ } if ( showBoth && mAgendaViewTabs ) { diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index fe41d5bbc..93858fae6 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h @@ -51,7 +51,7 @@ using namespace KCal; */ class KOViewManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 7b8ab9921..7c8ce447f 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -70,7 +70,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, // dateLabel->setAlignment(AlignCenter); mView = new WhatsNextTextBrowser(this); - connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &))); + connect(mView,TQ_SIGNAL(showIncidence(const TQString &)),TQ_SLOT(showIncidence(const TQString &))); TQBoxLayout *topLayout = new TQVBoxLayout(this); // topLayout->addWidget(dateLabel); diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index 22c55f5d7..126a70558 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -33,7 +33,7 @@ class TQListView; class KOEventViewerDialog; class WhatsNextTextBrowser : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT public: WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {} @@ -50,7 +50,7 @@ class WhatsNextTextBrowser : public TQTextBrowser { */ class KOWhatsNextView : public KOrg::BaseView { - Q_OBJECT + TQ_OBJECT public: KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0, diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h index 695231602..fa307b8be 100644 --- a/korganizer/kowindowlist.h +++ b/korganizer/kowindowlist.h @@ -42,7 +42,7 @@ class KURL; */ class KOWindowList : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 7cbd42ebb..e900fa481 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -57,7 +57,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, TQVBox *topSideBox = new TQVBox( this ); mLeftTopSpacer = new TQWidget( topSideBox ); mLeftTopSpacer->setFixedHeight( topLabelHeight ); - mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox ); + mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox ); mLeftSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); @@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, topSideBox = new TQVBox( this ); mRightTopSpacer = new TQWidget( topSideBox ); mRightTopSpacer->setFixedHeight( topLabelHeight ); - mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox ); + mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox ); mRightSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); new TQWidget( mRightSplitter ); sideBox = new TQVBox( mRightSplitter ); eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); eiSpacer->setFixedHeight( eiSpacer->minimumHeight() ); eiSpacer->changeColumns( 0 ); - mScrollBar = new TQScrollBar( Qt::Vertical, sideBox ); + mScrollBar = new TQScrollBar( TQt::Vertical, sideBox ); eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox ); eiSpacer->setFixedHeight( eiSpacer->minimumHeight() ); eiSpacer->changeColumns( 0 ); @@ -142,13 +142,13 @@ void MultiAgendaView::recreateViews() } setupViews(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotResizeScrollView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotResizeScrollView()) ); mTimeLabels->updateConfig(); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mScrollBar, TQT_SLOT(setValue(int)) ); - connect( mScrollBar, TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mScrollBar, TQ_SLOT(setValue(int)) ); + connect( mScrollBar, TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); installSplitterEventFilter( mLeftSplitter ); installSplitterEventFilter( mRightSplitter ); @@ -163,7 +163,7 @@ void MultiAgendaView::recreateViews() mLeftSplitter->setSizes( sizes ); mRightSplitter->setSizes( sizes ); - TQTimer::singleShot( 0, this, TQT_SLOT(setupScrollBar()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(setupScrollBar()) ); mTimeLabels->positionChanged(); } @@ -185,79 +185,79 @@ void MultiAgendaView::setupViews() FOREACH_VIEW( agenda ) { if ( !agenda->readOnly() ) { connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); connect( agenda, - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); connect( agenda, - TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); + TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); connect( agenda, - TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); connect( agenda, - TQT_SIGNAL(cutIncidenceSignal(Incidence*)), - TQT_SIGNAL(cutIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(cutIncidenceSignal(Incidence*)), + TQ_SIGNAL(cutIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); + TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); connect( agenda, - TQT_SIGNAL(toggleAlarmSignal(Incidence*)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); + TQ_SIGNAL(toggleAlarmSignal(Incidence*)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); connect( agenda, - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); } connect( agenda, - TQT_SIGNAL(copyIncidenceSignal(Incidence*)), - TQT_SIGNAL(copyIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(copyIncidenceSignal(Incidence*)), + TQ_SIGNAL(copyIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), - TQT_SLOT(slotSelectionChanged()) ); + TQ_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), + TQ_SLOT(slotSelectionChanged()) ); connect( agenda, - TQT_SIGNAL(timeSpanSelectionChanged()), - TQT_SLOT(slotClearTimeSpanSelection()) ); + TQ_SIGNAL(timeSpanSelectionChanged()), + TQ_SLOT(slotClearTimeSpanSelection()) ); disconnect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)), + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), agenda, 0 ); connect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)), - TQT_SLOT(zoomView(const int,const TQPoint&,const Qt::Orientation)) ); + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQ_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); } KOAgenda *anAgenda = mAgendaViews.first()->agenda(); - connect( anAgenda, TQT_SIGNAL(lowerYChanged(int) ), TQT_SLOT(resizeSpacers(int)) ); + connect( anAgenda, TQ_SIGNAL(lowerYChanged(int) ), TQ_SLOT(resizeSpacers(int)) ); FOREACH_VIEW( agenda ) { agenda->readSettings(); @@ -409,10 +409,10 @@ void MultiAgendaView::addView( const TQString &label, ResourceCalendar *res, con box->show(); mTimeLabels->setAgenda( av->agenda() ); - connect( av->agenda()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - av, TQT_SLOT(setContentsPos(int)) ); + connect( av->agenda()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + av, TQ_SLOT(setContentsPos(int)) ); av->installEventFilter( this ); installSplitterEventFilter( av->splitter() ); @@ -459,19 +459,19 @@ void MultiAgendaView::updateConfig() bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) { - if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) { + if ( obj->className() == TQCString("TQSplitterHandle") ) { // KDE4: not needed anymore, TQSplitter has a moved signal there if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize()) || event->type() == TQEvent::MouseButtonRelease ) { FOREACH_VIEW( agenda ) { - if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) ) + if ( agenda->splitter() == obj->parent() ) mLastMovedSplitter = agenda->splitter(); } - if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) ) + if ( mLeftSplitter == obj->parent() ) mLastMovedSplitter = mLeftSplitter; - else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) ) + else if ( mRightSplitter == obj->parent() ) mLastMovedSplitter = mRightSplitter; - TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(resizeSplitters()) ); } } @@ -520,9 +520,9 @@ void MultiAgendaView::resizeSpacers( int newY ) mRightTopSpacer->setFixedHeight( topLabelHeight ); } -void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori ) +void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const TQt::Orientation ori ) { - if ( ori == Qt::Vertical ) { + if ( ori == TQt::Vertical ) { if ( delta > 0 ) { if ( KOPrefs::instance()->mHourSize > 4 ) KOPrefs::instance()->mHourSize--; @@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt:: // KDE4: not needed, use existing TQSplitter signals instead void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter) { - TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING ); + TQObjectList *objlist = splitter->queryList( "TQSplitterHandle" ); // HACK: when not being visible, the splitter handle is sometimes not found // for unknown reasons, so trigger an update when we are shown again if ( objlist->count() == 0 && !isVisible() ) diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index f3e227546..a3dba8867 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -40,7 +40,7 @@ namespace KOrg { */ class MultiAgendaView : public AgendaView { - Q_OBJECT + TQ_OBJECT public: explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView, @@ -91,7 +91,7 @@ class MultiAgendaView : public AgendaView void resizeSplitters(); void resizeSpacers( int ); void setupScrollBar(); - void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ori ); + void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ori ); void slotResizeScrollView(); private: diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 223cbb98e..235810366 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -118,12 +118,12 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) ctrlLayout->addWidget( mNextMonth ); ctrlLayout->addWidget( mNextYear ); - connect( mPrevYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mPrevMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNextMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNextYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mMonth, TQT_SIGNAL( clicked() ), TQT_SLOT( selectMonthFromMenu() ) ); - connect( mYear, TQT_SIGNAL( clicked() ), TQT_SLOT( selectYearFromMenu() ) ); + connect( mPrevYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mPrevMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNextMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNextYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mMonth, TQ_SIGNAL( clicked() ), TQ_SLOT( selectMonthFromMenu() ) ); + connect( mYear, TQ_SIGNAL( clicked() ), TQ_SLOT( selectYearFromMenu() ) ); } NavigatorBar::~NavigatorBar() diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index 13d397160..fcff809fe 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h @@ -33,7 +33,7 @@ class TQFrame; class ActiveLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: ActiveLabel( TQWidget *parent, const char *name = 0 ); @@ -48,7 +48,7 @@ class ActiveLabel : public TQLabel class NavigatorBar: public TQWidget { - Q_OBJECT + TQ_OBJECT public: NavigatorBar( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h index d5e6a52c3..9bc2bc87f 100644 --- a/korganizer/plugins/datenums/configdialog.h +++ b/korganizer/plugins/datenums/configdialog.h @@ -25,7 +25,7 @@ class TQButtonGroup; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TQWidget *parent=0); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e0bc1ab7e..3a55cba90 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/exchangeui.rc"); - new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), + new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()), actionCollection(), "exchange_download"); - TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), + TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()), actionCollection(), "exchange_upload"); - TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)), - this, TQT_SLOT(slotIncidenceSelected(Incidence *))); + TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)), + this, TQ_SLOT(slotIncidenceSelected(Incidence *))); action->setEnabled( false ); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); - action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), + action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()), actionCollection(), "exchange_delete"); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); action->setEnabled( false ); - new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), + new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()), actionCollection(), "exchange_configure"); - connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) ); - connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), - mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) ); + connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) ); + connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), + mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) ); } Exchange::~Exchange() diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h index 8de777fe1..26c5e8dec 100644 --- a/korganizer/plugins/exchange/exchange.h +++ b/korganizer/plugins/exchange/exchange.h @@ -34,7 +34,7 @@ using namespace KCal; class Exchange : public KOrg::Part { - Q_OBJECT + TQ_OBJECT public: Exchange( KOrg::MainWindow *, const char *name ); diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index 106fc8672..913482f3e 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_user = new KLineEdit( mAccount->account(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 ); topLayout->addWidget( m_user, 2, 1 ); - connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) ); + connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) ); m_password = new KLineEdit( mAccount->password(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 ); @@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame ); topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 ); - connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 ); @@ -70,7 +70,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_tryFindMailbox = new TQPushButton( "&Find", topFrame ); topLayout->addWidget( m_tryFindMailbox, 5, 2 ); - connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); kapp->config()->setGroup( "Calendar/Exchange Plugin" ); bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true ); diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h index a7aa32857..dc46da9b6 100644 --- a/korganizer/plugins/exchange/exchangeconfig.h +++ b/korganizer/plugins/exchange/exchangeconfig.h @@ -29,7 +29,7 @@ class ExchangeConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0); diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h index 8c525f2bb..fc1020722 100644 --- a/korganizer/plugins/exchange/exchangedialog.h +++ b/korganizer/plugins/exchange/exchangedialog.h @@ -26,7 +26,7 @@ class TQComboBox; class ExchangeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0); diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h index 805ba970d..9a9f0b456 100644 --- a/korganizer/plugins/hebrew/configdialog.h +++ b/korganizer/plugins/hebrew/configdialog.h @@ -27,7 +27,7 @@ */ class ConfigDialog:public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 033b6ba64..8b0e5cbff 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -79,15 +79,15 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, TQPushButton *zoomIn = new TQPushButton(i18n("Zoom In"),this); topBar->addWidget(zoomIn,0); - connect(zoomIn,TQT_SIGNAL(clicked()),TQT_SLOT(zoomIn())); + connect(zoomIn,TQ_SIGNAL(clicked()),TQ_SLOT(zoomIn())); TQPushButton *zoomOut = new TQPushButton(i18n("Zoom Out"),this); topBar->addWidget(zoomOut,0); - connect(zoomOut,TQT_SIGNAL(clicked()),TQT_SLOT(zoomOut())); + connect(zoomOut,TQ_SIGNAL(clicked()),TQ_SLOT(zoomOut())); TQPushButton *menuButton = new TQPushButton(i18n("Select Mode"),this); topBar->addWidget(menuButton,0); - connect(menuButton,TQT_SIGNAL(clicked()),TQT_SLOT(showModeMenu())); + connect(menuButton,TQ_SIGNAL(clicked()),TQ_SLOT(showModeMenu())); createMainTask(); @@ -239,8 +239,8 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, endDt); - connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); + connect(task,TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + TQ_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); if (todo->relations().count() > 0) { task->setBrush(TQBrush(TQColor(240,240,240), TQBrush::Dense4Pattern)); } diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index 5415d3812..fada01d55 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -65,7 +65,7 @@ class KOProjectViewItem : public KGanttItem { */ class KOProjectView : public KOrg::BaseView { - Q_OBJECT + TQ_OBJECT public: KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 ); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 602576234..db354184d 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 TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), + new TDEAction(i18n("&Project"), "project", 0, this, TQ_SLOT(showView()), actionCollection(), "view_project"); } diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h index 1c78ad846..cbb0e8f0b 100644 --- a/korganizer/plugins/projectview/projectview.h +++ b/korganizer/plugins/projectview/projectview.h @@ -24,7 +24,7 @@ #include <korganizer/calendarviewbase.h> class ProjectView : public KOrg::Part { - Q_OBJECT + TQ_OBJECT public: ProjectView(KOrg::MainWindow *, const char *); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 8445edf46..00910bfe1 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -44,7 +44,7 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, mTimeSpanWidget = new TimeSpanWidget( this ); topLayout->addWidget( mTimeSpanWidget ); - connect( mTimeSpanWidget, TQT_SIGNAL( dateRangeChanged() ), TQT_SLOT( updateView() ) ); + connect( mTimeSpanWidget, TQ_SIGNAL( dateRangeChanged() ), TQ_SLOT( updateView() ) ); } KOTimeSpanView::~KOTimeSpanView() diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index b9dec86a5..2e4878808 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -31,7 +31,7 @@ class TimeSpanWidget; class KOTimeSpanView : public KOEventView { - Q_OBJECT + TQ_OBJECT public: KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0, diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h index 5db02c09b..269441535 100644 --- a/korganizer/plugins/timespanview/lineview.h +++ b/korganizer/plugins/timespanview/lineview.h @@ -29,7 +29,7 @@ class LineView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: LineView( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h index 0cb9ad5bd..47d3a5d9e 100644 --- a/korganizer/plugins/timespanview/timeline.h +++ b/korganizer/plugins/timespanview/timeline.h @@ -29,7 +29,7 @@ class TimeLine : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TimeLine( TQWidget *parent = 0, const char *name = 0 ); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 4b3df7ef7..5ff4cf0ac 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 TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), + new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQ_SLOT( showView() ), actionCollection(), "view_timespan" ); } diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h index ee20bb136..dab3ac48d 100644 --- a/korganizer/plugins/timespanview/timespanview.h +++ b/korganizer/plugins/timespanview/timespanview.h @@ -24,7 +24,7 @@ #include <korganizer/calendarviewbase.h> class TimespanView : public KOrg::Part { - Q_OBJECT + TQ_OBJECT public: TimespanView(KOrg::MainWindow *, const char *); diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 8b0ff4b39..99f529b30 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -63,19 +63,19 @@ TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : TQBoxLayout *buttonLayout = new TQHBoxLayout( rightPaneLayout ); TQPushButton *zoomInButton = new TQPushButton( i18n("Zoom In"), rightPane ); - connect( zoomInButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomIn() ) ); + connect( zoomInButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomIn() ) ); buttonLayout->addWidget( zoomInButton ); TQPushButton *zoomOutButton = new TQPushButton( i18n("Zoom Out"), rightPane ); - connect( zoomOutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomOut() ) ); + connect( zoomOutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomOut() ) ); buttonLayout->addWidget( zoomOutButton ); TQPushButton *centerButton = new TQPushButton( i18n("Center View"), rightPane ); - connect( centerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( centerView() ) ); + connect( centerButton, TQ_SIGNAL( clicked() ), TQ_SLOT( centerView() ) ); buttonLayout->addWidget( centerButton ); - connect(mLineView->horizontalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLine,TQT_SLOT(setContentsPos(int))); + connect(mLineView->horizontalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLine,TQ_SLOT(setContentsPos(int))); } TimeSpanWidget::~TimeSpanWidget() diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h index cf2991dfe..187786ade 100644 --- a/korganizer/plugins/timespanview/timespanwidget.h +++ b/korganizer/plugins/timespanview/timespanwidget.h @@ -37,7 +37,7 @@ class TimeLine; class TimeSpanWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TimeSpanWidget( TQWidget *parent=0, const char *name=0 ); diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index dade7791b..8e77504a9 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -64,8 +64,8 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent ) topLayout->setSpacing( spacingHint() ); topLayout->setMargin( marginHint() ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotMerge()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotAdd()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotMerge()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotAdd()) ); // when someone edits a kmail attachment he's editing a tmp file, check for that // and if it's a tmp file then open a save dialog diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h index 243be11d0..73540d47e 100644 --- a/korganizer/previewdialog.h +++ b/korganizer/previewdialog.h @@ -40,7 +40,7 @@ namespace KCal { class PreviewDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PreviewDialog( const KURL &url, TQWidget *parent ); diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 65d1bc081..8a9a6cb26 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, TQVBox *page = makeVBoxMainWidget(); TQSplitter *splitter = new TQSplitter( page ); - splitter->setOrientation( Qt::Horizontal ); + splitter->setOrientation( TQt::Horizontal ); mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" ); // use the minimal width possible = max width of the radio buttons, not extensible @@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, splitterRightLayout->addWidget( mOrientationSelection, 1, 1 ); // signals and slots connections - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) ); orientationLabel->setBuddy( mOrientationSelection ); // First insert the config widgets into the widget stack. This possibly assigns diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index ae62d75a8..5d5035f40 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -52,7 +52,7 @@ class TQLabel; */ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase { - Q_OBJECT + TQ_OBJECT public: @@ -106,7 +106,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase class CalPrintDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CalPrintDialog( KOrg::PrintPlugin::List plugins, diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 58a269a67..031c45ddb 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -245,9 +245,6 @@ <property name="text"> <string>Due date</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index c8366adda..5e597524e 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -46,18 +46,18 @@ PublishDialog::PublishDialog( TQWidget* parent, const char* name, setMainWidget( mWidget ); mWidget->mNameLineEdit->setEnabled( false ); mWidget->mEmailLineEdit->setEnabled( false ); - connect( mWidget->mAddressListView, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), - TQT_SLOT(updateInput())); - connect( mWidget->mNew, TQT_SIGNAL( clicked() ), - TQT_SLOT( addItem() ) ); - connect( mWidget->mRemove, TQT_SIGNAL( clicked() ), - TQT_SLOT( removeItem() ) ); - connect( mWidget->mSelectAddressee, TQT_SIGNAL( clicked() ), - TQT_SLOT( openAddressbook() ) ); - connect( mWidget->mNameLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); - connect( mWidget->mEmailLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); + connect( mWidget->mAddressListView, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), + TQ_SLOT(updateInput())); + connect( mWidget->mNew, TQ_SIGNAL( clicked() ), + TQ_SLOT( addItem() ) ); + connect( mWidget->mRemove, TQ_SIGNAL( clicked() ), + TQ_SLOT( removeItem() ) ); + connect( mWidget->mSelectAddressee, TQ_SIGNAL( clicked() ), + TQ_SLOT( openAddressbook() ) ); + connect( mWidget->mNameLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); + connect( mWidget->mEmailLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); } PublishDialog::~PublishDialog() diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h index dd1b53720..e4ede2005 100644 --- a/korganizer/publishdialog.h +++ b/korganizer/publishdialog.h @@ -33,7 +33,7 @@ class PublishDialog_base; class PublishDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PublishDialog(TQWidget* parent=0,const char* name=0, diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index ea640bb9e..d8d1b6375 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent ) { mResourceView = new ResourceView( mCalendar, mCalendarView, parent ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( updateCategories() ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( addResourceItem( ResourceCalendar * ) ) ); + TQ_SLOT( addResourceItem( ResourceCalendar * ) ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); return mResourceView; } @@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar, mListView->setResizeMode( TQListView::LastColumn ); topLayout->addWidget( mListView ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( currentChanged( TQListViewItem * ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( currentChanged( TQListViewItem * ) ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); updateView(); @@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource ) item->update(); } - connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SLOT( closeResource( ResourceCalendar * ) ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SLOT( closeResource( ResourceCalendar * ) ) ); updateResourceList(); emit resourcesChanged(); @@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint ResourceItem *item = static_cast<ResourceItem *>( lvitem ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); - menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); + menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); //FIXME: This is better on the resource dialog if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) { TQPopupMenu *assignMenu= new TQPopupMenu( menu ); - assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) ); + assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) ); if ( item->resourceColor().isValid() ) - assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) ); + assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) ); menu->insertItem( i18n( "Resources Colors" ), assignMenu ); } if ( item->isSubresource() && ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) { if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) { - menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) ); } } else { - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) ); } - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) ); if ( item->resource() != manager->standardResource() ) { menu->insertSeparator(); menu->insertItem( i18n("Use as &Default Calendar"), this, - TQT_SLOT( setStandard() ) ); + TQ_SLOT( setStandard() ) ); } menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) ); menu->popup( pos ); } diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index 1a073c2b2..4c7ad2890 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -94,7 +94,7 @@ class ResourceItem : public TQCheckListItem */ class ResourceView : public CalendarViewExtension { - Q_OBJECT + TQ_OBJECT public: ResourceView( CalendarResources *calendar, CalendarView *view, diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index c9e5f8865..4087a810f 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -63,8 +63,8 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) subLayout->addWidget( searchLabel ); subLayout->addWidget( searchEdit ); searchEdit->setFocus(); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchTextChanged( const TQString & ) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchTextChanged( const TQString & ) ) ); TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); @@ -76,7 +76,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mTodosCheck->setChecked( true ); // Date range - TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ), + TQGroupBox *rangeGroup = new TQGroupBox( 1, TQt::Horizontal, i18n( "Date Range" ), topFrame ); layout->addWidget( rangeGroup ); @@ -117,15 +117,15 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) KOGlobals::fitDialogToScreen( this, true ); } - connect( this,TQT_SIGNAL(user1Clicked()),TQT_SLOT(doSearch())); + connect( this,TQ_SIGNAL(user1Clicked()),TQ_SLOT(doSearch())); // Propagate edit and delete event signals from event list view - connect( listView, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( listView, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); } SearchDialog::~SearchDialog() diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index c1beef80b..5cb22dc73 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h @@ -45,7 +45,7 @@ using namespace KCal; class SearchDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SearchDialog(Calendar *calendar,TQWidget *parent=0); diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 1d4064478..d46f018c3 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -56,11 +56,11 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) : TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); TQPushButton *ok = new KPushButton(KStdGuiItem::ok(), this); - connect ( ok,TQT_SIGNAL(clicked()), this,TQT_SLOT(accept()) ); + connect ( ok,TQ_SIGNAL(clicked()), this,TQ_SLOT(accept()) ); buttonLayout->addWidget( ok ); TQPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect ( cancel,TQT_SIGNAL(clicked()), this,TQT_SLOT(reject()) ); + connect ( cancel,TQ_SIGNAL(clicked()), this,TQ_SLOT(reject()) ); buttonLayout->addWidget( cancel ); } diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h index 4aa00d3e8..144b7d87f 100644 --- a/korganizer/statusdialog.h +++ b/korganizer/statusdialog.h @@ -28,7 +28,7 @@ class TQComboBox; class StatusDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: StatusDialog(TQWidget* parent=0,const char* name=0); diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index 57209cd05..3d673c377 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -52,15 +52,15 @@ TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStr { m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" ); setMainWidget( m_base ); - connect( m_base->m_buttonAdd, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddTemplate() ) ); - connect( m_base->m_buttonDelete, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDeleteTemplate() ) ); + connect( m_base->m_buttonAdd, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddTemplate() ) ); + connect( m_base->m_buttonDelete, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDeleteTemplate() ) ); m_base->m_listBox->insertStringList( m_templates ); - connect( m_base->m_listBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); - connect( m_base->m_buttonApply, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotApplyTemplate() ) ); + connect( m_base->m_listBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); + connect( m_base->m_buttonApply, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotApplyTemplate() ) ); } @@ -75,7 +75,7 @@ void TemplateManagementDialog::slotAddTemplate() if ( m_templates.find( newTemplate) != m_templates.end() ) { int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite")); if ( rc == KMessageBox::Cancel ) { - TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotAddTemplate() ) ); return; } duplicate = true; diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h index d3e5995c9..e22e41b2b 100644 --- a/korganizer/templatemanagementdialog.h +++ b/korganizer/templatemanagementdialog.h @@ -45,7 +45,7 @@ #include <kdialogbase.h> class TemplateManagementDialog: public KDialogBase { -Q_OBJECT +TQ_OBJECT public: TemplateManagementDialog( TQWidget *parent, const TQStringList& templates ); diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 27a253c09..19ae5721c 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -230,10 +230,10 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) { mAgenda = agenda; - connect(mAgenda, TQT_SIGNAL(mousePosSignal(const TQPoint &)), this, TQT_SLOT(mousePosChanged(const TQPoint &))); - connect(mAgenda, TQT_SIGNAL(enterAgenda()), this, TQT_SLOT(showMousePos())); - connect(mAgenda, TQT_SIGNAL(leaveAgenda()), this, TQT_SLOT(hideMousePos())); - connect(mAgenda, TQT_SIGNAL(gridSpacingYChanged( double ) ), this, TQT_SLOT( setCellHeight( double ) ) ); + connect(mAgenda, TQ_SIGNAL(mousePosSignal(const TQPoint &)), this, TQ_SLOT(mousePosChanged(const TQPoint &))); + connect(mAgenda, TQ_SIGNAL(enterAgenda()), this, TQ_SLOT(showMousePos())); + connect(mAgenda, TQ_SIGNAL(leaveAgenda()), this, TQ_SLOT(hideMousePos())); + connect(mAgenda, TQ_SIGNAL(gridSpacingYChanged( double ) ), this, TQ_SLOT( setCellHeight( double ) ) ); } diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h index 8153742fb..77d565b47 100644 --- a/korganizer/timelabels.h +++ b/korganizer/timelabels.h @@ -38,7 +38,7 @@ class TDEConfig; class TimeLabels : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0, |