diff options
Diffstat (limited to 'conduits/vcalconduit/vcal-conduitbase.cc')
| -rw-r--r-- | conduits/vcalconduit/vcal-conduitbase.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index 33ae4f1..19b6790 100644 --- a/conduits/vcalconduit/vcal-conduitbase.cc +++ b/conduits/vcalconduit/vcal-conduitbase.cc @@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p ) << fCalendar->isLocalTime() << endl; emit logMessage( fCalendar->isLocalTime() ? - i18n( "Using local time zone: %1" ).tqarg( tz ) : - i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); + i18n( "Using local time zone: %1" ).arg( tz ) : + i18n( "Using non-local time zone: %1" ).arg( tz ) ); KURL kurl( config()->calendarFile() ); if( !KIO::NetAccess::download( config()->calendarFile(), @@ -298,7 +298,7 @@ static void listResources( KCal::CalendarResources *p ) emit logError(i18n( "You chose to sync with the file \"%1\", which " "cannot be opened. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit." ).tqarg( config()->calendarFile() ) ); + "Aborting the conduit." ).arg( config()->calendarFile() ) ); KIO::NetAccess::removeTempFile( fCalendarFile ); return false; } @@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p ) emit logError( i18n( "You chose to sync with the file \"%1\", which " "cannot be opened or created. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit." ).tqarg( config()->calendarFile() ) ); + "Aborting the conduit." ).arg( config()->calendarFile() ) ); return false; } fl.close(); setFirstSync( true ); } addSyncLogEntry( i18n( "Syncing with file \"%1\"" ) - .tqarg( config()->calendarFile() ) ); + .arg( config()->calendarFile() ) ); break; } @@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p ) #endif addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) ); emit logMessage( fCalendar->isLocalTime() ? - i18n( "Using local time zone: %1" ).tqarg( tz ) : - i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); + i18n( "Using local time zone: %1" ).arg( tz ) : + i18n( "Using non-local time zone: %1" ).arg( tz ) ); break; default: break; @@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) if ( e && de ) { // TODO: check for conflict, and if there is one, ask for resolution - if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE ) + if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE ) && r->isModified() ) { // TODO: I have not yet found a way to complete ignore an item @@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); fLocalDatabase->writeRecord( r ); } else @@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, return; } - if ( e->synctqStatus() == KCal::Incidence::SYNCDEL ) + if ( e->syncStatus() == KCal::Incidence::SYNCDEL ) { DEBUGKPILOT << fname << ": don't write deleted incidence " << e->summary() << " to the palm" << endl; @@ -573,8 +573,8 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); KPILOT_DELETE( r ); } } |