summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/actionmanager.cpp174
-rw-r--r--korganizer/calendarview.cpp66
-rw-r--r--korganizer/datenavigatorcontainer.cpp2
-rw-r--r--korganizer/eventarchiver.cpp8
-rw-r--r--korganizer/filtereditdialog.cpp2
-rw-r--r--korganizer/freebusymanager.cpp8
-rw-r--r--korganizer/freebusyurldialog.cpp2
-rw-r--r--korganizer/history.cpp6
-rw-r--r--korganizer/importdialog.cpp4
-rw-r--r--korganizer/interfaces/korganizer/part.h2
-rw-r--r--korganizer/journalentry.cpp6
-rw-r--r--korganizer/kdatenavigator.cpp4
-rw-r--r--korganizer/koagenda.cpp68
-rw-r--r--korganizer/koagendaitem.cpp12
-rw-r--r--korganizer/koagendaview.cpp10
-rw-r--r--korganizer/koagendaview.h3
-rw-r--r--korganizer/koapp.cpp2
-rw-r--r--korganizer/koattendeeeditor.cpp8
-rw-r--r--korganizer/kocore.cpp2
-rw-r--r--korganizer/kodaymatrix.cpp6
-rw-r--r--korganizer/kodialogmanager.cpp4
-rw-r--r--korganizer/koeditoralarms.cpp6
-rw-r--r--korganizer/koeditorattachments.cpp28
-rw-r--r--korganizer/koeditordetails.cpp2
-rw-r--r--korganizer/koeditorfreebusy.cpp8
-rw-r--r--korganizer/koeditorgeneral.cpp8
-rw-r--r--korganizer/koeditorgeneralevent.cpp16
-rw-r--r--korganizer/koeditorgeneraljournal.cpp8
-rw-r--r--korganizer/koeditorgeneraltodo.cpp12
-rw-r--r--korganizer/koeditorrecurrence.cpp20
-rw-r--r--korganizer/koeventeditor.cpp4
-rw-r--r--korganizer/koeventviewer.cpp8
-rw-r--r--korganizer/kogroupware.cpp4
-rw-r--r--korganizer/koincidenceeditor.cpp6
-rw-r--r--korganizer/kolistview.cpp20
-rw-r--r--korganizer/komonthview.cpp14
-rw-r--r--korganizer/koprefs.cpp6
-rw-r--r--korganizer/koprefsdialog.cpp20
-rw-r--r--korganizer/korgac/alarmdialog.cpp6
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp2
-rw-r--r--korganizer/korganizer.cpp8
-rw-r--r--korganizer/korganizer_part.cpp2
-rw-r--r--korganizer/kotodoeditor.cpp2
-rw-r--r--korganizer/kotodoview.cpp4
-rw-r--r--korganizer/kotodoviewitem.cpp2
-rw-r--r--korganizer/kowhatsnextview.cpp14
-rw-r--r--korganizer/mailscheduler.cpp2
-rw-r--r--korganizer/multiagendaview.cpp14
-rw-r--r--korganizer/navigatorbar.cpp4
-rw-r--r--korganizer/plugins/datenums/datenums.cpp4
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp4
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp4
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp36
-rw-r--r--korganizer/printing/calprinter.cpp2
-rw-r--r--korganizer/printing/calprintpluginbase.cpp36
-rw-r--r--korganizer/resourceview.cpp20
-rw-r--r--korganizer/searchdialog.cpp8
58 files changed, 383 insertions, 382 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 09b5c6f45..ad6c7e36f 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, this, TQT_SLOT( showTipOnStart() ) );
+ TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) );
}
// Note: We need this ActionManager to be fully constructed, and
// tqparent() to have a valid reference to it before the following
@@ -156,9 +156,9 @@ void ActionManager::init()
connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) );
connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- this, TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ),
- this, TQT_SLOT( exportHTML( HTMLExportSettings * ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) );
processIncidenceSelection( 0, TQDate() );
@@ -227,58 +227,58 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( mIsPart ) {
if ( mMainWindow->hasDocument() ) {
- KStdAction::openNew( this, TQT_SLOT(file_new()), mACollection, "korganizer_openNew" );
- KStdAction::open( this, TQT_SLOT( file_open() ), mACollection, "korganizer_open" );
- mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ),
+ 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& ) ),
mACollection, "korganizer_openRecent" );
KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" );
- KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection,
+ KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection,
"korganizer_saveAs" );
- KStdAction::save( this, TQT_SLOT( file_save() ), mACollection, "korganizer_save" );
+ KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" );
}
- KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection, "korganizer_print" );
+ KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" );
} else {
- KStdAction::openNew( this, TQT_SLOT( file_new() ), mACollection );
- KStdAction::open( this, TQT_SLOT( file_open() ), mACollection );
- mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ),
+ 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& ) ),
mACollection );
if ( mMainWindow->hasDocument() ) {
KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection );
- KStdAction::save( this, TQT_SLOT( file_save() ), mACollection );
- KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection );
+ KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection );
+ KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection );
}
- KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection );
+ KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection );
}
//~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- new KAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQT_SLOT( file_merge() ),
+ new KAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ),
mACollection, "import_icalendar" );
- new KAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQT_SLOT( file_icalimport() ),
+ new KAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ),
mACollection, "import_ical" );
new KAction( i18n("Get &Hot New Stuff..."), 0, this,
TQT_SLOT( downloadNewStuff() ), mACollection,
"downloadnewstuff" );
new KAction( i18n("Export &Web Page..."), "webexport", 0,
- mCalendarView, TQT_SLOT( exportWeb() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ),
mACollection, "export_web" );
new KAction( i18n("&iCalendar..."), 0,
- mCalendarView, TQT_SLOT( exportICalendar() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ),
mACollection, "export_icalendar" );
new KAction( i18n("&vCalendar..."), 0,
- mCalendarView, TQT_SLOT( exportVCalendar() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ),
mACollection, "export_vcalendar" );
- new KAction( i18n("Upload &Hot New Stuff..."), 0, this,
+ new KAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this),
TQT_SLOT( uploadNewStuff() ), mACollection,
"uploadnewstuff" );
- new KAction( i18n("Archive O&ld Entries..."), 0, this, TQT_SLOT( file_archive() ),
+ new KAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ),
mACollection, "file_archive" );
new KAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
- mCalendarView, TQT_SLOT( purgeCompleted() ), mACollection,
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection,
"purge_completed" );
@@ -289,34 +289,34 @@ void ActionManager::initActions()
KOrg::History *h = mCalendarView->history();
if ( mIsPart ) {
// edit menu
- mCutAction = KStdAction::cut( mCalendarView, TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ),
mACollection, "korganizer_cut" );
- mCopyAction = KStdAction::copy( mCalendarView, TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ),
mACollection, "korganizer_copy" );
- pasteAction = KStdAction::paste( mCalendarView, TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ),
mACollection, "korganizer_paste" );
mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ),
mACollection, "korganizer_undo" );
mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ),
mACollection, "korganizer_redo" );
} else {
- mCutAction = KStdAction::cut( mCalendarView,TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ),
mACollection );
- mCopyAction = KStdAction::copy( mCalendarView,TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ),
mACollection );
- pasteAction = KStdAction::paste( mCalendarView,TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ),
mACollection );
- mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), mACollection );
- mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), mACollection );
+ mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection );
+ mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection );
}
mDeleteAction = new KAction( i18n("&Delete"), "editdelete", 0,
- mCalendarView, TQT_SLOT( appointment_delete() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ),
mACollection, "edit_delete" );
if ( mIsPart ) {
- KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
mACollection, "korganizer_tqfind" );
} else {
- KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
mACollection );
}
pasteAction->setEnabled( false );
@@ -381,7 +381,7 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new KAction( i18n("&Refresh"), 0,
- mCalendarView, TQT_SLOT( updateView() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ),
mACollection, "update" );
// TODO:
// new KAction( i18n("Hide &Completed To-dos"), 0,
@@ -398,7 +398,7 @@ void ActionManager::initActions()
connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ),
mFilterAction, TQT_SLOT( setCurrentItem( int ) ) );
connect( mCalendarView, TQT_SIGNAL( filterChanged() ),
- this, TQT_SLOT( setTitle() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -422,11 +422,11 @@ void ActionManager::initActions()
//************************** Actions MENU *********************************
new KAction( i18n("Go to &Today"), "today", 0,
- mCalendarView,TQT_SLOT( goToday() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ),
mACollection, "go_today" );
bool isRTL = TQApplication::reverseLayout();
action = new KAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
- mCalendarView,TQT_SLOT( goPrevious() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ),
mACollection, "go_previous" );
// Changing the action text by setText makes the toolbar button disappear.
@@ -435,10 +435,10 @@ void ActionManager::initActions()
connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
action, TQT_SLOT( setText( const TQString & ) ) );
connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
- this, TQT_SLOT( dumpText( const TQString & ) ) );*/
+ TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/
action = new KAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
- mCalendarView,TQT_SLOT( goNext() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ),
mACollection, "go_next" );
/*
connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ),
@@ -449,35 +449,35 @@ void ActionManager::initActions()
//************************** Actions MENU *********************************
new KAction( i18n("New E&vent..."),
KOGlobals::self()->smallIcon( "newappointment" ), 0,
- mCalendarView, TQT_SLOT(newEvent()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()),
mACollection, "new_event" );
new KAction( i18n("New &To-do..."),
KOGlobals::self()->smallIcon( "newtodo" ), 0,
- mCalendarView, TQT_SLOT(newTodo()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()),
mACollection, "new_todo" );
action = new KAction( i18n("New Su&b-to-do..."), 0,
- mCalendarView,TQT_SLOT( newSubTodo() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ),
mACollection, "new_subtodo" );
action->setEnabled( false );
connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ),
action,TQT_SLOT( setEnabled( bool ) ) );
new KAction( i18n("New &Journal..."),
KOGlobals::self()->smallIcon( "newjournal" ), 0,
- mCalendarView, TQT_SLOT(newJournal()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()),
mACollection, "new_journal" );
mShowIncidenceAction = new KAction( i18n("&Show"), 0,
- mCalendarView,TQT_SLOT( showIncidence() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ),
mACollection, "show_incidence" );
mEditIncidenceAction = new KAction( i18n("&Edit..."), 0,
- mCalendarView,TQT_SLOT( editIncidence() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ),
mACollection, "edit_incidence" );
mDeleteIncidenceAction = new KAction( i18n("&Delete"), Key_Delete,
- mCalendarView,TQT_SLOT( deleteIncidence()),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()),
mACollection, "delete_incidence" );
action = new KAction( i18n("&Make Sub-to-do Independent"), 0,
- mCalendarView,TQT_SLOT( todo_unsub() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ),
mACollection, "unsub_todo" );
action->setEnabled( false );
connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ),
@@ -496,27 +496,27 @@ void ActionManager::initActions()
//************************** SCHEDULE MENU ********************************
mPublishEvent = new KAction( i18n("&Publish Item Information..."), "mail_send", 0,
- mCalendarView, TQT_SLOT( schedule_publish() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ),
mACollection, "schedule_publish" );
mPublishEvent->setEnabled( false );
mSendInvitation = new KAction( i18n( "Send &Invitation to Attendees" ),
"mail_generic", 0,
- mCalendarView, TQT_SLOT(schedule_request()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()),
mACollection, "schedule_request" );
mSendInvitation->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
mSendInvitation, TQT_SLOT(setEnabled(bool)) );
mRequestUpdate = new KAction( i18n( "Re&quest Update" ), 0,
- mCalendarView, TQT_SLOT(schedule_refresh()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()),
mACollection, "schedule_refresh" );
mRequestUpdate->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mRequestUpdate, TQT_SLOT(setEnabled(bool)) );
mSendCancel = new KAction( i18n( "Send &Cancelation to Attendees" ), 0,
- mCalendarView, TQT_SLOT(schedule_cancel()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()),
mACollection, "schedule_cancel" );
mSendCancel->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
@@ -524,37 +524,37 @@ void ActionManager::initActions()
mSendStatusUpdate = new KAction( i18n( "Send tqStatus &Update" ),
"mail_reply", 0,
- mCalendarView,TQT_SLOT(schedule_reply()),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()),
mACollection, "schedule_reply" );
mSendStatusUpdate->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) );
mRequestChange = new KAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
- mCalendarView, TQT_SLOT(schedule_counter()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()),
mACollection, "schedule_counter" );
mRequestChange->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mRequestChange, TQT_SLOT(setEnabled(bool)) );
mForwardEvent = new KAction( i18n("&Send as iCalendar..."), "mail_forward", 0,
- mCalendarView, TQT_SLOT(schedule_forward()),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()),
mACollection, "schedule_forward" );
mForwardEvent->setEnabled( false );
action = new KAction( i18n("&Mail Free Busy Information..."), 0,
- mCalendarView, TQT_SLOT( mailFreeBusy() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ),
mACollection, "mail_freebusy" );
action->setEnabled( true );
action = new KAction( i18n("&Upload Free Busy Information"), 0,
- mCalendarView, TQT_SLOT( uploadFreeBusy() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ),
mACollection, "upload_freebusy" );
action->setEnabled( true );
if ( !mIsPart ) {
action = new KAction( i18n("&Addressbook"),"contents",0,
- mCalendarView,TQT_SLOT( openAddressbook() ),
+ TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ),
mACollection,"addressbook" );
}
@@ -565,13 +565,13 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mDateNavigatorShowAction = new KToggleAction( i18n("Show Date Navigator"), 0,
- this, TQT_SLOT( toggleDateNavigator() ),
+ TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ),
mACollection, "show_datenavigator" );
mTodoViewShowAction = new KToggleAction ( i18n("Show To-do View"), 0,
- this, TQT_SLOT( toggleTodoView() ),
+ TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ),
mACollection, "show_todoview" );
mEventViewerShowAction = new KToggleAction ( i18n("Show Item Viewer"), 0,
- this, TQT_SLOT( toggleEventViewer() ),
+ TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ),
mACollection, "show_eventviewer" );
KConfig *config = KOGlobals::self()->config();
config->setGroup( "Settings" );
@@ -590,10 +590,10 @@ void ActionManager::initActions()
if ( !mMainWindow->hasDocument() ) {
mResourceViewShowAction = new KToggleAction ( i18n("Show Resource View"), 0,
- this, TQT_SLOT( toggleResourceView() ),
+ TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ),
mACollection, "show_resourceview" );
mResourceButtonsAction = new KToggleAction( i18n("Show &Resource Buttons"), 0,
- this, TQT_SLOT( toggleResourceButtons() ),
+ TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ),
mACollection, "show_resourcebuttons" );
mResourceViewShowAction->setChecked(
config->readBoolEntry( "ResourceViewVisible", true ) );
@@ -608,35 +608,35 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new KAction( i18n("Configure &Date && Time..."), 0,
- this, TQT_SLOT( configureDateTime() ),
+ TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ),
mACollection, "conf_datetime" );
// TODO: Add an item to show the resource management dlg
// new KAction( i18n("Manage &Resources..."), 0,
-// this, TQT_SLOT( manageResources() ),
+// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ),
// mACollection, "conf_resources" );
new KAction( i18n("Manage View &Filters..."), "configure", 0,
- mCalendarView, TQT_SLOT( editFilters() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ),
mACollection, "edit_filters" );
new KAction( i18n("Manage C&ategories..."), 0,
- mCalendarView->dialogManager(), TQT_SLOT( showCategoryEditDialog() ),
+ TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ),
mACollection, "edit_categories" );
if ( mIsPart ) {
new KAction( i18n("&Configure Calendar..."), "configure", 0,
- mCalendarView, TQT_SLOT( edit_options() ),
+ TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
mACollection, "korganizer_configure" );
- KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+ KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
mACollection, "korganizer_configure_shortcuts" );
} else {
- KStdAction::preferences( mCalendarView, TQT_SLOT( edit_options() ),
+ KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
mACollection );
- KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), mACollection );
+ KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection );
}
//**************************** HELP MENU **********************************
- KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), mACollection,
+ KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection,
"help_tipofday" );
// new KAction( i18n("Show Intro Page"), 0,
// mCalendarView,TQT_SLOT( showIntro() ),
@@ -872,7 +872,7 @@ bool ActionManager::openURL( const KURL &url,bool merge )
mFile = url.path();
if ( !KStandardDirs::exists( mFile ) ) {
mMainWindow->showStatusMessage( i18n("New calendar '%1'.")
- .arg( url.prettyURL() ) );
+ .tqarg( url.prettyURL() ) );
mCalendarView->setModified();
} else {
bool success = mCalendarView->openCalendar( mFile, merge );
@@ -906,7 +906,7 @@ bool ActionManager::openURL( const KURL &url,bool merge )
return success;
} else {
TQString msg;
- msg = i18n("Cannot download calendar from '%1'.").arg( url.prettyURL() );
+ msg = i18n("Cannot download calendar from '%1'.").tqarg( url.prettyURL() );
KMessageBox::error( dialogParent(), msg );
return false;
}
@@ -945,7 +945,7 @@ bool ActionManager::addResource( const KURL &mUrl )
resource->setResourceName( name );
manager->add( resource );
mMainWindow->showStatusMessage( i18n( "Added calendar resource for URL '%1'." )
- .arg( name ) );
+ .tqarg( name ) );
// we have to call resourceAdded manually, because for in-process changes
// the dcop signals are not connected, so the resource's signals would not
// be connected otherwise
@@ -953,7 +953,7 @@ bool ActionManager::addResource( const KURL &mUrl )
mCalendarResources->resourceAdded( resource );
} else {
TQString msg = i18n("Unable to create calendar resource '%1'.")
- .arg( name );
+ .tqarg( name );
KMessageBox::error( dialogParent(), msg );
}
return true;
@@ -964,10 +964,10 @@ void ActionManager::showStatusMessageOpen( const KURL &url, bool merge )
{
if ( merge ) {
mMainWindow->showStatusMessage( i18n("Merged calendar '%1'.")
- .arg( url.prettyURL() ) );
+ .tqarg( url.prettyURL() ) );
} else {
mMainWindow->showStatusMessage( i18n("Opened calendar '%1'.")
- .arg( url.prettyURL() ) );
+ .tqarg( url.prettyURL() ) );
}
}
@@ -1018,7 +1018,7 @@ bool ActionManager::saveURL()
if ( !mURL.isLocalFile() ) {
if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) {
TQString msg = i18n("Cannot upload calendar to '%1'")
- .arg( mURL.prettyURL() );
+ .tqarg( mURL.prettyURL() );
KMessageBox::error( dialogParent() ,msg );
return false;
}
@@ -1030,7 +1030,7 @@ bool ActionManager::saveURL()
mAutoSaveTimer->start( 1000*60*KOPrefs::instance()->mAutoSaveInterval );
}
- mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").arg( mURL.prettyURL() ) );
+ mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").tqarg( mURL.prettyURL() ) );
return true;
}
@@ -1061,7 +1061,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings )
return;
kdDebug()<<" settings->outputFile() :"<<settings->outputFile()<<endl;
if ( TQFileInfo( settings->outputFile() ).exists() ) {
- if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").tqarg( settings->outputFile()) ) == KMessageBox::No)
return;
}
settings->setEMail( KOPrefs::instance()->email() );
@@ -1136,7 +1136,7 @@ bool ActionManager::saveAsURL( const KURL &url )
setTitle();
if ( mRecent ) mRecent->addURL( mURL );
} else {
- KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").arg( mFile ), i18n("Error") );
+ KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").tqarg( mFile ), i18n("Error") );
kdDebug(5850) << "ActionManager::saveAsURL() failed" << endl;
mURL = URLOrig;
mFile = fileOrig;
@@ -1558,7 +1558,7 @@ TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -1892,7 +1892,7 @@ void ActionManager::updateUndoAction( const TQString &text )
} else {
mUndoAction->setEnabled( true );
if ( text.isEmpty() ) mUndoAction->setText( i18n("Undo") );
- else mUndoAction->setText( i18n("Undo (%1)").arg( text ) );
+ else mUndoAction->setText( i18n("Undo (%1)").tqarg( text ) );
}
}
@@ -1904,7 +1904,7 @@ void ActionManager::updateRedoAction( const TQString &text )
} else {
mRedoAction->setEnabled( true );
if ( text.isEmpty() ) mRedoAction->setText( i18n("Redo") );
- else mRedoAction->setText( i18n( "Redo (%1)" ).arg( text ) );
+ else mRedoAction->setText( i18n( "Redo (%1)" ).tqarg( text ) );
}
}
@@ -1983,7 +1983,7 @@ bool ActionManager::saveResourceCalendar()
int result = KMessageBox::warningContinueCancel( view(),
i18n( "Saving of '%1' failed. Check that the resource is "
"properly configured.\nIgnore problem and continue without "
- "saving or cancel save?" ).arg( (*it)->resourceName() ),
+ "saving or cancel save?" ).tqarg( (*it)->resourceName() ),
i18n("Save Error"), KStdGuiItem::dontSave() );
if ( result == KMessageBox::Cancel ) return false;
}
@@ -2006,7 +2006,7 @@ void ActionManager::importCalendar( const KURL &url )
{
if ( !url.isValid() ) {
KMessageBox::error( dialogParent(),
- i18n("URL '%1' is invalid.").arg( url.prettyURL() ) );
+ i18n("URL '%1' is invalid.").tqarg( url.prettyURL() ) );
return;
}
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 84199bfe4..bdf334014 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -131,18 +131,18 @@ CalendarView::CalendarView( TQWidget *tqparent, const char *name )
mExtensions.setAutoDelete( true );
- mDateNavigator = new DateNavigator( this );
- mDateChecker = new DateChecker( this );
+ mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) );
+ mDateChecker = new DateChecker( TQT_TQOBJECT(this) );
TQBoxLayout *topLayout = new TQVBoxLayout( this );
#ifndef KORG_NOSPLITTER
// create the main tqlayout frames.
- mPanner = new TQSplitter( TQSplitter::Horizontal, this,
+ mPanner = new TQSplitter( Qt::Horizontal, this,
"CalendarView::Panner" );
topLayout->addWidget( mPanner );
- mLeftSplitter = new TQSplitter( TQSplitter::Vertical, mPanner,
+ mLeftSplitter = new TQSplitter( Qt::Vertical, mPanner,
"CalendarView::LeftFrame" );
// mPanner->setResizeMode( mLeftSplitter, TQSplitter::Stretch );
@@ -277,7 +277,7 @@ CalendarView::CalendarView( TQWidget *tqparent, const char *name )
KOGlobals::self()->
setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) );
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( checkClipboard() ) );
connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
@@ -311,7 +311,7 @@ void CalendarView::setCalendar( Calendar *cal )
connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) );
if ( mChanger ) delete mChanger;
- setIncidenceChanger( new IncidenceChanger( mCalendar, this ) );
+ setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) );
mCalendar->registerObserver( this );
@@ -357,7 +357,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
cV = mViewManager->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -487,7 +487,7 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge)
// have become partially populated. Clear it out.
if ( !merge ) mCalendar->close();
- KMessageBox::error(this,i18n("Could not load calendar '%1'.").arg(filename));
+ KMessageBox::error(this,i18n("Could not load calendar '%1'.").tqarg(filename));
return false;
}
@@ -631,7 +631,7 @@ void CalendarView::readFilterSettings( KConfig *config )
}
config->setGroup( "General" );
- int pos = filterList.findIndex( currentFilter );
+ int pos = filterList.tqfindIndex( currentFilter );
mCurrentFilter = 0;
if ( pos>=0 ) {
mCurrentFilter = mFilters.at( pos );
@@ -776,8 +776,8 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
if ( todo->isCompleted() ||
modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) {
TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() );
- TQString description = i18n( "To-do completed: %1 (%2)" ).arg(
- newIncidence->summary() ).arg( timeStr );
+ TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg(
+ newIncidence->summary() ).tqarg( timeStr );
Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() );
Journal *journal;
@@ -787,7 +787,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
journal->setDtStart( TQDateTime::tqcurrentDateTime() );
TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
- journal->setSummary( i18n("Journal of %1").arg( dateStr ) );
+ journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) );
journal->setDescription( description );
//TODO: recorded to-dos should save into the standard resource always
@@ -844,7 +844,7 @@ void CalendarView::checkForFilteredChange( Incidence *incidence )
// user so that he isn't surprised if his new event doesn't show up
KMessageBox::information( this, i18n("The item \"%1\" is filtered by "
"your current filter rules, so it will be hidden and not "
- "appear in the view.").arg( incidence->summary() ),
+ "appear in the view.").tqarg( incidence->summary() ),
i18n("Filter Applied"), "ChangedIncidenceFiltered" );
}
}
@@ -901,7 +901,7 @@ void CalendarView::updateUnmanagedViews()
int CalendarView::msgItemDelete( Incidence *incidence )
{
return KMessageBox::warningContinueCancel(this,
- i18n("The item \"%1\" will be permanently deleted.").arg( incidence->summary() ),
+ i18n("The item \"%1\" will be permanently deleted.").tqarg( incidence->summary() ),
i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"editdelete"));
}
@@ -925,7 +925,7 @@ void CalendarView::edit_cut()
"Do you want to cut just this item and "
"make all its sub-to-dos independent, or "
"cut the to-do with all its sub-to-dos?"
- ).arg( incidence->summary() ),
+ ).tqarg( incidence->summary() ),
i18n("KOrganizer Confirmation"),
i18n("Cut Only This"),
i18n("Cut All"));
@@ -962,7 +962,7 @@ void CalendarView::edit_copy()
i18n("The item \"%1\" has sub-to-dos. "
"Do you want to copy just this item or "
"copy the to-do with all its sub-to-dos?"
- ).arg( incidence->summary() ),
+ ).tqarg( incidence->summary() ),
i18n("KOrganizer Confirmation"),
i18n("Copy Only This"),
i18n("Copy All"));
@@ -1585,7 +1585,7 @@ void CalendarView::schedule_publish(Incidence *incidence)
KMessageBox::information( this, i18n("The item information was successfully sent."),
i18n("Publishing"), "IncidencePublishSuccess" );
} else {
- KMessageBox::error( this, i18n("Unable to publish the item '%1'").arg( incidence->summary() ) );
+ KMessageBox::error( this, i18n("Unable to publish the item '%1'").tqarg( incidence->summary() ) );
}
}
delete publishdlg;
@@ -1661,7 +1661,7 @@ void CalendarView::schedule_forward( Incidence *incidence )
} else {
KMessageBox::error(
this,
- i18n( "Unable to forward the item '%1'" ).arg( incidence->summary() ),
+ i18n( "Unable to forward the item '%1'" ).tqarg( incidence->summary() ),
i18n( "Forwarding Error" ) );
}
}
@@ -1727,16 +1727,16 @@ void CalendarView::schedule(Scheduler::Method method, Incidence *incidence)
if ( scheduler.performTransaction( incidence, method ) ) {
KMessageBox::information( this, i18n("The groupware message for item '%1'"
"was successfully sent.\nMethod: %2")
- .arg( incidence->summary() )
- .arg( Scheduler::methodName( method ) ),
+ .tqarg( incidence->summary() )
+ .tqarg( Scheduler::methodName( method ) ),
i18n("Sending Free/Busy"),
"FreeBusyPublishSuccess" );
} else {
KMessageBox::error( this, i18n("Groupware message sending failed. "
"%2 is request/reply/add/cancel/counter/etc.",
"Unable to send the item '%1'.\nMethod: %2")
- .arg( incidence->summary() )
- .arg( Scheduler::methodName( method ) ) );
+ .tqarg( incidence->summary() )
+ .tqarg( Scheduler::methodName( method ) ) );
}
}
@@ -1817,7 +1817,7 @@ void CalendarView::exportICalendar()
if ( TQFile( filename ).exists() ) {
if ( KMessageBox::No == KMessageBox::warningYesNo(
this,
- i18n( "Do you want to overwrite %1?").arg(filename) ) ) {
+ i18n( "Do you want to overwrite %1?").tqarg(filename) ) ) {
return;
}
}
@@ -1845,7 +1845,7 @@ void CalendarView::exportVCalendar()
if ( TQFile( filename ).exists() ) {
if ( KMessageBox::No == KMessageBox::warningYesNo(
this,
- i18n( "Do you want to overwrite %1?").arg(filename ) ) ) {
+ i18n( "Do you want to overwrite %1?").tqarg(filename ) ) ) {
return;
}
}
@@ -1934,7 +1934,7 @@ void CalendarView::processIncidenceSelection( Incidence *incidence, const TQDate
void CalendarView::checkClipboard()
{
#ifndef KORG_NODND
- if (ICalDrag::canDecode(TQApplication::clipboard()->data())) {
+ if (ICalDrag::canDecode(TQApplication::tqclipboard()->data())) {
kdDebug(5850) << "CalendarView::checkClipboard() true" << endl;
emit pasteEnabled(true);
} else {
@@ -2334,7 +2334,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force )
"Do you want to delete just this item and "
"make all its sub-to-dos independent, or "
"delete the to-do with all its sub-to-dos?"
- ).arg( todo->summary() ),
+ ).tqarg( todo->summary() ),
i18n("KOrganizer Confirmation"),
i18n("Delete Only This"),
i18n("Delete All"));
@@ -2367,7 +2367,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
KMessageBox::information( this, i18n("The item \"%1\" is marked read-only "
"and cannot be deleted; it probably belongs to "
"a read-only calendar resource.")
- .arg(incidence->summary()),
+ .tqarg(incidence->summary()),
i18n("Removing not possible"),
"deleteReadOnlyIncidence" );
}
@@ -2389,7 +2389,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
if ( incidence->doesRecur() ) {
TQDate itemDate = mViewManager->currentSelectionDate();
- kdDebug(5850) << "Recurrence-Date: " << itemDate.toString() << endl;
+ kdDebug(5850) << "Recurrence-Date: " << TQString(itemDate.toString()) << endl;
int km = KMessageBox::Ok;
if ( !force ) {
if ( !itemDate.isValid() ) {
@@ -2397,15 +2397,15 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
km = KMessageBox::warningContinueCancel(this,
i18n("The calendar item \"%1\" recurs over multiple dates; "
"are you sure you want to delete it "
- "and all its recurrences?").arg( incidence->summary() ),
+ "and all its recurrences?").tqarg( incidence->summary() ),
i18n("KOrganizer Confirmation"), i18n("Delete All") );
} else {
km = KOMessageBox::fourBtnMsgBox( this, TQMessageBox::Warning,
i18n("The calendar item \"%1\" recurs over multiple dates. "
"Do you want to delete only the current one on %2, only all "
"future recurrences, or all its recurrences?" )
- .arg( incidence->summary() )
- .arg( KGlobal::locale()->formatDate(itemDate)),
+ .tqarg( incidence->summary() )
+ .tqarg( KGlobal::locale()->formatDate(itemDate)),
i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"),
i18n("Delete &Future"),
i18n("Delete &All"));
@@ -2577,7 +2577,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt )
{
if ( !incadd || !mChanger ) {
KMessageBox::sorry(this, i18n("Unable to copy the item to %1.")
- .arg( dt.toString() ), i18n("Copying Failed") );
+ .tqarg( dt.toString() ), i18n("Copying Failed") );
return;
}
Incidence *incidence = mCalendar->incidence( incadd->uid() );
@@ -2621,7 +2621,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt )
{
if ( !incmove || !mChanger ) {
KMessageBox::sorry( this, i18n("Unable to move the item to %1.")
- .arg( dt.toString() ), i18n("Moving Failed") );
+ .tqarg( dt.toString() ), i18n("Moving Failed") );
return;
}
Incidence *incidence = mCalendar->incidence( incmove->uid() );
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 462920c5f..055111acf 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -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 qMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
+ return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
}
#include "datenavigatorcontainer.moc"
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 300b975e2..0f7dfc33c 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -99,7 +99,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget*
KMessageBox::information(
widget,
i18n( "Unable to archive to-do \"%1\" because at least one of its "
- "sub-to-dos does not meet the archival requirements." ).arg( (*it)->summary() ),
+ "sub-to-dos does not meet the archival requirements." ).tqarg( (*it)->summary() ),
i18n( "Archive To-do" ),
"UncompletedChildrenArchiveTodos" );
} else if ( todoComplete ) {
@@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget*
KMessageBox::information(
widget,
i18n( "There are no incidences available to archive before the specified cut-off date %1. "
- "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ),
+ "Archiving will not be performed." ).tqarg( KGlobal::locale()->formatDate( limitDate ) ),
"ArchiverNoIncidences" );
}
return;
@@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat
int result = KMessageBox::warningContinueCancelList(
widget, i18n("Delete all items before %1 without saving?\n"
"The following items will be deleted:")
- .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs,
+ .tqarg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs,
i18n("Delete Old Items"),KStdGuiItem::del());
if (result != KMessageBox::Continue)
return;
@@ -216,7 +216,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
// Save archive calendar
if ( !archiveStore.save() ) {
- KMessageBox::error(widget,i18n("Cannot write archive file %1.").arg( archiveStore.fileName() ));
+ KMessageBox::error(widget,i18n("Cannot write archive file %1.").tqarg( archiveStore.fileName() ));
return;
}
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index cf6bf2ffe..02e6053e1 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -186,7 +186,7 @@ void FilterEdit::filterSelected(CalFilter *filter)
}
void FilterEdit::bNewPressed() {
- CalFilter *newFilter = new CalFilter( i18n("New Filter %1").arg(mFilters->count()) );
+ CalFilter *newFilter = new CalFilter( i18n("New Filter %1").tqarg(mFilters->count()) );
mFilters->append( newFilter );
updateFilterList();
mRulesList->setSelected(mRulesList->count()-1, true);
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 546952177..5309050ec 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -245,7 +245,7 @@ void FreeBusyManager::publishFreeBusy()
if ( !targetURL.isValid() ) {
KMessageBox::sorry( 0,
i18n( "<qt>The target URL '%1' provided is invalid."
- "</qt>" ).arg( targetURL.prettyURL() ), i18n("Invalid URL") );
+ "</qt>" ).tqarg( targetURL.prettyURL() ), i18n("Invalid URL") );
mBrokenUrl = true;
return;
}
@@ -353,8 +353,8 @@ void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job)
"URL '%1'. There might be a problem with the access rights, or "
"you specified an incorrect URL. The system said: <em>%2</em>."
"<br>Please check the URL or contact your system administrator."
- "</qt>" ).arg( job->destURL().prettyURL() )
- .arg( job->errorString() ) );
+ "</qt>" ).tqarg( job->destURL().prettyURL() )
+ .tqarg( job->errorString() ) );
// Delete temp file
KURL src = job->srcURL();
Q_ASSERT( src.isLocalFile() );
@@ -557,7 +557,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
// This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL!
// In that case, just pass it on through with substitution for %u and %d
// TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this
- if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
+ if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
// A generic URL, substitute %u and %d
fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true);
fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true);
diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp
index b98335812..15dece944 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -66,7 +66,7 @@ FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *tqpare
TQLabel *label = new TQLabel(
i18n("Location of Free/Busy information for %1 <%2>:")
- .arg( mAttendee->name() ).arg( mAttendee->email() ), this );
+ .tqarg( mAttendee->name() ).tqarg( mAttendee->email() ), this );
topLayout->addWidget( label );
mUrlEdit = new KLineEdit( this );
diff --git a/korganizer/history.cpp b/korganizer/history.cpp
index c01aed912..002f84a6b 100644
--- a/korganizer/history.cpp
+++ b/korganizer/history.cpp
@@ -182,7 +182,7 @@ void History::EntryDelete::redo()
TQString History::EntryDelete::text()
{
- return i18n("Delete %1").arg(mIncidence->type());
+ return i18n("Delete %1").tqarg(mIncidence->type().data());
}
@@ -211,7 +211,7 @@ void History::EntryAdd::redo()
TQString History::EntryAdd::text()
{
- return i18n("Add %1").arg(mIncidence->type());
+ return i18n("Add %1").tqarg(mIncidence->type().data());
}
@@ -248,7 +248,7 @@ void History::EntryEdit::redo()
TQString History::EntryEdit::text()
{
- return i18n("Edit %1").arg(mNewIncidence->type());
+ return i18n("Edit %1").tqarg(mNewIncidence->type().data());
}
History::MultiEntry::MultiEntry( Calendar *calendar, const TQString &text )
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index 9d5735101..aa93e34f8 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -46,11 +46,11 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart )
TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame, 0, spacingHint() );
TQString txt = i18n("Import calendar/event at '%1' into KOrganizer.")
- .arg( mUrl.prettyURL() );
+ .tqarg( mUrl.prettyURL() );
topLayout->addWidget( new TQLabel( txt, topFrame ) );
- TQButtonGroup *radioBox = new TQButtonGroup( 1, Horizontal, topFrame );
+ TQButtonGroup *radioBox = new TQButtonGroup( 1, Qt::Horizontal, topFrame );
radioBox->setFlat( true );
topLayout->addWidget( radioBox );
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index a7093e28f..38763c3af 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 *tqparent, const char *name )
- : KParts::Part( tqparent?(tqparent->tqtopLevelWidget()):0, name ), mMainWindow( tqparent ) {}
+ : KParts::Part( tqparent?(TQT_TQOBJECT(tqparent->tqtopLevelWidget())):0, name ), mMainWindow( tqparent ) {}
virtual ~Part() {}
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5af3a320e..ee83b1f52 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry()
void JournalDateEntry::setDate(const TQDate &date)
{
TQString dtstring = TQString( "<qt><center><b><i>%1</i></b> " )
- .arg( KGlobal::locale()->formatDate(date) );
+ .tqarg( KGlobal::locale()->formatDate(date) );
dtstring += " <font size=\"-1\"><a href=\"#\">" +
i18n("[Add Journal Entry]") +
@@ -259,8 +259,8 @@ void JournalEntry::deleteItem()
{
/* KMessageBox::ButtonCode *code = KMessageBox::warningContinueCancel(this,
i18n("The journal \"%1\" on %2 will be permanently deleted.")
- .arg( mJournal->summary() )
- .arg( mJournal->dtStartStr() ),
+ .tqarg( mJournal->summary() )
+ .tqarg( mJournal->dtStartStr() ),
i18n("KOrganizer Confirmation"), KStdGuiItem::del() );
if ( code == KMessageBox::Yes ) {*/
if ( mJournal )
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index abdd8acdf..9ee1f20c0 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -188,7 +188,7 @@ void KDateNavigator::updateDates()
if ( weeknumstart != weeknumend ) {
weeknum = i18n("start/end week number of line in date picker", "%1/%2")
- .arg( weeknumstart ).arg( weeknumend );
+ .tqarg( weeknumstart ).tqarg( weeknumend );
} else {
weeknum.setNum( weeknumstart );
}
@@ -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 ( o == mWeeknos[ i ] ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) {
TQDate weekstart = mDayMatrix->getDate( i * 7 );
emit weekClicked( weekstart );
break;
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index bf25165b3..7172e01ff 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -255,7 +255,7 @@ void KOAgenda::init()
// Grab key strokes for keyboard navigation of agenda. Seems to have no
// effect. Has to be fixed.
- setFocusPolicy( WheelFocus );
+ setFocusPolicy( Qt::WheelFocus );
connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) );
connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) );
@@ -274,7 +274,7 @@ void KOAgenda::init()
mClickedItem = 0;
mActionItem = 0;
- mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
@@ -291,7 +291,7 @@ void KOAgenda::init()
viewport()->update();
viewport()->setBackgroundMode( NoBackground );
- viewport()->setFocusPolicy( WheelFocus );
+ viewport()->setFocusPolicy( Qt::WheelFocus );
setMinimumSize( 30, int( mGridSpacingY + 1 ) );
// setMaximumHeight(mGridSpacingY * mRows + 5);
@@ -384,19 +384,19 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonRelease:
case TQEvent::MouseMove:
- return eventFilter_mouse( object, static_cast<TQMouseEvent *>( event ) );
+ return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) );
#ifndef TQT_NO_WHEELEVENT
case TQEvent::Wheel:
- return eventFilter_wheel( object, static_cast<TQWheelEvent *>( event ) );
+ return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) );
#endif
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
- return eventFilter_key( object, static_cast<TQKeyEvent *>( event ) );
+ return eventFilter_key( object, TQT_TQKEYEVENT( event ) );
case ( TQEvent::Leave ):
if ( !mActionItem )
setCursor( arrowCursor );
- if ( object == viewport() )
+ if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) )
emit leaveAgenda();
return true;
@@ -422,8 +422,8 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
{
#ifndef KORG_NODND
TQPoint viewportPos;
- if ( object != viewport() && object != this ) {
- viewportPos = static_cast<TQWidget *>( object )->mapToParent( de->pos() );
+ if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) {
+ viewportPos = TQT_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 ( object == this ) {
+ if ( TQT_BASE_OBJECT(object) == TQT_BASE_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( new TQKeyEvent( ke->type(), ke->key(),
+ mTypeAheadEvents.append( TQT_TQEVENT( 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 ( object != viewport() ) {
+ if ( TQT_BASE_OBJECT(object) != TQT_BASE_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 ) ),
- TQt::Horizontal );
+ Qt::Horizontal );
accepted=true;
}
if ( ( e->state() & ControlButton ) == ControlButton ){
- if ( object != viewport() ) {
+ if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
}
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- TQt::Vertical );
+ Qt::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 (object != viewport()) {
+ if (TQT_BASE_OBJECT(object) != TQT_BASE_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 (object != viewport()) {
- if (me->button() == RightButton) {
+ if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (me->button() == Qt::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( object, me ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(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 = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( 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( object, me ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
}
}
} else {
- if ( me->button() == RightButton ) {
+ if ( me->button() == Qt::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 = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
setCursor(arrowCursor);
startSelectAction(viewportPos);
}
}
- return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(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 (object != viewport()) {
+ if (TQT_BASE_OBJECT(object) != TQT_BASE_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 (object == viewport()) {
+ if (TQT_BASE_OBJECT(object) == TQT_BASE_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 = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( 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 = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction()
}
mActionItem = 0;
- mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mItemMoved = false;
if ( multiModify ) {
@@ -1557,7 +1557,7 @@ TQMemArray<int> KOAgenda::minContentsY()
int ymin = item->cellYTop();
int index = item->cellXLeft();
if ( index>=0 && index<(int)(mSelectedDates.count()) ) {
- if ( ymin < minArray[index] && mItemsToDelete.findRef( item ) == -1 )
+ if ( ymin < minArray[index] && mItemsToDelete.tqfindRef( item ) == -1 )
minArray[index] = ymin;
}
}
@@ -1574,7 +1574,7 @@ TQMemArray<int> KOAgenda::maxContentsY()
int ymax = item->cellYBottom();
int index = item->cellXLeft();
if ( index>=0 && index<(int)(mSelectedDates.count()) ) {
- if ( ymax > maxArray[index] && mItemsToDelete.findRef( item ) == -1 )
+ if ( ymax > maxArray[index] && mItemsToDelete.tqfindRef( item ) == -1 )
maxArray[index] = ymax;
}
}
@@ -1708,7 +1708,7 @@ void KOAgenda::insertMultiItem( Event *event, const TQDate &qd, int XBegin, int
cellYBottom = rows() - 1;
}
- newtext = TQString("(%1/%2): ").arg( count ).arg( width );
+ newtext = TQString("(%1/%2): ").tqarg( count ).tqarg( width );
newtext.append( event->summary() );
current = insertItem( event, qd, cellX, cellYTop, cellYBottom, count, width );
@@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem )
agendaItem->hide();
addChild( agendaItem );
- if ( !mItems.containsRef( agendaItem ) ) {
+ if ( !mItems.tqcontainsRef( agendaItem ) ) {
mItems.append( agendaItem );
}
placeSubCells( agendaItem );
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index a7ba07d0c..1304ef5d2 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -562,7 +562,7 @@ void KOAgendaItem::addAttendee( const TQString &newAttendee )
KPIM::getNameAndMail( newAttendee, name, email );
if ( !( name.isEmpty() && email.isEmpty() ) ) {
mIncidence->addAttendee(new Attendee(name,email));
- KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").arg(KPIM::normalizedAddress(name, email, TQString())).arg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" );
+ KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").tqarg(KPIM::normalizedAddress(name, email, TQString())).tqarg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" );
}
}
@@ -838,8 +838,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
if ( !isMultiItem() ) {
shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time());
if (mIncidence->type() != "Todo")
- longH = i18n("%1 - %2").arg(shortH)
- .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
+ longH = i18n("%1 - %2").tqarg(shortH)
+ .tqarg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
else
longH = shortH;
} else if ( !mMultiItemInfo->mFirstMultiItem ) {
@@ -847,7 +847,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
longH = shortH;
} else {
shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time());
- longH = i18n("- %1").arg(shortH);
+ longH = i18n("- %1").tqarg(shortH);
}
KWordWrap *ww = KWordWrap::formatText( fm,
@@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
(mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days
shortH = longH =
i18n("%1 - %2")
- .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date()))
- .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
+ .tqarg(KGlobal::locale()->formatDate(mIncidence->dtStart().date()))
+ .tqarg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
// paint headline
p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight,
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 49a21acf7..526f1f619 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(Vertical,this);
+ mSplitterAgenda = new TQSplitter(Qt::Vertical,this);
topLayout->addWidget(mSplitterAgenda);
#if KDE_IS_VERSION( 3, 1, 93 )
@@ -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 == TQt::Horizontal ) {
+ if ( orient == Qt::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 {
- // Vertical zoom
+ // Qt::Vertical zoom
TQPoint posConstentsOld = mAgenda->gridToContents(pos);
if ( delta > 0 ) {
zoomOutVertically();
@@ -627,8 +627,8 @@ void KOAgendaView::createDayLabels( bool force )
int dW = calsys->dayOfWeek(date);
TQString veryLongStr = KGlobal::locale()->formatDate( date );
TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" )
- .arg( calsys->weekDayName( dW, true ) )
- .arg( calsys->day(date) );
+ .tqarg( calsys->weekDayName( dW, true ) )
+ .tqarg( calsys->day(date) );
TQString shortstr = TQString::number(calsys->day(date));
KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr,
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 25c1dd159..b55e92b9c 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -196,7 +196,8 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
void zoomOutVertically( );
void zoomView( const int delta, const TQPoint &pos,
- const Qt::Orientation orient=TQt::Horizontal );
+
+ const Qt::Orientation orient=Qt::Horizontal );
void clearTimeSpanSelection();
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index ffa9e4c08..6b15af08d 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -57,7 +57,7 @@ using namespace std;
KOrganizerApp::KOrganizerApp() : KUniqueApplication()
{
TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN";
- CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) );
+ CalFormat::setApplication( "KOrganizer", prodId.tqarg( korgVersion ) );
}
KOrganizerApp::~KOrganizerApp()
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index d24a8812b..51f838576 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -309,7 +309,7 @@ void KOAttendeeEditor::readEvent(KCal::Incidence * incidence)
delete mOrganizerCombo;
mOrganizerCombo = 0;
}
- mOrganizerLabel->setText( i18n( "Organizer: %1" ).arg( incidence->organizer().fullName() ) );
+ mOrganizerLabel->setText( i18n( "Organizer: %1" ).tqarg( incidence->organizer().fullName() ) );
}
Attendee::List al = incidence->attendees();
@@ -477,9 +477,9 @@ void KOAttendeeEditor::fillAttendeeInput( KCal::Attendee *a )
if ( a->status() == Attendee::Delegated ) {
if ( !a->delegate().isEmpty() )
- mDelegateLabel->setText( i18n( "Delegated to %1" ).arg( a->delegate() ) );
+ mDelegateLabel->setText( i18n( "Delegated to %1" ).tqarg( a->delegate() ) );
else if ( !a->delegator().isEmpty() )
- mDelegateLabel->setText( i18n( "Delegated from %1" ).arg( a->delegator() ) );
+ mDelegateLabel->setText( i18n( "Delegated from %1" ).tqarg( a->delegator() ) );
else
mDelegateLabel->setText( i18n( "Not delegated" ) );
}
@@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe()
bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev)
{
- if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn &&
+ if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn &&
currentAttendee() == 0 ) {
addNewAttendee();
}
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 6313dd2fa..51e436283 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -67,7 +67,7 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
TQString constraint;
if ( version >= 0 ) {
constraint = TQString("[X-KDE-PluginInterfaceVersion] == %1")
- .arg( TQString::number( version ) );
+ .tqarg( TQString::number( version ) );
}
return KTrader::self()->query( type, constraint );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index cb172e9ce..89e869164 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -562,9 +562,9 @@ void KODayMatrix::paintEvent( TQPaintEvent * )
int selw, selh;
bool isRTL = KOGlobals::self()->reverseLayout();
- TQColorGroup cg = palette().active();
+ TQColorGroup cg = tqpalette().active();
- p.begin( &pm, this );
+ p.tqbegin( &pm, this );
pm.fill( cg.base() );
// draw topleft frame
@@ -725,5 +725,5 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
d = d.addDays( -7 ); // Start on the second line
}
- return qMakePair( d, d.addDays( NUMDAYS-1 ) );
+ return tqMakePair( d, d.addDays( NUMDAYS-1 ) );
}
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index ff26d005a..cae637613 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -111,8 +111,8 @@ KODialogManager::~KODialogManager()
void KODialogManager::errorSaveIncidence( TQWidget *tqparent, Incidence *incidence )
{
KMessageBox::sorry( tqparent, i18n("Unable to save %1 \"%2\".")
- .arg( i18n( incidence->type() ) )
- .arg( incidence->summary() ) );
+ .tqarg( i18n( incidence->type() ) )
+ .tqarg( incidence->summary() ) );
}
void KODialogManager::showOptionsDialog()
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index d45495783..8c4168516 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -167,13 +167,13 @@ void AlarmListViewItem::construct()
if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
useoffset = offset / (24*60);
- offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
} else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
useoffset = offset / 60;
- offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
} else {
useoffset = offset;
- offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
}
setText( ColAlarmOffset, offsetstr );
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index ddade8815..0672ba092 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( TQt::Horizontal, topFrame );
+ KSeparator *sep = new KSeparator( Qt::Horizontal, topFrame );
grid->addMultiCellWidget( sep, 1, 1, 0, 2 );
TQLabel *label = new TQLabel( i18n( "Type:" ), topFrame );
@@ -490,29 +490,29 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *tqparent,
mContextMenu = new KPopupMenu( this );
- KActionCollection* ac = new KActionCollection( this, this );
+ KActionCollection* ac = new KActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) );
- mOpenAction = new KAction( i18n("Open"), 0, this, TQT_SLOT(slotShow()), ac );
+ mOpenAction = new KAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac );
mOpenAction->plug( mContextMenu );
- mSaveAsAction = new KAction( i18n( "Save As..." ), 0, this, TQT_SLOT(slotSaveAs()), ac );
+ mSaveAsAction = new KAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac );
mSaveAsAction->plug( mContextMenu );
mContextMenu->insertSeparator();
- mCopyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), ac );
+ mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
mCopyAction->plug( mContextMenu );
- mCutAction = KStdAction::cut(this, TQT_SLOT(slotCut()), ac );
+ mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac );
mCutAction->plug( mContextMenu );
- KAction *action = KStdAction::paste(this, TQT_SLOT(slotPaste()), ac );
+ KAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac );
action->plug( mContextMenu );
mContextMenu->insertSeparator();
- mDeleteAction = new KAction( i18n( "&Remove" ), 0, this, TQT_SLOT(slotRemove()), ac );
+ mDeleteAction = new KAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac );
mDeleteAction->plug( mContextMenu );
mDeleteAction->setShortcut( Key_Delete );
mContextMenu->insertSeparator();
- mEditAction = new KAction( i18n( "&Properties..." ), 0, this, TQT_SLOT(slotEdit()), ac );
+ mEditAction = new KAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac );
mEditAction->plug( mContextMenu );
selectionChanged();
@@ -606,7 +606,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
for ( KURL::List::ConstIterator it = urls.constBegin();
it != urls.constEnd(); ++it ) {
TQString label = (*jt++);
- if ( mAttachments->findItem( label ) ) {
+ if ( mAttachments->tqfindItem( label ) ) {
label += '~' + randomString( 3 );
}
addUriAttachment( (*it).url(), TQString(), label, true );
@@ -619,7 +619,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
if ( label.isEmpty() ) {
label = (*it).prettyURL();
}
- if ( mAttachments->findItem( label ) ) {
+ if ( mAttachments->tqfindItem( label ) ) {
label += '~' + randomString( 3 );
}
addUriAttachment( (*it).url(), TQString(), label, true );
@@ -718,7 +718,7 @@ void KOEditorAttachments::slotRemove()
if ( KMessageBox::questionYesNo(
this,
- i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).arg( labelsStr ),
+ i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).tqarg( labelsStr ),
i18n( "Remove Attachment?" ),
KStdGuiItem::yes(), KStdGuiItem::no(),
"calendarRemoveAttachments" ) != KMessageBox::Yes ) {
@@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i )
void KOEditorAttachments::slotCopy()
{
- TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
}
void KOEditorAttachments::slotCut()
@@ -885,7 +885,7 @@ void KOEditorAttachments::slotCut()
void KOEditorAttachments::slotPaste()
{
- handlePasteOrDrop( TQApplication::clipboard()->data() );
+ handlePasteOrDrop( TQApplication::tqclipboard()->data() );
}
void KOEditorAttachments::selectionChanged()
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 9d31182c0..40b0168dc 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -329,7 +329,7 @@ void KOEditorDetails::writeEvent(Incidence *event)
bool skip = false;
if ( attendee->email().endsWith( "example.net" ) ) {
if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. "
- "Are you sure you want to invite this participant?").arg( attendee->email() ),
+ "Are you sure you want to invite this participant?").tqarg( attendee->email() ),
i18n("Invalid email address") ) != KMessageBox::Yes ) {
skip = true;
}
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index da7f36f04..fab937190 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -699,7 +699,7 @@ void KOEditorFreeBusy::updateStatusSummary()
mStatusSummaryLabel->setText(
i18n( "Of the %1 participants, %2 have accepted, %3"
" have tentatively accepted, and %4 have declined.")
- .arg( total ).arg( accepted ).arg( tentative ).arg( declined ) );
+ .tqarg( total ).tqarg( accepted ).tqarg( tentative ).tqarg( declined ) );
} else {
mStatusSummaryLabel->hide();
}
@@ -783,7 +783,7 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event)
bool skip = false;
if ( attendee->email().endsWith( "example.net" ) ) {
if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. "
- "Are you sure you want to invite this participant?").arg( attendee->email() ),
+ "Are you sure you want to invite this participant?").tqarg( attendee->email() ),
i18n("Invalid email address") ) != KMessageBox::Yes ) {
skip = true;
}
@@ -920,7 +920,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item)
{
- if ( button == TQt::LeftButton && item == 0 )
+ if ( button == Qt::LeftButton && item == 0 )
addNewAttendee();
}
@@ -980,7 +980,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer)
bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event )
{
- if ( watched == mGanttView->timeHeaderWidget() &&
+ if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) &&
event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) {
return true;
} else {
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 3a15188ab..afbda6156 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -426,7 +426,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
remStr = remStr.left( maxLen );
remStr += etc;
}
- mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
+ mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
}
} else { // alarm count is 1
Alarm *alarm = mAlarmList.first();
@@ -465,7 +465,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
mSimpleAlarmBox->hide();
if ( incidence ) {
TQString remStr = IncidenceFormatter::reminderStringList( incidence ).first();
- mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
+ mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
}
}
}
@@ -497,7 +497,7 @@ void KOEditorGeneral::readIncidence( Incidence *incidence, Calendar *calendar )
TQString resLabel = IncidenceFormatter::resourceString( calendar, incidence );
if ( !resLabel.isEmpty() ) {
- mResourceLabel->setText( i18n( "Calendar: %1" ).arg( resLabel ) );
+ mResourceLabel->setText( i18n( "Calendar: %1" ).tqarg( resLabel ) );
mResourceLabel->show();
}
}
@@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text )
TQObject *KOEditorGeneral::typeAheadReceiver() const
{
- return mSummaryEdit;
+ return TQT_TQOBJECT(mSummaryEdit);
}
void KOEditorGeneral::updateAttendeeSummary(int count)
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 123632f36..e09007508 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -95,7 +95,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout)
{
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
i18n("Date && Time"),tqparent);
TQWhatsThis::add( timeGroupBox,
i18n("Sets options related to the date and time of the "
@@ -253,7 +253,7 @@ void KOEditorGeneralEvent::setDateTimes( const TQDateTime &start, const TQDateTi
void KOEditorGeneralEvent::startTimeChanged( TQTime newtime )
{
- kdDebug(5850) << "KOEditorGeneralEvent::startTimeChanged() " << newtime.toString() << endl;
+ kdDebug(5850) << "KOEditorGeneralEvent::startTimeChanged() " << TQString(newtime.toString()) << endl;
int secsep = mCurrStartDateTime.secsTo(mCurrEndDateTime);
@@ -479,8 +479,8 @@ void KOEditorGeneralEvent::emitDateTimeStr()
to = l->formatDateTime(mCurrEndDateTime);
}
- TQString str = i18n("From: %1 To: %2 %3").arg(from).arg(to)
- .arg(mDurationLabel->text());
+ TQString str = i18n("From: %1 To: %2 %3").tqarg(from).tqarg(to)
+ .tqarg(mDurationLabel->text());
emit dateTimeStrChanged(str);
}
@@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput()
if (!mStartTimeEdit->inputIsValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid start time, for example '%1'.")
- .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+ .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
return false;
}
if (!mEndTimeEdit->inputIsValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid end time, for example '%1'.")
- .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+ .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
return false;
}
}
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
if (!mStartDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid start date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+ .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
return false;
}
if (!mEndDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid end date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+ .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
return false;
}
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 274c58b90..2211c97da 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -47,7 +47,7 @@
KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *tqparent,
const char *name )
- : KOEditorGeneral( tqparent, name )
+ : KOEditorGeneral( TQT_TQOBJECT(tqparent), name )
{
setType( "Journal" );
}
@@ -110,7 +110,7 @@ void KOEditorGeneralJournal::setDate( const TQDate &date )
void KOEditorGeneralJournal::setTime( const TQTime &time )
{
-kdDebug()<<"KOEditorGeneralJournal::setTime, time="<<time.toString()<<endl;
+kdDebug()<<"KOEditorGeneralJournal::setTime, time="<<TQString(time.toString())<<endl;
bool validTime = time.isValid();
mTimeCheckBox->setChecked( validTime );
mTimeEdit->setEnabled( validTime );
@@ -142,7 +142,7 @@ void KOEditorGeneralJournal::readJournal( Journal *journal, const TQDate &, bool
if ( !tmpl ) {
setDate( journal->dtStart().date() );
if ( !journal->doesFloat() ) {
-kdDebug()<<"KOEditorGeneralJournal::readJournal, does not float, time="<<(journal->dtStart().time().toString())<<endl;
+kdDebug()<<"KOEditorGeneralJournal::readJournal, does not float, time="<<TQString(journal->dtStart().time().toString())<<endl;
setTime( journal->dtStart().time() );
} else {
kdDebug()<<"KOEditorGeneralJournal::readJournal, does float"<<endl;
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
if (!mDateEdit->date().isValid()) {
KMessageBox::sorry( 0,
i18n("Please specify a valid date, for example '%1'.")
- .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+ .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
return false;
}
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 93caec36f..d5856dd63 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -96,7 +96,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout)
kdDebug(5850) << k_funcinfo << endl;
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
i18n("Date && Time"),tqparent);
timeLayout->addWidget(timeGroupBox);
@@ -206,7 +206,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLa
i18n( "Use this combobox to set the completion percentage of the to-do." ) );
for ( int i = 0; i <= 100; i+=10 ) {
// xgettext:no-c-format
- TQString label = i18n( "Percent complete", "%1 %" ).arg( i );
+ TQString label = i18n( "Percent complete", "%1 %" ).tqarg( i );
mCompletedCombo->insertItem( label );
}
connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
@@ -569,18 +569,18 @@ void KOEditorGeneralTodo::dateChanged()
TQString dateTimeStr = "";
if ( mStartCheck->isChecked() ) {
- dateTimeStr += i18n("Start: %1").arg(
+ dateTimeStr += i18n("Start: %1").tqarg(
l->formatDate( mStartDateEdit->date() ) );
if ( mTimeButton->isChecked() )
- dateTimeStr += TQString(" %1").arg(
+ dateTimeStr += TQString(" %1").tqarg(
l->formatTime( mStartTimeEdit->getTime() ) );
}
if ( mDueCheck->isChecked() ) {
- dateTimeStr += i18n(" Due: %1").arg(
+ dateTimeStr += i18n(" Due: %1").tqarg(
l->formatDate( mDueDateEdit->date() ) );
if ( mTimeButton->isChecked() )
- dateTimeStr += TQString(" %1").arg(
+ dateTimeStr += TQString(" %1").tqarg(
l->formatTime( mDueTimeEdit->getTime() ) );
}
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 834ea1ce2..21deaeed6 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -578,7 +578,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *tqparent, const char *name ) :
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- TQGroupBox *groupBox = new TQGroupBox( 1, Horizontal, i18n("E&xceptions"),
+ TQGroupBox *groupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("E&xceptions"),
this );
topLayout->addWidget( groupBox );
@@ -632,7 +632,7 @@ void ExceptionsWidget::addException()
{
TQDate date = mExceptionDateEdit->date();
TQString dateStr = KGlobal::locale()->formatDate( date );
- if( !mExceptionList->findItem( dateStr ) ) {
+ if( !mExceptionList->tqfindItem( dateStr ) ) {
mExceptionDates.append( date );
mExceptionList->insertItem( dateStr );
}
@@ -700,7 +700,7 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *tqparent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mRangeGroupBox = new TQGroupBox( 1, Horizontal, i18n("Recurrence Range"),
+ mRangeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
this );
TQWhatsThis::add( mRangeGroupBox,
i18n("Sets a range for which these recurrence rules will "
@@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start,
const TQDateTime & )
{
mStartDateLabel->setText( i18n("Begins on: %1")
- .arg( KGlobal::locale()->formatDate( start.date() ) ) );
+ .tqarg( KGlobal::locale()->formatDate( start.date() ) ) );
}
///////////////////////// RecurrenceRangeDialog ///////////////////////////
@@ -891,7 +891,7 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *tqparent, const char *name ) :
} else {
mTypeCombo = 0;
- TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Horizontal, this );
+ TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, this );
ruleButtonGroup->setFrameStyle( TQFrame::NoFrame );
topLayout->addWidget( ruleButtonGroup );
@@ -980,7 +980,7 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) :
topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 );
- mTimeGroupBox = new TQGroupBox( 1, Horizontal, i18n("Appointment Time "),
+ mTimeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Appointment Time "),
this );
TQWhatsThis::add( mTimeGroupBox,
i18n("Displays appointment time information.") );
@@ -999,8 +999,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) :
// tqlayoutTimeFrame->addWidget( mDateTimeLabel );
Qt::Orientation orientation;
- if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal;
- else orientation = Vertical;
+ if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal;
+ else orientation = Qt::Vertical;
mRuleBox = new TQGroupBox( 1, orientation, i18n("Recurrence Rule"), this );
TQWhatsThis::add( mRuleBox,
@@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput()
mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) {
KMessageBox::sorry( 0,
i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.")
- .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
- .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
+ .tqarg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
+ .tqarg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
return false;
}
int recurrenceType = mRecurrenceChooser->type();
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 3373778a4..73857fd64 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -116,7 +116,7 @@ void KOEventEditor::reload()
void KOEventEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralEvent( this );
+ mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) );
if( KOPrefs::instance()->mCompactDialogs ) {
TQFrame *topFrame = addPage(i18n("General"));
@@ -285,7 +285,7 @@ bool KOEventEditor::processInput()
// add dummy event at the position of the counter proposal
Event *event = mEvent->clone();
event->clearAttendees();
- event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) );
+ event->setSummary( i18n("My counter proposal for: %1").tqarg( mEvent->summary() ) );
mChanger->addIncidence( event, mResource, mSubResource, this );
} else {
if ( mRecurIncidence && mRecurIncidenceAfterDissoc ) {
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 8cd16faad..391ad42ac 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -62,7 +62,7 @@ void KOEventViewer::message( const TQString &link )
if ( link.startsWith( "kmail:" ) ) {
ttStr = i18n( "Open the message in KMail" );
} else if ( link.startsWith( "mailto:" ) ) {
- ttStr = i18n( "Send an email message to %1" ).arg( link.mid( 7 ) );
+ ttStr = i18n( "Send an email message to %1" ).tqarg( link.mid( 7 ) );
} else if ( link.startsWith( "uid:" ) ) {
ttStr = i18n( "Lookup the contact in KAddressbook" );
} else if ( link.startsWith( "ATTACH:" ) ) {
@@ -70,7 +70,7 @@ void KOEventViewer::message( const TQString &link )
tmp.remove( TQRegExp( "^ATTACH://" ) );
TQString uid = tmp.section( ':', 0, 0 );
TQString name = tmp.section( ':', -1, -1 );
- ttStr = i18n( "View attachment \"%1\"" ).arg( name );
+ ttStr = i18n( "View attachment \"%1\"" ).tqarg( name );
mAttachLink = link;
} else { // no special URI, let KDE handle it
ttStr = i18n( "Launch a viewer on the link" );
@@ -85,7 +85,7 @@ void KOEventViewer::readSettings( KConfig * config )
// With each restart of KOrganizer the font site gets halfed. What should this
// be good for?
#if 0
- config->setGroup( TQString("EventViewer-%1").arg( name() ) );
+ config->setGroup( TQString("EventViewer-%1").tqarg( name() ) );
int zoomFactor = config->readNumEntry("ZoomFactor", pointSize() );
zoomTo( zoomFactor/2 );
kdDebug(5850) << " KOEventViewer: restoring the pointSize: "<< pointSize()
@@ -98,7 +98,7 @@ void KOEventViewer::writeSettings( KConfig * config )
{
if ( config ) {
kdDebug(5850) << " KOEventViewer: saving the zoomFactor: "<< pointSize() << endl;
- config->setGroup( TQString("EventViewer-%1").arg( name() ) );
+ config->setGroup( TQString("EventViewer-%1").tqarg( name() ) );
config->writeEntry("ZoomFactor", pointSize() );
}
}
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 5bf8d8fb4..e5e174e48 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -163,7 +163,7 @@ void KOGroupware::incomingDirChanged( const TQString& path )
if ( !message ) {
TQString errorMessage;
if (mFormat.exception())
- errorMessage = i18n( "Error message: %1" ).arg( mFormat.exception()->message() );
+ errorMessage = i18n( "Error message: %1" ).tqarg( mFormat.exception()->message() );
kdDebug(5850) << "MailScheduler::retrieveTransactions() Error parsing "
<< errorMessage << endl;
KMessageBox::detailedError( mView,
@@ -401,7 +401,7 @@ void KOGroupware::sendCounterProposal(KCal::Calendar *calendar, KCal::Event * ol
return;
if ( KOPrefs::instance()->outlookCompatCounterProposals() ) {
Incidence* tmp = oldEvent->clone();
- tmp->setSummary( i18n("Counter proposal: %1").arg( newEvent->summary() ) );
+ tmp->setSummary( i18n("Counter proposal: %1").tqarg( newEvent->summary() ) );
tmp->setDescription( newEvent->description() );
tmp->addComment( i18n("Proposed new meeting time: %1 - %2").
arg( IncidenceFormatter::dateToString( newEvent->dtStart() ),
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9047cff95..9d321221c 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -172,12 +172,12 @@ void KOIncidenceEditor::slotLoadTemplate( const TQString& templateName )
if ( fileName.isEmpty() ) {
KMessageBox::error( this, i18n("Unable to find template '%1'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
} else {
ICalFormat format;
if ( !format.load( &cal, fileName ) ) {
KMessageBox::error( this, i18n("Error loading template file '%1'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return;
}
}
@@ -196,7 +196,7 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type )
TQStringList list = KGlobal::dirs()->findAllResources( "data",
"korganizer/designer/" + type + "/*.ui", true, true );
for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
- const TQString &fn = (*it).mid( (*it).findRev('/') + 1 );
+ const TQString &fn = (*it).mid( (*it).tqfindRev('/') + 1 );
if ( activePages.tqfind( fn ) != activePages.end() ) {
addDesignerTab( *it );
}
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 973550d65..ce75b6543 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( TQt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) );
mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) );
- mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::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( TQt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::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( TQt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::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( TQt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) );
return true;
}
@@ -232,15 +232,15 @@ KOListView::KOListView( Calendar *calendar,
TQT_SLOT(hideDates()));
*/
- TQObject::connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- TQObject::connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
+ connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- TQObject::connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *,
+ connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *,
const TQPoint &,
int ) ),
TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
- TQObject::connect( mListView, TQT_SIGNAL( selectionChanged() ),
+ connect( mListView, TQT_SIGNAL( selectionChanged() ),
TQT_SLOT( processSelectionChange() ) );
// setMinimumSize(100,100);
@@ -502,6 +502,6 @@ void KOListView::clear()
TQSize KOListView::tqsizeHint() const
{
const TQSize s = KOEventView::tqsizeHint();
- return TQSize( s.width() + style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
+ return TQSize( s.width() + tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
s.height() );
}
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ad03aec43..5ed6664f0 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e )
{
TQListBox::mousePressEvent( e );
- if ( e->button() == RightButton ) {
+ if ( e->button() == Qt::RightButton ) {
emit rightClick();
}
}
@@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date )
TQString text;
if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) {
text = i18n("'Month day' for month view cells", "%1 %2")
- .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
- .arg( KOGlobals::self()->calendarSystem()->day(mDate) );
+ .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
+ .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) );
TQFontMetrics fm( mLabel->font() );
mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) );
} else {
@@ -546,7 +546,7 @@ class MonthViewCell::CreateItemVisitor :
TQDateTime dt( mDate );
// take the time 0:00 into account, which is non-inclusive
TQDate dtEnd = event->dtEnd().addSecs( event->doesFloat() ? 0 : -1).date();
- int length = event->dtStart().daysTo( dtEnd );
+ int length = event->dtStart().daysTo( TQDateTime(dtEnd) );
if ( event->isMultiDay() ) {
if ( mDate == event->dtStart().date()
|| ( mMultiDay == 0 && event->recursOn( mDate ) ) ) {
@@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & )
mStartDate = mStartDate.addDays( -weekdayCol );
mLabel->setText( i18n( "monthname year", "%1 %2" )
- .arg( calSys->monthName( start ) )
- .arg( calSys->year( start ) ) );
+ .tqarg( calSys->monthName( start ) )
+ .tqarg( calSys->year( start ) ) );
showLabel( !KOPrefs::instance()->fullViewMonth() );
@@ -1087,7 +1087,7 @@ void KOMonthView::changeIncidenceDisplayAdded( Incidence *incidence, MonthViewCe
if ( incidence->recursOn( mCells[i]->date(), calendar() ) ) {
// handle multiday events
- int length = gdv.startDate().daysTo( gdv.endDate().addSecs( floats ? 0 : -1 ).date() );
+ int length = gdv.startDate().daysTo( TQDateTime(gdv.endDate().addSecs( floats ? 0 : -1 ).date()) );
for ( int j = 0; j <= length && i+j < mCells.count(); ++j ) {
mCells[i+j]->addIncidence( incidence, v, j );
}
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 66dd686df..dc52c312c 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -300,7 +300,7 @@ TQColor* KOPrefs::resourceColor( const TQString &cal )
defColor = TQColor( defaultResourceColors()[defaultResourceColorSeed()-1] );
} else {
int h, s, v;
- defColor.getHsv( h, s, v );
+ defColor.getHsv( &h, &s, &v );
h = ( defaultResourceColorSeed() % 12 ) * 30;
s -= s * ( (defaultResourceColorSeed() / 12) % 2 ) * 0.5;
defColor.setHsv( h, s, v );
@@ -364,7 +364,7 @@ TQStringList KOPrefs::fullEmails()
{
TQStringList fullEmails;
// The user name and email from the config dialog:
- fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( email() );
+ fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( email() );
TQStringList::Iterator it;
// Grab emails from the email identities
@@ -377,7 +377,7 @@ TQStringList KOPrefs::fullEmails()
// Add emails configured in korganizer
lst = mAdditionalMails;
for ( it = lst.begin(); it != lst.end(); ++it ) {
- fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it );
+ fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( *it );
}
// Add emails from the user's kaddressbook entry
KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index d074ae91d..d454cdfef 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -100,7 +100,7 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *tqparent, const char *name )
addWidString( KOPrefs::instance()->userNameItem(), mUserEmailSettings );
addWidString( KOPrefs::instance()->userEmailItem(), mUserEmailSettings );
- TQGroupBox *saveGroup = new TQGroupBox(1,Horizontal,i18n("Saving Calendar"),
+ TQGroupBox *saveGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Saving Calendar"),
topFrame);
addWidBool( KOPrefs::instance()->htmlWithSaveItem(), saveGroup );
@@ -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, Horizontal,
+ TQGroupBox *remindersGroupBox = new TQGroupBox( 1, Qt::Horizontal,
i18n( "Reminders" ),
topFrame );
topLayout->addMultiCellWidget( remindersGroupBox, 5, 5, 0, 1 );
@@ -367,7 +367,7 @@ class KOPrefsDialogTime : public KPrefsModule
connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ),
TQT_SLOT( slotWidChanged() ) );
- TQGroupBox *workingHoursGroup = new TQGroupBox(1,Horizontal,
+ TQGroupBox *workingHoursGroup = new TQGroupBox(1,Qt::Horizontal,
i18n("Working Hours"),
topFrame);
topLayout->addMultiCellWidget( workingHoursGroup, 7, 7, 0, 1 );
@@ -454,7 +454,7 @@ class KOPrefsDialogTime : public KPrefsModule
const TQStringList *tags = 0 )
{
if (tags) {
- int i = tags->findIndex(text);
+ int i = tags->tqfindIndex(text);
if (i > 0) combo->setCurrentItem(i);
} else {
for(int i=0;i<combo->count();++i) {
@@ -510,7 +510,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( showTodosAgenda->checkBox() );
/*** Date Navigator Group ***/
- TQGroupBox *dateNavGroup = new TQGroupBox( 1, Horizontal,
+ TQGroupBox *dateNavGroup = new TQGroupBox( 1, Qt::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, Horizontal,
+ TQGroupBox *agendaGroup = new TQGroupBox( 1, Qt::Horizontal,
i18n("Agenda View"),
topFrame );
@@ -554,7 +554,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( agendaGroup );
/*** Month View Group ***/
- TQGroupBox *monthGroup = new TQGroupBox( 1, Horizontal,
+ TQGroupBox *monthGroup = new TQGroupBox( 1, Qt::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, Horizontal,
+ TQGroupBox *todoGroup = new TQGroupBox( 1, Qt::Horizontal,
i18n("To-do View"),
topFrame );
addWidBool( KOPrefs::instance()->fullViewTodoItem(), todoGroup );
@@ -700,7 +700,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *tqparent, const char *name )
topLayout->addWidget( unsetCategoryColor->button(), 6, 1 );
// categories colors
- TQGroupBox *categoryGroup = new TQGroupBox(1,Horizontal,i18n("Categories"),
+ TQGroupBox *categoryGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Categories"),
topFrame);
topLayout->addMultiCellWidget(categoryGroup,7,7,0,1);
@@ -721,7 +721,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *tqparent, const char *name )
updateCategoryColor();
// resources colors
- TQGroupBox *resourceGroup = new TQGroupBox(1,Horizontal,i18n("Resources"),
+ TQGroupBox *resourceGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Resources"),
topFrame);
topLayout->addMultiCellWidget(resourceGroup,8,8,0,1);
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index e095950a4..1a6c4dbee 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *tqparent,
TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox );
topLayout->addWidget( label );
- mSplitter = new TQSplitter( TQt::Vertical, topBox );
+ mSplitter = new TQSplitter( Qt::Vertical, topBox );
mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
topLayout->addWidget( mSplitter );
@@ -506,7 +506,7 @@ void AlarmDialog::eventNotification()
// FIXME: Add a message box asking whether the procedure should really be executed
kdDebug(5890) << "Starting program: '" << alarm->programFile() << "'" << endl;
KProcess proc;
- proc << TQFile::encodeName(alarm->programFile());
+ proc << TQFile::encodeName(alarm->programFile()).data();
proc.start(KProcess::DontCare);
}
else if (alarm->type() == Alarm::Audio) {
@@ -566,7 +566,7 @@ void AlarmDialog::slotSave()
if ( !incidence ) {
continue;
}
- config->setGroup( TQString("Incidence-%1").arg(numReminders + 1) );
+ config->setGroup( TQString("Incidence-%1").tqarg(numReminders + 1) );
config->writeEntry( "UID", incidence->uid() );
config->writeEntry( "RemindAt", item->mRemindAt );
++numReminders;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 27badddbb..85673ef03 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -177,7 +177,7 @@ void AlarmDockWindow::enableAutostart( bool enable )
void AlarmDockWindow::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == LeftButton ) {
+ if ( e->button() == Qt::LeftButton ) {
kapp->startServiceByDesktopName( "korganizer", TQString() );
} else {
KSystemTray::mousePressEvent( e );
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index c1254f12c..f0837c65d 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -71,7 +71,7 @@ KOAlarmClient::KOAlarmClient( TQObject *tqparent, const char *name )
config->setGroup( "General" );
int numReminders = config->readNumEntry( "Reminders", 0 );
for ( int i = 1; i <= numReminders; ++i ) {
- TQString group( TQString( "Incidence-%1" ).arg( i ) );
+ TQString group( TQString( "Incidence-%1" ).tqarg( i ) );
config->setGroup( group );
TQString uid = config->readEntry( "UID" );
TQDateTime dt = config->readDateTimeEntry( "RemindAt" );
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 96a458200..eb6552ebd 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, this, this, false );
- (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" );
+ mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false );
+ (void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" );
}
KOrganizer::~KOrganizer()
@@ -209,8 +209,8 @@ void KOrganizer::initActions()
createStandardStatusBarAction();
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection());
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection());
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
setAutoSaveSettings();
createGUI( 0 );
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 064c4f12a..f933d47fe 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -81,7 +81,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
- canvas->setFocusPolicy( TQWidget::ClickFocus );
+ canvas->setFocusPolicy( Qt::ClickFocus );
setWidget( canvas );
mView = new CalendarView( canvas );
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index f996321ea..cbf15d28d 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -94,7 +94,7 @@ void KOTodoEditor::reload()
void KOTodoEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralTodo(this);
+ mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this));
if (KOPrefs::instance()->mCompactDialogs) {
TQFrame *topFrame = addPage(i18n("General"));
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 475a2f636..bb4b2ba4f 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()==TQt::LeftButton) {
+ if (e->button()==Qt::LeftButton) {
mPressPos = e->pos();
mMousePressed = true;
}
@@ -1065,7 +1065,7 @@ void KOTodoView::itemStateChanged( TQListViewItem *item )
void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage )
{
- mPercentChangedMap.append( qMakePair( item, percentage ) );
+ mPercentChangedMap.append( tqMakePair( item, percentage ) );
TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) );
}
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 02369d91a..47aeb02b0 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -168,7 +168,7 @@ void KOTodoViewItem::construct()
// Find sort id in description. It's the text behind the last '#' character
// found in the description. White spaces are removed from beginning and end
// of sort id.
- int pos = mTodo->description().findRev('#');
+ int pos = mTodo->description().tqfindRev('#');
if (pos < 0) {
setText( KOTodoView::eDescriptionColumn, "" );
} else {
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4f3b3dc2d..4f7c52fea 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -106,8 +106,8 @@ void KOWhatsNextView::updateView()
mText += KGlobal::locale()->formatDate( mStartDate );
} else {
mText += i18n("Date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDate( mStartDate ) )
- .arg( KGlobal::locale()->formatDate( mEndDate ) );
+ .tqarg( KGlobal::locale()->formatDate( mStartDate ) )
+ .tqarg( KGlobal::locale()->formatDate( mEndDate ) );
}
mText+="</h2>\n";
@@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
if ( starttime.date().daysTo( endtime.date() ) >= 1 ) {
mText += i18n("date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDateTime( starttime ) )
- .arg( KGlobal::locale()->formatDateTime( endtime ) );
+ .tqarg( KGlobal::locale()->formatDateTime( starttime ) )
+ .tqarg( KGlobal::locale()->formatDateTime( endtime ) );
} else {
/*if (reply) */
mText += i18n("date, from - to", "%1, %2 - %3")
- .arg( KGlobal::locale()->formatDate( starttime.date(), true ) )
- .arg( KGlobal::locale()->formatTime( starttime.time() ) )
- .arg( KGlobal::locale()->formatTime( endtime.time() ) );
+ .tqarg( KGlobal::locale()->formatDate( starttime.date(), true ) )
+ .tqarg( KGlobal::locale()->formatTime( starttime.time() ) )
+ .tqarg( KGlobal::locale()->formatTime( endtime.time() ) );
}
}
// }
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index 5176ca22a..b7b5ba69d 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -86,7 +86,7 @@ bool MailScheduler::performTransaction( IncidenceBase *incidence,
TQString subject;
Incidence *inc = dynamic_cast<Incidence*>( incidence );
if ( inc && method == Counter )
- subject = i18n( "Counter proposal: %1" ).arg( inc->summary() );
+ subject = i18n( "Counter proposal: %1" ).tqarg( inc->summary() );
status = mailer.mailOrganizer( incidence, messageText, subject );
}
return status;
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index d613941c4..4b7da9e26 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( TQt::Vertical, topSideBox );
+ mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
label->tqsetAlignment( 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( TQt::Vertical, topSideBox );
+ mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
new TQWidget( mRightSplitter );
sideBox = new TQVBox( mRightSplitter );
eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
- mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
+ mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
@@ -464,12 +464,12 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize())
|| event->type() == TQEvent::MouseButtonRelease ) {
FOREACH_VIEW( agenda ) {
- if ( agenda->splitter() == obj->tqparent() )
+ if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->tqparent()) )
mLastMovedSplitter = agenda->splitter();
}
- if ( mLeftSplitter == obj->tqparent() )
+ if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->tqparent()) )
mLastMovedSplitter = mLeftSplitter;
- else if ( mRightSplitter == obj->tqparent() )
+ else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->tqparent()) )
mLastMovedSplitter = mRightSplitter;
TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
}
@@ -522,7 +522,7 @@ void MultiAgendaView::resizeSpacers( int newY )
void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
{
- if ( ori == TQt::Vertical ) {
+ if ( ori == Qt::Vertical ) {
if ( delta > 0 ) {
if ( KOPrefs::instance()->mHourSize > 4 )
KOPrefs::instance()->mHourSize--;
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index b22b3f709..342d6bb49 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -174,8 +174,8 @@ void NavigatorBar::selectDates( const KCal::DateList &dateList )
mHasMinWidth = true;
// set the label text at the top of the navigator
- mMonth->setText( i18n( "monthname", "%1" ).arg( calSys->monthName( mDate ) ) );
- mYear->setText( i18n( "4 digit year", "%1" ).arg( calSys->yearString( mDate, false ) ) );
+ mMonth->setText( i18n( "monthname", "%1" ).tqarg( calSys->monthName( mDate ) ) );
+ mYear->setText( i18n( "4 digit year", "%1" ).tqarg( calSys->yearString( mDate, false ) ) );
}
}
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index a8c8fbd98..32fc953e7 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -56,8 +56,8 @@ TQString Datenums::shortText(const TQDate &date)
return TQString::number( KOGlobals::self()->calendarSystem()->daysInYear(date) - doy );
break;
case 2: // both day of year and days till end of year
- return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").arg( doy )
- .arg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
+ return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").tqarg( doy )
+ .tqarg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
break;
case 0: // only day of year
default:
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index ce0d96966..240e9a3f7 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -81,8 +81,8 @@ TQString Hebrew::shortText(const TQDate & date)
hebrew_day_number, hebrew_year);
KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew");
- label_text = TQString("%1 %2").arg(cal->dayString(date, false))
- .arg(cal->monthName(date));
+ label_text = TQString("%1 %2").tqarg(cal->dayString(date, false))
+ .tqarg(cal->monthName(date));
if (holidays.count())
{
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 0c124bbeb..5c36772fb 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -177,8 +177,8 @@ void CalPrintYear::print( TQPainter &p, int width, int height )
title = i18n("date from -\nto", "%1 -\n%2");
}
drawHeader( p, title
- .arg( locale->formatDate( start ) )
- .arg( locale->formatDate( end ) ),
+ .tqarg( locale->formatDate( start ) )
+ .tqarg( locale->formatDate( end ) ),
calsys->addMonths( start, -1), calsys->addMonths( start, monthsPerPage ),
headerBox );
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index c5f69dd09..6fe3a5e39 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
useoffset = offset / (24*60);
- offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
} else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
useoffset = offset / 60;
- offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
} else {
useoffset = offset;
- offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
}
alarmStrings << offsetstr;
}
@@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
datesString = "";
if ( (*rit)->dtStart().isValid() ) {
datesString += i18n(
- "Start Date: %1\n").arg(
+ "Start Date: %1\n").tqarg(
KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
datesString += i18n(
- "Start Time: %1\n").arg(
+ "Start Time: %1\n").tqarg(
KGlobal::locale()->formatTime((*rit)->dtStart().time(),
false, false) );
}
}
if ( (*rit)->dtEnd().isValid() ) {
subitemString += i18n(
- "Due Date: %1\n").arg(
+ "Due Date: %1\n").tqarg(
KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
subitemString += i18n(
- "subitem due time", "Due Time: %1\n").arg(
+ "subitem due time", "Due Time: %1\n").tqarg(
KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
false, false) );
}
@@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
subitemString += "\n";
}
subitemString += i18n( "subitem tqStatus: statusString",
- "tqStatus: %1\n").arg( statusString );
+ "tqStatus: %1\n").tqarg( statusString );
subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
subitemString += i18n( "subitem Priority: N",
- "Priority: %1\n").arg( (*rit)->priority() );
+ "Priority: %1\n").tqarg( (*rit)->priority() );
subitemString += i18n( "subitem Secrecy: secrecyString",
- "Secrecy: %1\n").arg( (*rit)->secrecyStr() );
+ "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() );
subitemString += "\n";
}
drawBoxWithCaption( p, notesBox, i18n("Subitems:"),
@@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
"'Name (Role): tqStatus', e.g. 'Reinhold Kainhofer "
"<reinhold@kainhofer.com> (Participant): Awaiting Response'",
"%1 (%2): %3")
- .arg( (*ait)->fullName() )
- .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() );
+ .tqarg( (*ait)->fullName() )
+ .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() );
}
drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString,
/*sameLine=*/false, /*expand=*/false, captionFont, textFont );
@@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( mShowOptions ) {
TQString optionsString;
if ( !(*it)->statusStr().isEmpty() ) {
- optionsString += i18n("tqStatus: %1").arg( (*it)->statusStr() );
+ optionsString += i18n("tqStatus: %1").tqarg( (*it)->statusStr() );
optionsString += "\n";
}
if ( !(*it)->secrecyStr().isEmpty() ) {
- optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() );
+ optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() );
optionsString += "\n";
}
if ( (*it)->type() == "Event" ) {
@@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
} else {
title = i18n("date from-\nto", "%1 -\n%2");;
}
- title = title.arg( line1 ).arg( line2 );
+ title = title.tqarg( line1 ).tqarg( line2 );
drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox );
drawWeek( p, curWeek, weekBox );
@@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
} else {
title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)");
}
- title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() );
+ title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() );
drawHeader( p, title, curWeek, TQDate(), headerBox );
TQRect weekBox( headerBox );
@@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height )
do {
TQString title( i18n("monthname year", "%1 %2") );
- title = title.arg( calSys->monthName( curMonth ) )
- .arg( curMonth.year() );
+ title = title.tqarg( calSys->monthName( curMonth ) )
+ .tqarg( curMonth.year() );
TQDate tmp( fromMonth );
int weekdayCol = weekdayColumn( tmp.dayOfWeek() );
tmp = tmp.addDays( -weekdayCol );
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 0b2c098cf..54aacd18c 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( TQSplitter::Horizontal );
+ splitter->setOrientation( Qt::Horizontal );
mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
// use the minimal width possible = max width of the radio buttons, not extensible
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 3d330efe0..3df996528 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -560,7 +560,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
TQFontMetrics fm( p.font() );
TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
- i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
+ i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) );
p.setFont( oldfont );
return footbox.bottom();
@@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
if ( fullDate && mCalSys ) {
dayNumStr = i18n("weekday month date", "%1 %2 %3")
- .arg( mCalSys->weekDayName( qd ) )
- .arg( mCalSys->monthName( qd ) )
- .arg( qd.day() );
+ .tqarg( mCalSys->weekDayName( qd ) )
+ .tqarg( mCalSys->monthName( qd ) )
+ .tqarg( qd.day() );
// dayNumStr = local->formatDate(qd);
} else {
dayNumStr = TQString::number( qd.day() );
@@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
TQString str;
if ( !currEvent->location().isEmpty() ) {
str = i18n( "summary, location", "%1, %2" ).
- arg( currEvent->summary() ).arg( currEvent->location() );
+ tqarg( currEvent->summary() ).tqarg( currEvent->location() );
} else {
str = currEvent->summary();
}
@@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
TQString summaryStr;
if ( !todo->location().isEmpty() ) {
summaryStr = i18n( "summary, location", "%1, %2" ).
- arg( todo->summary() ).arg( todo->location() );
+ tqarg( todo->summary() ).tqarg( todo->location() );
} else {
summaryStr = todo->summary();
}
@@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
} else {
str = summaryStr;
}
- drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY );
+ drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY );
}
}
@@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
}
//now, write the percentage
- outStr = i18n( "%1%" ).arg( todo->percentComplete() );
+ outStr = i18n( "%1%" ).tqarg( todo->percentComplete() );
rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1,
TQt::AlignTop | TQt::AlignLeft, outStr );
p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
@@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin
{
if ( text.isEmpty() ) return;
- TQString entry( field.arg( text ) );
+ TQString entry( field.tqarg( text ) );
TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) );
if ( rect.bottom() > pageHeight) {
@@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
headerText = dateText;
} else {
headerText = i18n("Description - date", "%1 - %2")
- .arg( journal->summary() )
- .arg( dateText );
+ .tqarg( journal->summary() )
+ .tqarg( dateText );
}
TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) );
@@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
if ( mCalSys ) {
if ( fd.month() == td.month() ) {
title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3")
- .arg( mCalSys->monthName( fd.month(), false ) )
- .arg( mCalSys->dayString( fd, false ) )
- .arg( mCalSys->dayString( td, false ) );
+ .tqarg( mCalSys->monthName( fd.month(), false ) )
+ .tqarg( mCalSys->dayString( fd, false ) )
+ .tqarg( mCalSys->dayString( td, false ) );
} else {
title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4")
- .arg( mCalSys->monthName( fd.month(), false ) )
- .arg( mCalSys->dayString( fd, false ) )
- .arg( mCalSys->monthName( td.month(), false ) )
- .arg( mCalSys->dayString( td, false ) );
+ .tqarg( mCalSys->monthName( fd.month(), false ) )
+ .tqarg( mCalSys->dayString( fd, false ) )
+ .tqarg( mCalSys->monthName( td.month(), false ) )
+ .tqarg( mCalSys->dayString( td, false ) );
}
}
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 7b00a4611..cc6a8af9b 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -70,12 +70,12 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
TQString label;
if ( (int)reply > 1 ) {
if( resource && !resource->resourceName().isEmpty() ) {
- label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() );
+ label = i18n( "My %1 (%2)" ).tqarg( subRes, resource->resourceName() );
} else {
- label = i18n( "My %1" ).arg( subRes );
+ label = i18n( "My %1" ).tqarg( subRes );
}
} else {
- label = i18n( "My %1" ).arg( subRes );
+ label = i18n( "My %1" ).tqarg( subRes );
}
return label;
}
@@ -376,7 +376,7 @@ void ResourceView::addResource()
if ( !item->resource()->addSubresource( folderName, tqparentId ) ) {
KMessageBox::error(
this,
- i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) );
+ i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) );
}
return;
}
@@ -391,14 +391,14 @@ void ResourceView::addResource()
return;
}
- TQString type = types[ descs.findIndex( desc ) ];
+ TQString type = types[ descs.tqfindIndex( desc ) ];
// Create new resource
ResourceCalendar *resource = manager->createResource( type );
if( !resource ) {
KMessageBox::error(
this,
- i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).arg( type ) );
+ i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).tqarg( type ) );
return;
}
@@ -414,7 +414,7 @@ void ResourceView::addResource()
if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) {
// ### There is a resourceLoadError() signal declared in ResourceCalendar
// but no subclass seems to make use of it. We could do better.
- KMessageBox::error( this, i18n("Unable to create the resource.").arg( type ) );
+ KMessageBox::error( this, i18n("Unable to create the resource.").tqarg( type ) );
success = false;
}
}
@@ -477,7 +477,7 @@ void ResourceView::slotSubresourceAdded( ResourceCalendar *resource,
{
Q_UNUSED( type );
- TQListViewItem *lvitem = mListView->findItem( resource->resourceName(), 0 );
+ TQListViewItem *lvitem = mListView->tqfindItem( resource->resourceName(), 0 );
if ( !lvitem )
// Not found
return;
@@ -573,7 +573,7 @@ void ResourceView::removeResource()
i18n ("<qt>Failed to remove the subresource <b>%1</b>. The "
"reason could be that it is a built-in one which cannot "
"be removed, or that the removal of the underlying storage "
- "folder failed.</qt>").arg( item->resource()->name() ) );
+ "folder failed.</qt>").tqarg( item->resource()->name() ) );
return;
} else {
mCalendar->resourceManager()->remove( item->resource() );
@@ -632,7 +632,7 @@ void ResourceView::editResource()
} else {
KMessageBox::sorry(
this,
- i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").arg( item->resource()->name() ) );
+ i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").tqarg( item->resource()->name() ) );
}
} else {
KRES::ConfigDialog dlg( this, TQString("calendar"), resource, "KRES::ConfigDialog" );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 8b79bda1c..03079cc90 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -76,7 +76,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *tqparent)
mTodosCheck->setChecked( true );
// Date range
- TQGroupBox *rangeGroup = new TQGroupBox( 1, Horizontal, i18n( "Date Range" ),
+ TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ),
topFrame );
tqlayout->addWidget( rangeGroup );
@@ -197,9 +197,9 @@ void SearchDialog::search( const TQRegExp &re )
for (it=alltodos.begin(); it!=alltodos.end(); ++it) {
todo = *it;
if ( (!todo->hasStartDate() && !todo->hasDueDate() ) || // undated
- ( todo->hasStartDate() && (todo->dtStart()>=startDt) && (todo->dtStart()<=endDt) ) || // start dt in range
- ( todo->hasDueDate() && (todo->dtDue().date()>=startDt) && (todo->dtDue()<=endDt) ) || // due dt in range
- ( todo->hasCompletedDate() && (todo->completed().date()>=startDt) && (todo->completed()<=endDt) ) ) { // completed dt in range
+ ( todo->hasStartDate() && (todo->dtStart()>=TQDateTime(startDt)) && (todo->dtStart()<=TQDateTime(endDt)) ) || // start dt in range
+ ( todo->hasDueDate() && (todo->dtDue().date()>=startDt) && (todo->dtDue()<=TQDateTime(endDt)) ) || // due dt in range
+ ( todo->hasCompletedDate() && (todo->completed().date()>=startDt) && (todo->completed()<=TQDateTime(endDt)) ) ) { // completed dt in range
todos.append( todo );
}
}