diff options
Diffstat (limited to 'libkcal')
47 files changed, 434 insertions, 434 deletions
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 47ba6d1c..009c5778 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -70,7 +70,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen if ( !a ) { KMessageBox::error( parent, - i18n( "No attachment named \"%1\" found in the incidence." ).arg( attachmentName ) ); + i18n( "No attachment named \"%1\" found in the incidence." ).tqarg( attachmentName ) ); return 0; } @@ -101,7 +101,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, KMessageBox::error( parent, i18n( "The incidence that owns the attachment named \"%1\" could not be found. " - "Perhaps it was removed from your calendar?" ).arg( attachmentName ) ); + "Perhaps it was removed from your calendar?" ).tqarg( attachmentName ) ); return 0; } diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index d129bc36..a34f9759 100644 --- a/libkcal/attendee.cpp +++ b/libkcal/attendee.cpp @@ -33,7 +33,7 @@ Attendee::Attendee( const TQString &name, const TQString &email, bool _rsvp, : Person( name, email ) { mRSVP = _rsvp; - mStatus = s; + mtqStatus = s; mRole = r; mUid = u; } @@ -53,19 +53,19 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 ) a1.delegator() == a2.delegator() ); } -void Attendee::seStatus( Attendee::PartStat s ) +void Attendee::setqStatus( Attendee::PartStat s ) { - mStatus = s; + mtqStatus = s; } Attendee::PartStat Attendee::status() const { - return mStatus; + return mtqStatus; } TQString Attendee::statusStr() const { - return statusName( mStatus ); + return statusName( mtqStatus ); } TQString Attendee::statusName( Attendee::PartStat s ) diff --git a/libkcal/attendee.h b/libkcal/attendee.h index bf29fb48..609974e9 100644 --- a/libkcal/attendee.h +++ b/libkcal/attendee.h @@ -48,7 +48,7 @@ class LIBKCAL_EXPORT Attendee : public Person @param name Name @param email Email address @param rsvp Request for reply - @param status Status (see enum for list) + @param status tqStatus (see enum for list) @param role Role @param u the uid for the attendee */ @@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person /** Set status. See enum for definitions of possible values. */ - void seStatus( PartStat s ); + void setqStatus( PartStat s ); /** Return status. @@ -146,7 +146,7 @@ class LIBKCAL_EXPORT Attendee : public Person private: bool mRSVP; Role mRole; - PartStat mStatus; + PartStat mtqStatus; TQString mUid; TQString mDelegate; TQString mDelegator; diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index ad5030a1..897e9017 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -474,7 +474,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) { if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { - // Delete this event's UID from the parent's list of children + // Delete this event's UID from the parent's list of tqchildren Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -483,7 +483,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) parentIncidence->deleteChildIncidence(incidence->uid()); } else { - // Delete all children as well + // Delete all tqchildren as well IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; for ( it = il.begin(); it != il.end(); ++it ) { @@ -861,7 +861,7 @@ void Calendar::setupRelations( Incidence *forincidence ) } else { // Not found, put this in the mOrphans list // Note that the mOrphans dict might have several entries with the same key! That are - // multiple children that wait for the parent incidence to be inserted. + // multiple tqchildren that wait for the parent incidence to be inserted. mOrphans.insert( forincidence->relatedToUid(), forincidence ); mOrphanUids.insert( forincidence->uid(), forincidence ); } @@ -960,8 +960,8 @@ void Calendar::setModified( bool modified ) void Calendar::incidenceUpdated( IncidenceBase *incidence ) { - incidence->setSyncStatus( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::currentDateTime() ); + incidence->setSynctqStatus( Event::SYNCMOD ); + incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index fd7025f7..310c65d2 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -229,7 +229,7 @@ bool CalendarLocal::addTodo( Todo *todo ) bool CalendarLocal::deleteTodo( Todo *todo ) { - // Handle orphaned children + // Handle orphaned tqchildren removeRelations( todo ); if ( mTodoList.removeRef( todo ) ) { @@ -499,7 +499,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms, void CalendarLocal::incidenceUpdated( IncidenceBase *incidence ) { incidence->setSyncStatusSilent( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::currentDateTime() ); + incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. diff --git a/libkcal/calendarnull.cpp b/libkcal/calendarnull.cpp index f4b07789..39993e44 100644 --- a/libkcal/calendarnull.cpp +++ b/libkcal/calendarnull.cpp @@ -36,7 +36,7 @@ CalendarNull *CalendarNull::mSelf = 0; CalendarNull *CalendarNull::self() { - if ( !mSelf ) mSelf = new CalendarNull( TQString::fromLatin1( "UTC" ) ); + if ( !mSelf ) mSelf = new CalendarNull( TQString::tqfromLatin1( "UTC" ) ); return mSelf; } diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index a2ba6738..1b884b6a 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -162,7 +162,7 @@ class LIBKCAL_EXPORT CalendarResources : */ CalendarResources( const TQString &timeZoneId, - const TQString &family = TQString::fromLatin1( "calendar" ) ); + const TQString &family = TQString::tqfromLatin1( "calendar" ) ); /** Destructor diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp index 898ec79c..c065bf44 100644 --- a/libkcal/calfilter.cpp +++ b/libkcal/calfilter.cpp @@ -108,14 +108,14 @@ bool CalFilter::filterIncidence(Incidence *incidence) const if ( (mCriteria & HideCompleted) && todo->isCompleted() ) { // Check if completion date is suffently long ago: if ( todo->completed().addDays( mCompletedTimeSpan ) < - TQDateTime::currentDateTime() ) { + TQDateTime::tqcurrentDateTime() ) { return false; } } if( ( mCriteria & HideInactiveTodos ) && ( todo->hasStartDate() && - TQDateTime::currentDateTime() < todo->dtStart() || + TQDateTime::tqcurrentDateTime() < todo->dtStart() || todo->isCompleted() ) ) return false; diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index e506b8df..be26c3fc 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -27,8 +27,8 @@ using namespace KCal; -TQString CalFormat::mApplication = TQString::fromLatin1("libkcal"); -TQString CalFormat::mProductId = TQString::fromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); +TQString CalFormat::mApplication = TQString::tqfromLatin1("libkcal"); +TQString CalFormat::mProductId = TQString::tqfromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); CalFormat::CalFormat() @@ -70,9 +70,9 @@ TQString CalFormat::createUniqueId() TQTime::currentTime().minute() + TQTime::currentTime().second() + TQTime::currentTime().msec(); TQString uidStr = TQString("%1-%2.%3") - .arg(mApplication) - .arg(KApplication::random()) - .arg(hashTime); + .tqarg(mApplication) + .tqarg(KApplication::random()) + .tqarg(hashTime); return uidStr; } diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index 49f88056..3022d7cc 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -45,7 +45,7 @@ #include "calselectdialog.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> using namespace KCal; @@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label : KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel *labelWidget = new TQLabel( label, frame ); - layout->addWidget( labelWidget ); + tqlayout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - layout->addWidget( mListBox, 10 ); + tqlayout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), TQT_SLOT(slotOk()) ); @@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->setFocus(); - layout->addStretch(); + tqlayout->addStretch(); setMinimumWidth( 320 ); } diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 0b193058..29834148 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -23,7 +23,7 @@ #include <klistview.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqframe.h> #include <tqlabel.h> @@ -40,7 +40,7 @@ ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, TQLabel *label = new TQLabel( i18n("You have requested to save the following objects to '%1':") - .arg( destination ), topFrame ); + .tqarg( destination ), topFrame ); topLayout->addWidget( label ); mListView = new KListView( topFrame ); diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index 0e4b4352..4af6affa 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -105,7 +105,7 @@ int main(int argc,char **argv) } else { bool success = icalendarFormat.save( &cal, outputFile ); if ( !success ) { - std::cerr << i18n( "Error saving to '%1'." ).arg( outputFile ).local8Bit() + std::cerr << i18n( "Error saving to '%1'." ).tqarg( outputFile ).local8Bit() << std::endl; return 1; } diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 6524ef34..086323b0 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqmap.h> #include <kiconloader.h> @@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences ) bool DndFactory::copyIncidences( const Incidence::List &incidences ) { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); CalendarLocal cal( mCalendar->timeZoneId() ); Incidence::List::ConstIterator it; @@ -206,7 +206,7 @@ bool DndFactory::copyIncidence( Incidence *selectedInc ) Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); Incidence::List list; if ( !ICalDrag::decode( cb->data(), &cal ) && @@ -249,7 +249,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime Incidence *DndFactory::pasteIncidence( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); if ( !ICalDrag::decode( cb->data(), &cal ) && !VCalDrag::decode( cb->data(), &cal ) ) { diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp index 5b16759f..7a824f08 100644 --- a/libkcal/dummyscheduler.cpp +++ b/libkcal/dummyscheduler.cpp @@ -24,7 +24,7 @@ // #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp index 99c804dd..0394a400 100644 --- a/libkcal/exceptions.cpp +++ b/libkcal/exceptions.cpp @@ -38,7 +38,7 @@ Exception::~Exception() TQString Exception::message() { if ( mMessage.isEmpty() ) { - return i18n( "%1 Error" ).arg( CalFormat::application() ); + return i18n( "%1 Error" ).tqarg( CalFormat::application() ); } else { return mMessage; } diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 02f9f685..4bedf880 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -22,8 +22,8 @@ #include <tqapplication.h> #include <tqfile.h> -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include <tqregexp.h> #include <kcharsets.h> @@ -147,8 +147,8 @@ void HtmlExport::createMonthView(TQTextStream *ts) while ( start < toDate() ) { // Write header - *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start)) - .arg(start.year())) << "</h2>\n"; + *ts << "<h2>" << (i18n("month_year","%1 %2").tqarg(KGlobal::locale()->calendar()->monthName(start)) + .tqarg(start.year())) << "</h2>\n"; if ( KGlobal::locale()->weekStartDay() == 1 ) { start = start.addDays(1 - start.dayOfWeek()); } else { @@ -459,7 +459,7 @@ void HtmlExport::createTodo (TQTextStream *ts,Todo *todo) *ts << " <td"; if (completed) *ts << " class=\"done\""; *ts << ">\n"; - *ts << " " << i18n("%1 %").arg(todo->percentComplete()) << "\n"; + *ts << " " << i18n("%1 %").tqarg(todo->percentComplete()) << "\n"; *ts << " </td>\n"; if ( mSettings->taskDueDate() ) { @@ -618,20 +618,20 @@ void HtmlExport::createFooter( TQTextStream *ts ) TQString mail, name, credit, creditURL;*/ if (!mSettings->eMail().isEmpty()) { if (!mSettings->name().isEmpty()) - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->name() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->name() ); else - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->eMail() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->eMail() ); } else { if (!mSettings->name().isEmpty()) - trailer += i18n("by %1 ").arg( mSettings->name() ); + trailer += i18n("by %1 ").tqarg( mSettings->name() ); } if (!mSettings->creditName().isEmpty()) { if (!mSettings->creditURL().isEmpty()) trailer += i18n("with <a href=\"%1\">%2</a>") - .arg( mSettings->creditURL() ) - .arg( mSettings->creditName() ); + .tqarg( mSettings->creditURL() ) + .tqarg( mSettings->creditName() ); else - trailer += i18n("with %1").arg( mSettings->creditName() ); + trailer += i18n("with %1").tqarg( mSettings->creditName() ); } *ts << "<p>" << trailer << "</p>\n"; } @@ -706,7 +706,7 @@ void HtmlExport::addHoliday( const TQDate &date, const TQString &name) if ( mHolidayMap[date].isEmpty() ) { mHolidayMap[date] = name; } else { - mHolidayMap[date] = i18n("list of holidays", "%1, %2").arg(mHolidayMap[date]).arg(name); + mHolidayMap[date] = i18n("list of holidays", "%1, %2").tqarg(mHolidayMap[date]).tqarg(name); } } diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp index 39315f5a..2c5f2309 100644 --- a/libkcal/icaldrag.cpp +++ b/libkcal/icaldrag.cpp @@ -46,7 +46,7 @@ bool ICalDrag::decode( TQMimeSource *de, Calendar *cal ) { bool success = false; - TQByteArray payload = de->encodedData( "text/calendar" ); + TQByteArray payload = de->tqencodedData( "text/calendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index ff792e28..25feb42f 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -23,9 +23,9 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <klocale.h> @@ -117,7 +117,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) kdDebug(5800) << "ICalFormat::save() errno: " << strerror( file.status() ) << endl; setException( new ErrorFormat( ErrorFormat::SaveError, - i18n( "Error saving to '%1'." ).arg( fileName ) ) ); + i18n( "Error saving to '%1'." ).tqarg( fileName ) ) ); return false; } @@ -128,7 +128,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) if ( !file.close() ) { kdDebug(5800) << "KSaveFile: close: status was " << file.status() << ". See errno.h." << endl; setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not save '%1'").arg(fileName))); + i18n("Could not save '%1'").tqarg(fileName))); return false; } @@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (messageText.isEmpty()) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) ); return 0; } // TODO FIXME: Don't we have to ical-free message??? MEMLEAK @@ -449,7 +449,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (!message) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) ); return 0; } @@ -457,7 +457,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, ICAL_METHOD_PROPERTY); if (!m) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) ); return 0; } @@ -495,7 +495,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (!incidence) { kdDebug(5800) << "ICalFormat:parseScheduleMessage: object is not a freebusy, event, todo or journal" << endl; - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "object is not a freebusy, event, todo or journal" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) ); return 0; } @@ -577,7 +577,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, kdDebug(5800) << "ICalFormat::parseScheduleMessage() returning..." << endl; kdDebug(5800) << "ICalFormat::parseScheduleMessage(), result = " << result << endl; - ScheduleMessage::Status status; + ScheduleMessage::tqStatus status; switch (result) { case ICAL_XLICCLASS_PUBLISHNEW: diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 1d95f455..bb53a353 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -75,7 +75,7 @@ static TQString quoteForParam( const TQString &text ) tmp.remove( '"' ); if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) ) return tmp; // libical quotes in this case already, see icalparameter_as_ical_string() - return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" ); + return TQString::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" ); } const int gSecondsPerMinute = 60; @@ -157,7 +157,7 @@ icalcomponent *ICalFormatImpl::writeTodo(Todo *todo) if (!todo->hasCompletedDate()) { // If todo was created by KOrganizer <2.2 it has no correct completion // date. Set it to now. - todo->setCompleted(TQDateTime::currentDateTime()); + todo->setCompleted(TQDateTime::tqcurrentDateTime()); } icaltimetype completed = writeICalDateTime(todo->completed()); icalcomponent_add_property(vtodo,icalproperty_new_completed(completed)); @@ -312,11 +312,11 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) if (incidence->pilotId()) { // NOTE: we can't do setNonKDECustomProperty here because this changes // data and triggers an updated() event... - // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->syncStatus())); + // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->synctqStatus())); // incidence->setNonKDECustomProperty("X-PILOTID", TQString::number(incidence->pilotId())); icalproperty *p = 0; - p = icalproperty_new_x(TQString::number(incidence->syncStatus()).utf8()); + p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8()); icalproperty_set_x_name(p,"X-PILOTSTAT"); icalcomponent_add_property(parent,p); @@ -535,7 +535,7 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent, IncidenceBase * incidenceBase ) { icalcomponent_add_property( parent, icalproperty_new_dtstamp( - writeICalDateTime( TQDateTime::currentDateTime() ) ) ); + writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) ); // organizer stuff if ( !incidenceBase->organizer().isEmpty() ) { @@ -1081,7 +1081,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon const TQString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT"); if ( !msade.isEmpty() ) { - const bool floats = ( msade == TQString::fromLatin1("TRUE") ); + const bool floats = ( msade == TQString::tqfromLatin1("TRUE") ); event->setFloats(floats); } @@ -1171,7 +1171,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) icalparameter *p = 0; TQString email = TQString::fromUtf8(icalproperty_get_attendee(attendee)); - if ( email.startsWith( "mailto:", false ) ) { + if ( email.tqstartsWith( "mailto:", false ) ) { email = email.mid( 7 ); } @@ -1267,7 +1267,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) Person ICalFormatImpl::readOrganizer( icalproperty *organizer ) { TQString email = TQString::fromUtf8(icalproperty_get_organizer(organizer)); - if ( email.startsWith( "mailto:", false ) ) { + if ( email.tqstartsWith( "mailto:", false ) ) { email = email.mid( 7 ); } TQString cn; @@ -1420,7 +1420,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci break; case ICAL_STATUS_PROPERTY: { // status - Incidence::Status stat; + Incidence::tqStatus stat; switch (icalproperty_get_status(p)) { case ICAL_STATUS_TENTATIVE: stat = Incidence::StatusTentative; break; case ICAL_STATUS_CONFIRMED: stat = Incidence::StatusConfirmed; break; @@ -1431,14 +1431,14 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci case ICAL_STATUS_DRAFT: stat = Incidence::StatusDraft; break; case ICAL_STATUS_FINAL: stat = Incidence::StatusFinal; break; case ICAL_STATUS_X: - incidence->setCustomStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p)))); + incidence->setCustomtqStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p)))); stat = Incidence::StatusX; break; case ICAL_STATUS_NONE: default: stat = Incidence::StatusNone; break; } if (stat != Incidence::StatusX) - incidence->seStatus(stat); + incidence->setqStatus(stat); break; } @@ -1618,7 +1618,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci incidenceBase->setPilotId(value.toInt()); icalcomponent_remove_property(parent,p); } else if (name == "X-PILOTSTAT" && !value.isEmpty()) { - incidenceBase->setSyncStatus(value.toInt()); + incidenceBase->setSynctqStatus(value.toInt()); icalcomponent_remove_property(parent,p); } } @@ -1855,7 +1855,7 @@ void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence) // Only in EMAIL alarm case ICAL_ATTENDEE_PROPERTY: { TQString email = TQString::fromUtf8(icalproperty_get_attendee(p)); - if ( email.startsWith("mailto:", false ) ) { + if ( email.tqstartsWith("mailto:", false ) ) { email = email.mid( 7 ); } TQString name; @@ -2166,7 +2166,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (todo) { if (todo->hasRecurrenceID()) { TQString originalUid = todo->uid(); - todo->setUid(originalUid + TQString("-recur-%1").arg(todo->recurrenceID().toTime_t())); + todo->setUid(originalUid + TQString("-recur-%1").tqarg(todo->recurrenceID().toTime_t())); if (!cal->todo(todo->uid())) { if ( !cal->addTodo( todo ) ) { cal->endBatchAdding(); @@ -2208,7 +2208,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (event) { if (event->hasRecurrenceID()) { TQString originalUid = event->uid(); - event->setUid(originalUid + TQString("-recur-%1").arg(event->recurrenceID().toTime_t())); + event->setUid(originalUid + TQString("-recur-%1").tqarg(event->recurrenceID().toTime_t())); if (!cal->event(event->uid())) { cal->addEvent(event); if (!cal->event(originalUid)) { @@ -2246,7 +2246,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (journal) { if (journal->hasRecurrenceID()) { TQString originalUid = journal->uid(); - journal->setUid(originalUid + TQString("-recur-%1").arg(journal->recurrenceID().toTime_t())); + journal->setUid(originalUid + TQString("-recur-%1").tqarg(journal->recurrenceID().toTime_t())); if (!cal->journal(journal->uid())) { cal->addJournal(journal); if (!cal->event(originalUid)) { diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index b26b6214..0c27da43 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -33,7 +33,7 @@ using namespace KCal; Incidence::Incidence() : IncidenceBase(), - mRelatedTo(0), mStatus(StatusNone), mSecrecy(SecrecyPublic), + mRelatedTo(0), mtqStatus(StatusNone), mSecrecy(SecrecyPublic), mPriority(0), mRecurrence(0), mHasRecurrenceID( false ), mChildRecurrenceEvents() { @@ -57,7 +57,7 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ),Recurrence::Obse // Incidence::List mRelations; Incidence::List mRelations; mResources = i.mResources; mStatusString = i.mStatusString; - mStatus = i.mStatus; + mtqStatus = i.mtqStatus; mSecrecy = i.mSecrecy; mPriority = i.mPriority; mLocation = i.mLocation; @@ -125,7 +125,7 @@ Incidence& Incidence::operator=( const Incidence &i ) mRelations.clear(); mResources = i.mResources; mStatusString = i.mStatusString; - mStatus = i.mStatus; + mtqStatus = i.mtqStatus; mSecrecy = i.mSecrecy; mPriority = i.mPriority; mLocation = i.mLocation; @@ -196,8 +196,8 @@ bool Incidence::operator==( const Incidence& i2 ) const relations() == i2.relations() && attachments() == i2.attachments() && resources() == i2.resources() && - mStatus == i2.mStatus && - ( mStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) && + mtqStatus == i2.mtqStatus && + ( mtqStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) && secrecy() == i2.secrecy() && priority() == i2.priority() && stringCompare( location(), i2.location() ) && @@ -207,16 +207,16 @@ bool Incidence::operator==( const Incidence& i2 ) const void Incidence::recreate() { - setCreated(TQDateTime::currentDateTime()); + setCreated(TQDateTime::tqcurrentDateTime()); setUid(CalFormat::createUniqueId()); setSchedulingID( TQString() ); setRevision(0); - setLastModified(TQDateTime::currentDateTime()); + setLastModified(TQDateTime::tqcurrentDateTime()); setPilotId( 0 ); - setSyncStatus( SYNCNONE ); + setSynctqStatus( SYNCNONE ); } void Incidence::setReadOnly( bool readOnly ) @@ -738,35 +738,35 @@ int Incidence::priority() const return mPriority; } -void Incidence::seStatus(Incidence::Status status) +void Incidence::setqStatus(Incidence::tqStatus status) { if (mReadOnly || status == StatusX) return; - mStatus = status; + mtqStatus = status; mStatusString = TQString(); updated(); } -void Incidence::setCustomStatus(const TQString &status) +void Incidence::setCustomtqStatus(const TQString &status) { if (mReadOnly) return; - mStatus = status.isEmpty() ? StatusNone : StatusX; + mtqStatus = status.isEmpty() ? StatusNone : StatusX; mStatusString = status; updated(); } -Incidence::Status Incidence::status() const +Incidence::tqStatus Incidence::status() const { - return mStatus; + return mtqStatus; } TQString Incidence::statusStr() const { - if (mStatus == StatusX) + if (mtqStatus == StatusX) return mStatusString; - return statusName(mStatus); + return statusName(mtqStatus); } -TQString Incidence::statusName(Incidence::Status status) +TQString Incidence::statusName(Incidence::tqStatus status) { switch (status) { case StatusTentative: return i18n("incidence status", "Tentative"); diff --git a/libkcal/incidence.h b/libkcal/incidence.h index c1aa402b..089056fb 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -114,7 +114,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ }; /** Enumeration for describing an event's status. */ - enum Status { + enum tqStatus { StatusNone, StatusTentative, StatusConfirmed, StatusCompleted, StatusNeedsAction, StatusCanceled, StatusInProcess, StatusDraft, StatusFinal, @@ -352,7 +352,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// %%%%% Secrecy and Status methods +// %%%%% Secrecy and tqStatus methods // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /** @@ -381,17 +381,17 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ Sets the incidence status to a standard status value. See separate enum. Note that StatusX cannot be specified. */ - void seStatus( Status status ); + void setqStatus( tqStatus status ); /** Sets the incidence status to a non-standard status value. @param status non-standard status string. If empty, the incidence status will be set to StatusNone. */ - void setCustomStatus( const TQString &status ); + void setCustomtqStatus( const TQString &status ); /** Return the event's status. */ - Status status() const; + tqStatus status() const; /** Return the event's status string. */ @@ -399,7 +399,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ /** Return human-readable translated name of status value. */ - static TQString statusName( Status ); + static TQString statusName( tqStatus ); // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -566,7 +566,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ TQStringList mResources; TQString mStatusString; - Status mStatus; + tqStatus mtqStatus; int mSecrecy; int mPriority; // 1 = highest, 2 = less, etc. diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index a8a6bdb0..d5dbef56 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -32,7 +32,7 @@ using namespace KCal; IncidenceBase::IncidenceBase() : mReadOnly( false ), mFloats( true ), mDuration( 0 ), mHasDuration( false ), - mPilotId( 0 ), mSyncStatus( SYNCMOD ) + mPilotId( 0 ), mSynctqStatus( SYNCMOD ) { setUid( CalFormat::createUniqueId() ); @@ -56,7 +56,7 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : mFloats = i.mFloats; mLastModified = i.mLastModified; mPilotId = i.mPilotId; - mSyncStatus = i.mSyncStatus; + mSynctqStatus = i.mSynctqStatus; mComments = i.mComments; // The copied object is a new one, so it isn't observed by the observer @@ -88,7 +88,7 @@ IncidenceBase& IncidenceBase::operator=( const IncidenceBase& i ) mFloats = i.mFloats; mLastModified = i.mLastModified; mPilotId = i.mPilotId; - mSyncStatus = i.mSyncStatus; + mSynctqStatus = i.mSynctqStatus; mComments = i.mComments; return *this; @@ -124,7 +124,7 @@ bool IncidenceBase::operator==( const IncidenceBase& i2 ) const duration() == i2.duration() && hasDuration() == i2.hasDuration() && pilotId() == i2.pilotId() && - syncStatus() == i2.syncStatus() ); + synctqStatus() == i2.synctqStatus() ); // no need to compare mObserver } @@ -174,7 +174,7 @@ void IncidenceBase::setOrganizer( const Person &o ) void IncidenceBase::setOrganizer(const TQString &o) { TQString mail( o ); - if ( mail.startsWith("MAILTO:", false) ) + if ( mail.tqstartsWith("MAILTO:", false) ) mail = mail.remove( 0, 7 ); // split the string into full name plus email. Person organizer( mail ); @@ -361,22 +361,22 @@ bool IncidenceBase::hasDuration() const return mHasDuration; } -void IncidenceBase::setSyncStatus(int stat) +void IncidenceBase::setSynctqStatus(int stat) { if (mReadOnly) return; - if ( mSyncStatus == stat ) return; - mSyncStatus = stat; + if ( mSynctqStatus == stat ) return; + mSynctqStatus = stat; updatedSilent(); } void IncidenceBase::setSyncStatusSilent(int stat) { if (mReadOnly) return; - mSyncStatus = stat; + mSynctqStatus = stat; } -int IncidenceBase::syncStatus() const +int IncidenceBase::synctqStatus() const { - return mSyncStatus; + return mSynctqStatus; } void IncidenceBase::setPilotId( unsigned long id ) diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index d54ca879..7d4eec7e 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -235,12 +235,12 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties /** Set synchronisation satus. */ - void setSyncStatus( int status ); + void setSynctqStatus( int status ); void setSyncStatusSilent( int status ); /** Return synchronisation status. */ - int syncStatus() const; + int synctqStatus() const; /** Set Pilot Id. @@ -292,7 +292,7 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties // PILOT SYNCHRONIZATION STUFF unsigned long mPilotId; // unique id for pilot sync - int mSyncStatus; // status (for sync) + int mSynctqStatus; // status (for sync) TQPtrList<Observer> mObservers; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index d51de583..49c3967a 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -52,7 +52,7 @@ #include <kmimetype.h> #include <tqbuffer.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqdatetime.h> #include <tqregexp.h> @@ -248,10 +248,10 @@ static TQString displayViewFormatAttendeeRoleList( Incidence *incidence, Attende } tmpStr += displayViewLinkPerson( a->email(), a->name(), a->uid() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); } tmpStr += "<br>"; } @@ -359,7 +359,7 @@ static TQString displayViewFormatCategories( Incidence *incidence ) static TQString displayViewFormatCreationDate( Incidence *incidence ) { return i18n( "Creation date: %1" ). - arg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); + tqarg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); } static TQString displayViewFormatBirthday( Event *event ) @@ -502,14 +502,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - arg( IncidenceFormatter::dateToString( startDt, false ) ). - arg( IncidenceFormatter::dateToString( endDt, false ) ) + + tqarg( IncidenceFormatter::dateToString( startDt, false ) ). + tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - arg( IncidenceFormatter::dateToString( startDt, false ) ) + + tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; } } else { @@ -517,14 +517,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - arg( IncidenceFormatter::dateToString( startDt, false ) ). - arg( IncidenceFormatter::dateToString( endDt, false ) ) + + tqarg( IncidenceFormatter::dateToString( startDt, false ) ). + tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - arg( IncidenceFormatter::dateToString( startDt, false ) ) + + tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; tmpStr += "</tr><tr>"; @@ -532,8 +532,8 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, if ( event->hasEndDate() && startDt != endDt ) { tmpStr += "<td>" + i18n("<beginTime> - <endTime>","%1 - %2"). - arg( IncidenceFormatter::timeToString( startDt, true ) ). - arg( IncidenceFormatter::timeToString( endDt, true ) ) + + tqarg( IncidenceFormatter::timeToString( startDt, true ) ). + tqarg( IncidenceFormatter::timeToString( endDt, true ) ) + "</td>"; } else { tmpStr += "<td>" + @@ -750,7 +750,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo, } else { tmpStr += "<td><b>" + i18n( "Percent Done:" ) + "</b></td>"; tmpStr += "<td>"; - tmpStr += i18n( "%1%" ).arg( todo->percentComplete() ); + tmpStr += i18n( "%1%" ).tqarg( todo->percentComplete() ); } tmpStr += "</td>"; tmpStr += "</tr>"; @@ -833,11 +833,11 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb TQString tmpStr = htmlAddTag( "h2", htmlAddTag( "b", i18n("Free/Busy information for %1"). - arg( fb->organizer().fullName() ) ) ); + tqarg( fb->organizer().fullName() ) ) ); tmpStr += htmlAddTag( "h4", i18n("Busy times in date range %1 - %2:"). - arg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). - arg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); + tqarg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). + tqarg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); TQValueList<Period> periods = fb->busyPeriods(); @@ -860,19 +860,19 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb cont += i18n("1 second", "%n seconds", dur); } text += i18n("startDate for duration", "%1 for %2"). - arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - arg( cont ); + tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + tqarg( cont ); text += "<br>"; } else { if ( per.start().date() == per.end().date() ) { text += i18n("date, fromTime - toTime ", "%1, %2 - %3"). - arg( IncidenceFormatter::dateToString( per.start().date(), true ) ). - arg( IncidenceFormatter::timeToString( per.start(), true ) ). - arg( IncidenceFormatter::timeToString( per.end(), true ) ); + tqarg( IncidenceFormatter::dateToString( per.start().date(), true ) ). + tqarg( IncidenceFormatter::timeToString( per.start(), true ) ). + tqarg( IncidenceFormatter::timeToString( per.end(), true ) ); } else { text += i18n("fromDateTime - toDateTime", "%1 - %2"). - arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - arg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); + tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + tqarg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); } text += "<br>"; } @@ -969,11 +969,11 @@ static TQString eventStartTimeStr( Event *event ) TQString tmp; if ( !event->doesFloat() ) { tmp = i18n( "%1: Start Date, %2: Start Time", "%1 %2" ). - arg( IncidenceFormatter::dateToString( event->dtStart(), true ), + tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ), IncidenceFormatter::timeToString( event->dtStart(), true ) ); } else { tmp = i18n( "%1: Start Date", "%1 (all day)" ). - arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); } return tmp; } @@ -984,11 +984,11 @@ static TQString eventEndTimeStr( Event *event ) if ( event->hasEndDate() && event->dtEnd().isValid() ) { if ( !event->doesFloat() ) { tmp = i18n( "%1: End Date, %2: End Time", "%1 %2" ). - arg( IncidenceFormatter::dateToString( event->dtEnd(), true ), + tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ), IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } else { tmp = i18n( "%1: End Date", "%1 (all day)" ). - arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } } return tmp; @@ -1106,13 +1106,13 @@ static TQString rsvpRequestedStr( bool rsvpRequested, const TQString &role ) if ( role.isEmpty() ) { return i18n( "Your response is requested" ); } else { - return i18n( "Your response as <b>%1</b> is requested" ).arg( role ); + return i18n( "Your response as <b>%1</b> is requested" ).tqarg( role ); } } else { if ( role.isEmpty() ) { return i18n( "No response is necessary" ); } else { - return i18n( "No response as <b>%1</b> is necessary" ).arg( role ); + return i18n( "No response as <b>%1</b> is necessary" ).tqarg( role ); } } } @@ -1124,7 +1124,7 @@ static TQString myStatusStr( Incidence *incidence ) if ( a && a->status() != Attendee::NeedsAction && a->status() != Attendee::Delegated ) { ret = i18n( "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)" ). - arg( Attendee::statusName( a->status() ) ); + tqarg( Attendee::statusName( a->status() ) ); } return ret; } @@ -1302,7 +1302,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").arg(dir); + TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; @@ -1413,7 +1413,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").arg(dir); + TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; // Invitation summary & location rows @@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) cont += i18n("1 second", "%n seconds", dur); } html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .arg(cont) ); + .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .tqarg(cont) ); } else { TQString cont; if ( per.start().date() == per.end().date() ) { cont = i18n("date, fromTime - toTime ", "%1, %2 - %3") - .arg( KGlobal::locale()->formatDate( per.start().date() ) ) - .arg( KGlobal::locale()->formatTime( per.start().time() ) ) - .arg( KGlobal::locale()->formatTime( per.end().time() ) ); + .tqarg( KGlobal::locale()->formatDate( per.start().date() ) ) + .tqarg( KGlobal::locale()->formatTime( per.start().time() ) ) + .tqarg( KGlobal::locale()->formatTime( per.end().time() ) ); } else { cont = i18n("fromDateTime - toDateTime", "%1 - %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); + .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .tqarg( KGlobal::locale()->formatDateTime( per.end(), false ) ); } html += invitationRow( TQString(), cont ); @@ -1565,7 +1565,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Request: if ( existingIncidence && event->revision() > 0 ) { return i18n( "This invitation has been updated by the organizer %1" ). - arg( event->organizer().fullName() ); + tqarg( event->organizer().fullName() ); } if ( iamOrganizer( event ) ) { return i18n( "I created this invitation" ); @@ -1578,17 +1578,17 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( senderIsOrganizer( event, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You received an invitation from %1" ).arg( orgStr ); + return i18n( "You received an invitation from %1" ).tqarg( orgStr ); } else { return i18n( "You received an invitation" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You received an invitation from %1 as a representative of %2" ). - arg( sender, orgStr ); + tqarg( sender, orgStr ); } else { return i18n( "You received an invitation from %1 as the organizer's representative" ). - arg( sender ); + tqarg( sender ); } } } @@ -1602,7 +1602,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc { if ( replyMeansCounter( event ) ) { return i18n( "%1 makes this counter proposal" ). - arg( firstAttendeeName( event, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); } Attendee::List attendees = event->attendees(); @@ -1625,36 +1625,36 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this invitation still needs some action" ).arg( attendeeName ); + return i18n( "%1 indicates this invitation still needs some action" ).tqarg( attendeeName ); case Attendee::Accepted: if ( event->revision() > 0 ) { if ( !sender.isEmpty() ) { - return i18n( "This invitation has been updated by attendee %1" ).arg( sender ); + return i18n( "This invitation has been updated by attendee %1" ).tqarg( sender ); } else { return i18n( "This invitation has been updated by an attendee" ); } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this invitation" ).arg( attendeeName ); + return i18n( "%1 accepts this invitation" ).tqarg( attendeeName ); } else { return i18n( "%1 accepts this invitation on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this invitation" ). - arg( attendeeName ); + tqarg( attendeeName ); } else { return i18n( "%1 tentatively accepts this invitation on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this invitation" ).arg( attendeeName ); + return i18n( "%1 declines this invitation" ).tqarg( attendeeName ); } else { return i18n( "%1 declines this invitation on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1664,16 +1664,16 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this invitation to %2" ). - arg( attendeeName ) .arg( delegate ); + tqarg( attendeeName ) .tqarg( delegate ); } else { - return i18n( "%1 has delegated this invitation" ).arg( attendeeName ); + return i18n( "%1 has delegated this invitation" ).tqarg( attendeeName ); } } case Attendee::Completed: return i18n( "This invitation is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the invitation" ). - arg( attendeeName ); + tqarg( attendeeName ); default: return i18n( "Unknown response to this invitation" ); } @@ -1682,15 +1682,15 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - arg( firstAttendeeName( event, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - arg( firstAttendeeName( event, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - arg( msg->method() ); + tqarg( msg->method() ); } return TQString(); } @@ -1708,7 +1708,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Request: if ( existingIncidence && todo->revision() > 0 ) { return i18n( "This task has been updated by the organizer %1" ). - arg( todo->organizer().fullName() ); + tqarg( todo->organizer().fullName() ); } else { if ( iamOrganizer( todo ) ) { return i18n( "I created this task" ); @@ -1721,17 +1721,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( senderIsOrganizer( todo, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You have been assigned this task by %1" ).arg( orgStr ); + return i18n( "You have been assigned this task by %1" ).tqarg( orgStr ); } else { return i18n( "You have been assigned this task" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You have been assigned this task by %1 as a representative of %2" ). - arg( sender, orgStr ); + tqarg( sender, orgStr ); } else { return i18n( "You have been assigned this task by %1 as the organizer's representative" ). - arg( sender ); + tqarg( sender ); } } } @@ -1746,7 +1746,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, { if ( replyMeansCounter( todo ) ) { return i18n( "%1 makes this counter proposal" ). - arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); } Attendee::List attendees = todo->attendees(); @@ -1769,14 +1769,14 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this task assignment still needs some action" ).arg( attendeeName ); + return i18n( "%1 indicates this task assignment still needs some action" ).tqarg( attendeeName ); case Attendee::Accepted: if ( todo->revision() > 0 ) { if ( !sender.isEmpty() ) { if ( todo->isCompleted() ) { - return i18n( "This task has been completed by assignee %1" ).arg( sender ); + return i18n( "This task has been completed by assignee %1" ).tqarg( sender ); } else { - return i18n( "This task has been updated by assignee %1" ).arg( sender ); + return i18n( "This task has been updated by assignee %1" ).tqarg( sender ); } } else { if ( todo->isCompleted() ) { @@ -1787,26 +1787,26 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this task" ).arg( attendeeName ); + return i18n( "%1 accepts this task" ).tqarg( attendeeName ); } else { return i18n( "%1 accepts this task on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this task" ). - arg( attendeeName ); + tqarg( attendeeName ); } else { return i18n( "%1 tentatively accepts this task on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this task" ).arg( attendeeName ); + return i18n( "%1 declines this task" ).tqarg( attendeeName ); } else { return i18n( "%1 declines this task on behalf of %2" ). - arg( attendeeName ).arg( delegatorName ); + tqarg( attendeeName ).tqarg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1816,17 +1816,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this request for the task to %2" ). - arg( attendeeName ).arg( delegate ); + tqarg( attendeeName ).tqarg( delegate ); } else { return i18n( "%1 has delegated this request for the task" ). - arg( attendeeName ); + tqarg( attendeeName ); } } case Attendee::Completed: return i18n( "The request for this task is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the task" ). - arg( attendeeName ); + tqarg( attendeeName ); default: return i18n( "Unknown response to this task" ); } @@ -1835,15 +1835,15 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n( "Error: iMIP message with unknown method: '%1'" ). - arg( msg->method() ); + tqarg( msg->method() ); } return TQString(); } @@ -1908,7 +1908,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg return i18n( "Sender declines the counter proposal" ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - arg( msg->method() ); + tqarg( msg->method() ); } return TQString(); } @@ -1933,7 +1933,7 @@ static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg ) case Scheduler::NoMethod: default: return i18n("Error: Free/Busy iMIP message with unknown method: '%1'"). - arg( msg->method() ); + tqarg( msg->method() ); } } @@ -1967,10 +1967,10 @@ static TQString invitationAttendees( Incidence *incidence ) tmpStr += "<td>"; tmpStr += invitationPerson( a->email(), a->name(), TQString() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); } tmpStr += "</td>"; tmpStr += "<td>" + a->statusStr() + "</td>"; @@ -2156,10 +2156,10 @@ class IncidenceFormatter::IncidenceCompareVisitor return; if ( oldEvent->dtStart() != newEvent->dtStart() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation starting time has been changed from %1 to %2" ) - .arg( eventStartTimeStr( oldEvent ) ).arg( eventStartTimeStr( newEvent ) ); + .tqarg( eventStartTimeStr( oldEvent ) ).tqarg( eventStartTimeStr( newEvent ) ); if ( oldEvent->dtEnd() != newEvent->dtEnd() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation ending time has been changed from %1 to %2" ) - .arg( eventEndTimeStr( oldEvent ) ).arg( eventEndTimeStr( newEvent ) ); + .tqarg( eventEndTimeStr( oldEvent ) ).tqarg( eventEndTimeStr( newEvent ) ); } void compareTodos( Todo *newTodo, Todo *oldTodo ) @@ -2175,10 +2175,10 @@ class IncidenceFormatter::IncidenceCompareVisitor mChanges += i18n( "The task is no longer completed" ); } if ( oldTodo->percentComplete() != newTodo->percentComplete() ) { - const TQString oldPer = i18n( "%1%" ).arg( oldTodo->percentComplete() ); - const TQString newPer = i18n( "%1%" ).arg( newTodo->percentComplete() ); + const TQString oldPer = i18n( "%1%" ).tqarg( oldTodo->percentComplete() ); + const TQString newPer = i18n( "%1%" ).tqarg( newTodo->percentComplete() ); mChanges += i18n( "The task completed percentage has changed from %1 to %2" ). - arg( oldPer, newPer ); + tqarg( oldPer, newPer ); } if ( !oldTodo->hasStartDate() && newTodo->hasStartDate() ) { @@ -2190,7 +2190,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasStartDate() && newTodo->hasStartDate() && oldTodo->dtStart() != newTodo->dtStart() ) { mChanges += i18n( "The task starting time has been changed from %1 to %2" ). - arg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), + tqarg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtStart(), newTodo->doesFloat(), false ) ); } @@ -2203,7 +2203,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasDueDate() && newTodo->hasDueDate() && oldTodo->dtDue() != newTodo->dtDue() ) { mChanges += i18n( "The task due time has been changed from %1 to %2" ). - arg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), + tqarg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtDue(), newTodo->doesFloat(), false ) ); } } @@ -2213,22 +2213,22 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( !oldInc || !newInc ) return; if ( oldInc->summary() != newInc->summary() ) - mChanges += i18n( "The summary has been changed to: \"%1\"" ).arg( newInc->summary() ); + mChanges += i18n( "The summary has been changed to: \"%1\"" ).tqarg( newInc->summary() ); if ( oldInc->location() != newInc->location() ) - mChanges += i18n( "The location has been changed to: \"%1\"" ).arg( newInc->location() ); + mChanges += i18n( "The location has been changed to: \"%1\"" ).tqarg( newInc->location() ); if ( oldInc->description() != newInc->description() ) - mChanges += i18n( "The description has been changed to: \"%1\"" ).arg( newInc->description() ); + mChanges += i18n( "The description has been changed to: \"%1\"" ).tqarg( newInc->description() ); Attendee::List oldAttendees = oldInc->attendees(); Attendee::List newAttendees = newInc->attendees(); for ( Attendee::List::ConstIterator it = newAttendees.constBegin(); it != newAttendees.constEnd(); ++it ) { Attendee *oldAtt = oldInc->attendeeByMail( (*it)->email() ); if ( !oldAtt ) { - mChanges += i18n( "Attendee %1 has been added" ).arg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been added" ).tqarg( (*it)->fullName() ); } else { if ( oldAtt->status() != (*it)->status() ) mChanges += i18n( "The status of attendee %1 has been changed to: %2" ). - arg( (*it)->fullName() ).arg( (*it)->statusStr() ); + tqarg( (*it)->fullName() ).tqarg( (*it)->statusStr() ); } } if ( method == Scheduler::Request ) { @@ -2237,7 +2237,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( (*it)->email() != oldInc->organizer().email() ) { Attendee *newAtt = newInc->attendeeByMail( (*it)->email() ); if ( !newAtt ) { - mChanges += i18n( "Attendee %1 has been removed" ).arg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been removed" ).tqarg( (*it)->fullName() ); } } } @@ -2255,12 +2255,12 @@ TQString InvitationFormatterHelper::makeLink( const TQString &id, const TQString { if ( !id.startsWith( "ATTACH:" ) ) { TQString res = TQString( "<a href=\"%1\"><b>%2</b></a>" ). - arg( generateLinkURL( id ), text ); + tqarg( generateLinkURL( id ), text ); return res; } else { // draw the attachment links in non-bold face TQString res = TQString( "<a href=\"%1\">%2</a>" ). - arg( generateLinkURL( id ), text ); + tqarg( generateLinkURL( id ), text ); return res; } } @@ -2426,12 +2426,12 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, // First make the text of the message TQString html; - TQString tableStyle = TQString::fromLatin1( + TQString tableStyle = TQString::tqfromLatin1( "style=\"border: solid 1px; margin: 0em;\"" ); - TQString tableHead = TQString::fromLatin1( + TQString tableHead = TQString::tqfromLatin1( "<div align=\"center\">" "<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>" - "<tr><td>").arg(tableStyle); + "<tr><td>").tqarg(tableStyle); html += tableHead; InvitationHeaderVisitor headerVisitor; @@ -2459,7 +2459,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( compareVisitor.act( incBase, existingIncidence, msg->method() ) ) { html += "<p align=\"left\">"; if ( !sender.isEmpty() ) { - html += i18n( "The following changes have been made by %1:" ).arg( sender ); + html += i18n( "The following changes have been made by %1:" ).tqarg( sender ); } else { html += i18n( "The following changes have been made by an attendee:" ); } @@ -2514,10 +2514,10 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( rsvpRec && inc ) { if ( inc->revision() == 0 ) { html += i18n( "Your <b>%1</b> response has already been recorded" ). - arg( ea->statusStr() ); + tqarg( ea->statusStr() ); } else { html += i18n( "Your status for this invitation is <b>%1</b>" ). - arg( ea->statusStr() ); + tqarg( ea->statusStr() ); } rsvpReq = false; } else if ( msg->method() == Scheduler::Cancel ) { @@ -2627,7 +2627,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( ea && ( ea->status() != Attendee::NeedsAction ) && ( ea->status() == a->status() ) ) { if ( inc && inc->revision() > 0 ) { html += "<br><u><i>"; - html += i18n( "The response has been recorded [%1]" ).arg( ea->statusStr() ); + html += i18n( "The response has been recorded [%1]" ).tqarg( ea->statusStr() ); html += "</i></u>"; } } else { @@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) KTNEFParser parser; TQBuffer buf( tnef ); - CalendarLocal cal ( TQString::fromLatin1( "UTC" ) ); + CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) ); KABC::Addressee addressee; KABC::VCardConverter cardConv; ICalFormat calFormat; @@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) Attendee *attendee = new Attendee( s, s, true ); if( bIsReply ) { if( bCompatMethodAccepted ) - attendee->seStatus( Attendee::Accepted ); + attendee->setqStatus( Attendee::Accepted ); if( bCompatMethodDeclined ) - attendee->seStatus( Attendee::Declined ); + attendee->setqStatus( Attendee::Declined ); if( bCompatMethodAcceptedCond ) - attendee->seStatus(Attendee::Tentative); + attendee->setqStatus(Attendee::Tentative); } else { - attendee->seStatus( Attendee::NeedsAction ); + attendee->setqStatus( Attendee::NeedsAction ); attendee->setRole( Attendee::ReqParticipant ); } event->addAttendee(attendee); @@ -2947,13 +2947,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) true ); if( bIsReply ) { if( bCompatMethodAccepted ) - attendee->seStatus( Attendee::Accepted ); + attendee->setqStatus( Attendee::Accepted ); if( bCompatMethodAcceptedCond ) - attendee->seStatus( Attendee::Declined ); + attendee->setqStatus( Attendee::Declined ); if( bCompatMethodDeclined ) - attendee->seStatus( Attendee::Tentative ); + attendee->setqStatus( Attendee::Tentative ); } else { - attendee->seStatus(Attendee::NeedsAction); + attendee->setqStatus(Attendee::NeedsAction); attendee->setRole(Attendee::ReqParticipant); } event->addAttendee(attendee); @@ -2990,7 +2990,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) // Outlook - we ignore it for now. s = tnefMsg->findProp( 0x8202 ).replace( TQChar( '-' ), TQString() ) .replace( TQChar( ':' ), TQString() ); - // ### libkcal always uses currentDateTime() + // ### libkcal always uses tqcurrentDateTime() // event->setDtStamp(TQDateTime::fromString(s)); s = tnefMsg->findNamedProp( "Keywords" ); @@ -3218,20 +3218,20 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const tmp = "<br>" + i18n("Event start", "<i>From:</i> %1"); if (event->doesFloat()) - ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); else - ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); + ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); tmp = "<br>" + i18n("Event end","<i>To:</i> %1"); if (event->doesFloat()) - ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); + ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); else - ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); + ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); } else { ret += "<br>"+i18n("<i>Date:</i> %1"). - arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); if ( !event->doesFloat() ) { const TQString dtStartTime = IncidenceFormatter::timeToString( startDt, true ).replace( " ", " " ); @@ -3240,11 +3240,11 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00' tmp = "<br>" + i18n("time for event, to prevent ugly line breaks", "<i>Time:</i> %1"). - arg( dtStartTime ); + tqarg( dtStartTime ); } else { tmp = "<br>" + i18n("time range for event, to prevent ugly line breaks", "<i>Time:</i> %1 - %2"). - arg( dtStartTime, dtEndTime ); + tqarg( dtStartTime, dtEndTime ); } ret += tmp; } @@ -3267,7 +3267,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Start:</i> %1"). - arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). + tqarg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). replace( " ", " " ) ); } @@ -3282,7 +3282,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Due:</i> %1"). - arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). + tqarg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). replace( " ", " " ) ); } @@ -3300,7 +3300,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ ret += todo->completedStr().replace( " ", " " ); } else { ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + " "; - ret += i18n( "%1%" ).arg( todo->percentComplete() ); + ret += i18n( "%1%" ).tqarg( todo->percentComplete() ); } return ret; @@ -3312,7 +3312,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) if (journal->dtStart().isValid() ) { ret += "<br>" + i18n("<i>Date:</i> %1"). - arg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); + tqarg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); } return ret; } @@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb ) { TQString tmp( "<br>" + i18n("<i>Period start:</i> %1") ); - TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); + TQString ret = tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); tmp = "<br>" + i18n("<i>Period start:</i> %1"); - ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); + ret += tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); return ret; } @@ -3349,7 +3349,7 @@ bool IncidenceFormatter::ToolTipVisitor::visit( Journal *journal ) bool IncidenceFormatter::ToolTipVisitor::visit( FreeBusy *fb ) { mResult = "<qt><b>" + i18n("Free/Busy information for %1") - .arg(fb->organizer().fullName()) + "</b>"; + .tqarg(fb->organizer().fullName()) + "</b>"; mResult += dateRangeText( fb ); mResult += "</qt>"; return !mResult.isEmpty(); @@ -3405,10 +3405,10 @@ static TQString tooltipFormatAttendeeRoleList( Incidence *incidence, Attendee::R } tmpStr += tooltipPerson( a->email(), a->name() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); } tmpStr += sep; i++; @@ -3588,13 +3588,13 @@ static TQString mailBodyIncidence( Incidence *incidence ) { TQString body; if ( !incidence->summary().isEmpty() ) { - body += i18n("Summary: %1\n").arg( incidence->summary() ); + body += i18n("Summary: %1\n").tqarg( incidence->summary() ); } if ( !incidence->organizer().isEmpty() ) { - body += i18n("Organizer: %1\n").arg( incidence->organizer().fullName() ); + body += i18n("Organizer: %1\n").tqarg( incidence->organizer().fullName() ); } if ( !incidence->location().isEmpty() ) { - body += i18n("Location: %1\n").arg( incidence->location() ); + body += i18n("Location: %1\n").tqarg( incidence->location() ); } return body; } @@ -3608,26 +3608,26 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult = mailBodyIncidence( event ); mResult += i18n("Start Date: %1\n"). - arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); if ( !event->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - arg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); + tqarg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); } if ( event->dtStart() != event->dtEnd() ) { mResult += i18n("End Date: %1\n"). - arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } if ( !event->doesFloat() ) { mResult += i18n("End Time: %1\n"). - arg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); + tqarg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } if ( event->doesRecur() ) { Recurrence *recur = event->recurrence(); // TODO: Merge these two to one of the form "Recurs every 3 days" mResult += i18n("Recurs: %1\n") - .arg( recurrence[ recur->recurrenceType() ] ); + .tqarg( recurrence[ recur->recurrenceType() ] ); mResult += i18n("Frequency: %1\n") - .arg( event->recurrence()->frequency() ); + .tqarg( event->recurrence()->frequency() ); if ( recur->duration() > 0 ) { mResult += i18n ("Repeats once", "Repeats %n times", recur->duration()); @@ -3641,7 +3641,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) } else { endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() ); } - mResult += i18n("Repeat until: %1\n").arg( endstr ); + mResult += i18n("Repeat until: %1\n").tqarg( endstr ); } else { mResult += i18n("Repeats forever\n"); } @@ -3652,13 +3652,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult += i18n("This recurring meeting has been cancelled on the following days:\n"); DateList::ConstIterator ex_iter; for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { - mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) ); + mResult += i18n(" %1\n").tqarg( KGlobal::locale()->formatDate(* ex_iter ) ); } } } TQString details = event->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").arg( details ); + mResult += i18n("Details:\n%1\n").tqarg( details ); } return !mResult.isEmpty(); } @@ -3669,23 +3669,23 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Todo *todo ) if ( todo->hasStartDate() ) { mResult += i18n("Start Date: %1\n"). - arg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); + tqarg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - arg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); + tqarg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); } } if ( todo->hasDueDate() ) { mResult += i18n("Due Date: %1\n"). - arg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); + tqarg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Due Time: %1\n"). - arg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); + tqarg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); } } TQString details = todo->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").arg( details ); + mResult += i18n("Details:\n%1\n").tqarg( details ); } return !mResult.isEmpty(); } @@ -3694,13 +3694,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal ) { mResult = mailBodyIncidence( journal ); mResult += i18n("Date: %1\n"). - arg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); + tqarg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); if ( !journal->doesFloat() ) { mResult += i18n("Time: %1\n"). - arg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); + tqarg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); } if ( !journal->description().isEmpty() ) - mResult += i18n("Text of the journal:\n%1\n").arg( journal->description() ); + mResult += i18n("Text of the journal:\n%1\n").tqarg( journal->description() ); return !mResult.isEmpty(); } @@ -3813,9 +3813,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rMinutely: recurStr = i18n( "Recurs every minute", "Recurs every %n minutes", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } @@ -3824,9 +3824,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rHourly: recurStr = i18n( "Recurs hourly", "Recurs every %n hours", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } @@ -3836,9 +3836,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) recurStr = i18n( "Recurs daily", "Recurs every %n days", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } @@ -3863,13 +3863,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) } if ( recur->duration() != -1 ) { txt = i18n( "%1 on %2 until %3" ). - arg( recurStr ).arg( dayNames ).arg( recurEnd( incidence ) ); + tqarg( recurStr ).tqarg( dayNames ).tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } - txt = i18n( "%1 on %2" ).arg( recurStr ).arg( dayNames ); + txt = i18n( "%1 on %2" ).tqarg( recurStr ).tqarg( dayNames ); return txt; } case Recurrence::rMonthlyPos: @@ -3880,19 +3880,19 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->monthPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 until %4" ). - arg( recurStr ). - arg( dayList[rule.pos() + 31] ). - arg( calSys->weekDayName( rule.day(), false ) ). - arg( recurEnd( incidence ) ); + tqarg( recurStr ). + tqarg( dayList[rule.pos() + 31] ). + tqarg( calSys->weekDayName( rule.day(), false ) ). + tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3" ). - arg( recurStr ). - arg( dayList[rule.pos() + 31] ). - arg( calSys->weekDayName( rule.day(), false ) ); + tqarg( recurStr ). + tqarg( dayList[rule.pos() + 31] ). + tqarg( calSys->weekDayName( rule.day(), false ) ); return txt; } else { return recurStr; @@ -3907,15 +3907,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) int days = recur->monthDays()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 day until %3" ). - arg( recurStr ). - arg( dayList[days + 31] ). - arg( recurEnd( incidence ) ); + tqarg( recurStr ). + tqarg( dayList[days + 31] ). + tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } - txt = i18n( "%1 on the %2 day" ).arg( recurStr ).arg( dayList[days + 31] ); + txt = i18n( "%1 on the %2 day" ).tqarg( recurStr ).tqarg( dayList[days + 31] ); return txt; } else { return recurStr; @@ -3929,33 +3929,33 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( recur->duration() != -1 ) { if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3 until %4" ). - arg( recurStr ). - arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - arg( dayList[ recur->yearDates()[0] + 31 ] ). - arg( recurEnd( incidence ) ); + tqarg( recurStr ). + tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + tqarg( dayList[ recur->yearDates()[0] + 31 ] ). + tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } } if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3" ). - arg( recurStr ). - arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - arg( dayList[ recur->yearDates()[0] + 31 ] ); + tqarg( recurStr ). + tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + tqarg( dayList[ recur->yearDates()[0] + 31 ] ); return txt; } else { if ( !recur->yearMonths().isEmpty() ) { txt = i18n( "Recurs yearly on %1 %2" ). - arg( calSys->monthName( recur->yearMonths()[0], + tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - arg( dayList[ recur->startDate().day() + 31 ] ); + tqarg( dayList[ recur->startDate().day() + 31 ] ); } else { txt = i18n( "Recurs yearly on %1 %2" ). - arg( calSys->monthName( recur->startDate().month(), + tqarg( calSys->monthName( recur->startDate().month(), recur->startDate().year() ) ). - arg( dayList[ recur->startDate().day() + 31 ] ); + tqarg( dayList[ recur->startDate().day() + 31 ] ); } return txt; } @@ -3967,15 +3967,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( !recur->yearDays().isEmpty() ) { if ( recur->duration() != -1 ) { txt = i18n( "%1 on day %2 until %3" ). - arg( recurStr ). - arg( recur->yearDays()[0] ). - arg( recurEnd( incidence ) ); + tqarg( recurStr ). + tqarg( recur->yearDays()[0] ). + tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } - txt = i18n( "%1 on day %2" ).arg( recurStr ).arg( recur->yearDays()[0] ); + txt = i18n( "%1 on day %2" ).tqarg( recurStr ).tqarg( recur->yearDays()[0] ); return txt; } else { return recurStr; @@ -3989,21 +3989,21 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->yearPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 of %4 until %5" ). - arg( recurStr ). - arg( dayList[rule.pos() + 31] ). - arg( calSys->weekDayName( rule.day(), false ) ). - arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - arg( recurEnd( incidence ) ); + tqarg( recurStr ). + tqarg( dayList[rule.pos() + 31] ). + tqarg( calSys->weekDayName( rule.day(), false ) ). + tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + tqarg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3 of %4" ). - arg( recurStr ). - arg( dayList[rule.pos() + 31] ). - arg( calSys->weekDayName( rule.day(), false ) ). - arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); + tqarg( recurStr ). + tqarg( dayList[rule.pos() + 31] ). + tqarg( calSys->weekDayName( rule.day(), false ) ). + tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); return txt; } else { return recurStr; @@ -4184,18 +4184,18 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool } if ( offset == 0 ) { if ( !atStr.isEmpty() ) { - remStr = i18n( "reminder occurs at datetime", "at %1" ).arg( atStr ); + remStr = i18n( "reminder occurs at datetime", "at %1" ).tqarg( atStr ); } } else { - remStr = offsetStr.arg( secs2Duration( offset ) ); + remStr = offsetStr.tqarg( secs2Duration( offset ) ); } if ( alarm->repeatCount() > 0 ) { TQString countStr = i18n( "repeats once", "repeats %n times", alarm->repeatCount() ); TQString intervalStr = i18n( "interval is N days/hours/minutes", "interval is %1" ). - arg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); + tqarg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); TQString repeatStr = i18n( "(repeat string, interval string)", "(%1, %2)" ). - arg( countStr, intervalStr ); + tqarg( countStr, intervalStr ); remStr = remStr + ' ' + repeatStr; } diff --git a/libkcal/person.cpp b/libkcal/person.cpp index aad80f68..00f17ed8 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -88,7 +88,7 @@ void Person::setName(const TQString &name) void Person::setEmail(const TQString &email) { - if ( email.startsWith( "mailto:", false ) ) { + if ( email.tqstartsWith( "mailto:", false ) ) { mEmail = email.mid(7); } else { mEmail = email; diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index b91c1d1c..7b7954b7 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -23,9 +23,9 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqxml.h> #include <kdebug.h> @@ -294,7 +294,7 @@ bool TQtopiaFormat::save( Calendar *calendar, const TQString &fileName ) TQFile file( fileName ); if (!file.open( IO_WriteOnly ) ) { setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not open file '%1'").arg(fileName))); + i18n("Could not open file '%1'").tqarg(fileName))); return false; } TQTextStream ts( &file ); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index dacab7e9..bab09728 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -49,7 +49,7 @@ using namespace KCal; static bool m_editoropen = false; ResourceCached::ResourceCached( const KConfig* config ) - : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), + : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ), mReloadPolicy( ReloadNever ), mReloadInterval( 10 ), mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ), mSavePolicy( SaveNever ), mSaveInterval( 10 ), @@ -353,7 +353,7 @@ void ResourceCached::clearJournalsCache() void ResourceCached::cleanUpEventCache( const Event::List &eventList ) { - CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); if ( KStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); @@ -382,7 +382,7 @@ void ResourceCached::cleanUpEventCache( const Event::List &eventList ) void ResourceCached::cleanUpTodoCache( const Todo::List &todoList ) { - CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); if ( KStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); @@ -427,7 +427,7 @@ TQString ResourceCached::changesCacheFile( const TQString &type ) const void ResourceCached::saveChangesCache( const TQMap<Incidence*, bool> &map, const TQString &type ) { - CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); bool isEmpty = true; TQMap<Incidence *,bool>::ConstIterator it; @@ -455,7 +455,7 @@ void ResourceCached::saveChangesCache() void ResourceCached::loadChangesCache( TQMap<Incidence*, bool> &map, const TQString &type ) { - CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); if ( KStandardDirs::exists( changesCacheFile( type ) ) ) calendar.load( changesCacheFile( type ) ); @@ -689,12 +689,12 @@ void ResourceCached::addInfoText( TQString &txt ) const if ( mLastLoad.isValid() ) { txt += "<br>"; txt += i18n("Last loaded: %1") - .arg( KGlobal::locale()->formatDateTime( mLastLoad ) ); + .tqarg( KGlobal::locale()->formatDateTime( mLastLoad ) ); } if ( mLastSave.isValid() ) { txt += "<br>"; txt += i18n("Last saved: %1") - .arg( KGlobal::locale()->formatDateTime( mLastSave ) ); + .tqarg( KGlobal::locale()->formatDateTime( mLastSave ) ); } } diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index 0277ddcc..caa1fddf 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -20,7 +20,7 @@ */ #include <tqbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqhbox.h> diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index 9f611e75..d398357d 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -74,7 +74,7 @@ TQString ResourceCalendar::infoText() const KRES::Factory *factory = KRES::Factory::self( "calendar" ); TQString t = factory->typeName( type() ); - txt += i18n("Type: %1").arg( t ); + txt += i18n("Type: %1").tqarg( t ); addInfoText( txt ); @@ -172,7 +172,7 @@ void ResourceCalendar::loadError( const TQString &err ) mReceivedLoadError = true; - TQString msg = i18n("Error while loading %1.\n") .arg( resourceName() ); + TQString msg = i18n("Error while loading %1.\n") .tqarg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } @@ -209,7 +209,7 @@ void ResourceCalendar::saveError( const TQString &err ) mReceivedSaveError = true; - TQString msg = i18n("Error while saving %1.\n") .arg( resourceName() ); + TQString msg = i18n("Error while saving %1.\n") .tqarg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index ac92aad9..e237037c 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -23,7 +23,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kmessagebox.h> @@ -88,7 +88,7 @@ void ResourceLocalConfig::saveSettings( KRES::Resource *resource ) for( int i = 0; file.exists(); ++i ) file.setName( saveFolder + "/std" + TQString::number(i) + ".ics" ); - KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).arg( file.name() ) ); + KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).tqarg( file.name() ) ); url = file.name(); } diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index 71f70bc0..df2412b3 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -22,7 +22,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 2700374f..70f4dbdf 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -39,14 +39,14 @@ using namespace KCal; -ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::Status status) +ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::tqStatus status) { mIncidence = incidence; mMethod = method; - mStatus = status; + mtqStatus = status; } -TQString ScheduleMessage::statusName(ScheduleMessage::Status status) +TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status) { switch (status) { case PublishUpdate: @@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::Status status) case RequestUpdate: return i18n("Updated Request"); default: - return i18n("Unknown Status: %1").arg(TQString::number(status)); + return i18n("Unknown Status: %1").tqarg(TQString::number(status)); } } @@ -99,7 +99,7 @@ FreeBusyCache *Scheduler::freeBusyCache() const bool Scheduler::acceptTransaction( IncidenceBase *incidence, Method method, - ScheduleMessage::Status status, + ScheduleMessage::tqStatus status, const TQString &attendee ) { kdDebug(5800) << "Scheduler::acceptTransaction, method=" @@ -133,23 +133,23 @@ TQString Scheduler::methodName(Method method) { switch (method) { case Publish: - return TQString::fromLatin1("Publish"); + return TQString::tqfromLatin1("Publish"); case Request: - return TQString::fromLatin1("Request"); + return TQString::tqfromLatin1("Request"); case Refresh: - return TQString::fromLatin1("Refresh"); + return TQString::tqfromLatin1("Refresh"); case Cancel: - return TQString::fromLatin1("Cancel"); + return TQString::tqfromLatin1("Cancel"); case Add: - return TQString::fromLatin1("Add"); + return TQString::tqfromLatin1("Add"); case Reply: - return TQString::fromLatin1("Reply"); + return TQString::tqfromLatin1("Reply"); case Counter: - return TQString::fromLatin1("Counter"); + return TQString::tqfromLatin1("Counter"); case Declinecounter: - return TQString::fromLatin1("Decline Counter"); + return TQString::tqfromLatin1("Decline Counter"); default: - return TQString::fromLatin1("Unknown"); + return TQString::tqfromLatin1("Unknown"); } } @@ -183,7 +183,7 @@ bool Scheduler::deleteTransaction(IncidenceBase *) } bool Scheduler::acceptPublish( IncidenceBase *newIncBase, - ScheduleMessage::Status status, Method method ) + ScheduleMessage::tqStatus status, Method method ) { if( newIncBase->type() == "FreeBusy" ) { return acceptFreeBusy( newIncBase, method ); @@ -225,7 +225,7 @@ bool Scheduler::acceptPublish( IncidenceBase *newIncBase, } bool Scheduler::acceptRequest( IncidenceBase *incidence, - ScheduleMessage::Status status, + ScheduleMessage::tqStatus status, const TQString &attendee ) { Incidence *inc = static_cast<Incidence *>(incidence); @@ -389,14 +389,14 @@ TryAgain: return true; } -bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::Status /* status */) +bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) { deleteTransaction(incidence); return false; } bool Scheduler::acceptCancel( IncidenceBase *incidence, - ScheduleMessage::Status status, + ScheduleMessage::tqStatus status, const TQString &attendee ) { Incidence *inc = static_cast<Incidence *>( incidence ); @@ -492,7 +492,7 @@ bool Scheduler::acceptCancel( IncidenceBase *incidence, return ret; } -bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* status */) +bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) { const IncidenceBase *toDelete = mCalendar->incidenceFromSchedulingID( incidence->uid() ); @@ -525,19 +525,19 @@ bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* return ret; } -bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) +bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) { deleteTransaction(incidence); return false; } -//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::Status status) +//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::tqStatus status) //{ // deleteTransaction(incidence); // return false; //} -bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* status */, Method method) +bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */, Method method) { if(incidence->type()=="FreeBusy") { return acceptFreeBusy(incidence, method); @@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* if (attIn->email().lower()==attEv->email().lower()) { //update attendee-info kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl; - attEv->seStatus(attIn->status()); + attEv->setqStatus(attIn->status()); attEv->setDelegate(attIn->delegate()); attEv->setDelegator(attIn->delegator()); ret = true; @@ -590,12 +590,12 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* bool attendeeAdded = false; for ( Attendee::List::ConstIterator it = attendeesNew.constBegin(); it != attendeesNew.constEnd(); ++it ) { Attendee* attNew = *it; - TQString msg = i18n("%1 wants to attend %2 but was not invited.").arg( attNew->fullName() ) - .arg( ev ? ev->summary() : to->summary() ); + TQString msg = i18n("%1 wants to attend %2 but was not invited.").tqarg( attNew->fullName() ) + .tqarg( ev ? ev->summary() : to->summary() ); if ( !attNew->delegator().isEmpty() ) - msg = i18n("%1 wants to attend %2 on behalf of %3.").arg( attNew->fullName() ) - .arg( ev ? ev->summary() : to->summary() ) - .arg( attNew->delegator() ); + msg = i18n("%1 wants to attend %2 on behalf of %3.").tqarg( attNew->fullName() ) + .tqarg( ev ? ev->summary() : to->summary() ) + .tqarg( attNew->delegator() ); if ( KMessageBox::questionYesNo( 0, msg, i18n("Uninvited attendee"), KGuiItem(i18n("Accept Attendance")), KGuiItem(i18n("Reject Attendance")) ) != KMessageBox::Yes ) @@ -668,14 +668,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* return ret; } -bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::Status /* status */) +bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) { // handled in korganizer's IncomingDialog deleteTransaction(incidence); return false; } -bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) +bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) { deleteTransaction(incidence); return false; diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h index 4d97ab51..ceeace4a 100644 --- a/libkcal/scheduler.h +++ b/libkcal/scheduler.h @@ -47,14 +47,14 @@ class ScheduleMessage /** Message status. */ - enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew, + enum tqStatus { PublishNew, PublishUpdate, Obsolete, RequestNew, RequestUpdate, Unknown }; /** Create a scheduling message with method as defined in Scheduler::Method and a status. */ - ScheduleMessage( IncidenceBase *, int method, Status status ); + ScheduleMessage( IncidenceBase *, int method, tqStatus status ); ~ScheduleMessage() {}; /** @@ -68,7 +68,7 @@ class ScheduleMessage /** Return status of this message. */ - Status status() { return mStatus; } + tqStatus status() { return mtqStatus; } /** Return error message if there is any. */ @@ -77,12 +77,12 @@ class ScheduleMessage /** Return a human-readable name for an iTIP message status. */ - static TQString statusName( Status status ); + static TQString statusName( tqStatus status ); private: IncidenceBase *mIncidence; int mMethod; - Status mStatus; + tqStatus mtqStatus; TQString mError; class Private; @@ -140,7 +140,7 @@ class LIBKCAL_EXPORT Scheduler on who's behalf this transaction is to be performed. */ bool acceptTransaction( IncidenceBase *, Method method, - ScheduleMessage::Status status, + ScheduleMessage::tqStatus status, const TQString& attendee = TQString() ); /** @@ -169,20 +169,20 @@ class LIBKCAL_EXPORT Scheduler FreeBusyCache *freeBusyCache() const; protected: - bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status, + bool acceptPublish( IncidenceBase *, ScheduleMessage::tqStatus status, Method method ); - bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, + bool acceptRequest( IncidenceBase *, ScheduleMessage::tqStatus status, const TQString & attendee ); - bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status ); - KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); - bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status, + bool acceptAdd( IncidenceBase *, ScheduleMessage::tqStatus status ); + KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status ); + bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status, const TQString & attendee ); bool acceptDeclineCounter( IncidenceBase *, - ScheduleMessage::Status status ); - bool acceptReply( IncidenceBase *, ScheduleMessage::Status status, + ScheduleMessage::tqStatus status ); + bool acceptReply( IncidenceBase *, ScheduleMessage::tqStatus status, Method method ); - bool acceptRefresh( IncidenceBase *, ScheduleMessage::Status status ); - bool acceptCounter( IncidenceBase *, ScheduleMessage::Status status ); + bool acceptRefresh( IncidenceBase *, ScheduleMessage::tqStatus status ); + bool acceptCounter( IncidenceBase *, ScheduleMessage::tqStatus status ); bool acceptFreeBusy( IncidenceBase *, Method method ); Calendar *mCalendar; diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index be70a7c8..8088c1d6 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -13,7 +13,7 @@ int main() { ICalFormat f; - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); Event *event1 = new Event; event1->setSummary("A"); diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index 076f55cb..a1ab5493 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -71,7 +71,7 @@ int main( int argc, char **argv ) kdDebug(5800) << "Output file: " << output << endl; - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index 7d781fc5..48fb68aa 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -48,7 +48,7 @@ int main(int argc,char **argv) Q_UNUSED( args ); - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); cal.save("mycal"); } diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index 6e63faa9..cc835927 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -50,18 +50,18 @@ int main(int argc,char **argv) Q_UNUSED(args) - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); - TQString file = TQString::fromLatin1( INPUT ); + TQString file = TQString::tqfromLatin1( INPUT ); if (!cal.load( file ) ) { kdError() << "Can't load " << file << endl; return 1; } - // 2 tests... first uid should result in a syncStatus of 0. second uid - // should have a new summary and a 1 for syncStatus. - TQString uid1 = TQString::fromLatin1("KOrganizer-1345486115.965"); - TQString uid2 = TQString::fromLatin1("KOrganizer-1345486115.967"); + // 2 tests... first uid should result in a synctqStatus of 0. second uid + // should have a new summary and a 1 for synctqStatus. + TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965"); + TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967"); Event *e = cal.event( uid1 ); if (!e) { @@ -78,7 +78,7 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "Pilot ID = " << e->pilotId() << endl; - kdDebug() << "Pilot Sync Status = " << e->syncStatus() << endl; + kdDebug() << "Pilot Sync Status = " << e->synctqStatus() << endl; } else { kdError() << "No Pilot ID" << endl; return 1; @@ -86,9 +86,9 @@ int main(int argc,char **argv) kdDebug() << "First test passed. Able to read fields." << endl; - e->setSyncStatus(KCal::Incidence::SYNCNONE); + e->setSynctqStatus(KCal::Incidence::SYNCNONE); - TQString newSummary = TQString::fromLatin1("Mooo summary"); + TQString newSummary = TQString::tqfromLatin1("Mooo summary"); Event *f = new Event(*e); @@ -112,7 +112,7 @@ int main(int argc,char **argv) // now try to read the file back in and see if our changes made it - CalendarLocal cal2( TQString::fromLatin1("UTC") ); + CalendarLocal cal2( TQString::tqfromLatin1("UTC") ); if (!cal2.load( filew ) ) { kdError() << "Can't load " << filew << endl; return 1; @@ -120,7 +120,7 @@ int main(int argc,char **argv) TQFile::remove( filew ); - // check for uid1--should have syncStatus of 0 + // check for uid1--should have synctqStatus of 0 e = cal2.event( uid1 ); if (!e) { kdError() << "No event for first read test" << uid1 << endl; @@ -131,13 +131,13 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "First Pilot ID = " << e->pilotId() << endl; - kdDebug() << "First Pilot Sync Status = " << e->syncStatus() << endl; + kdDebug() << "First Pilot Sync Status = " << e->synctqStatus() << endl; } else { kdError() << "No Pilot ID for first test" << endl; return 1; } - if (e->syncStatus() != KCal::Incidence::SYNCNONE) { + if (e->synctqStatus() != KCal::Incidence::SYNCNONE) { kdError() << "Wrong Pilot sync status." << endl; return 1; } @@ -154,13 +154,13 @@ int main(int argc,char **argv) if (f->pilotId()) { kdDebug() << "Second Pilot ID = " << f->pilotId() << endl; - kdDebug() << "Second Pilot Sync Status = " << f->syncStatus() << endl; + kdDebug() << "Second Pilot Sync Status = " << f->synctqStatus() << endl; } else { kdError() << "No Pilot ID for second read test" << endl; return 1; } - if (f->syncStatus() != KCal::Incidence::SYNCMOD) { + if (f->synctqStatus() != KCal::Incidence::SYNCMOD) { kdError() << "Wrong Pilot sync status for second read test." << endl; return 1; } diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp index 4fc87b9e..ca65dbfd 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index 6499abfc..bc1c0d37 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index 6499abfc..bc1c0d37 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index e8e33e2b..fe949f6d 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index 7f8b61c0..9e76dcd9 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -75,7 +75,7 @@ int main( int argc, char **argv ) kdDebug(5800) << "Output file: " << output << endl; - CalendarLocal cal( TQString::fromLatin1("UTC") ); + CalendarLocal cal( TQString::tqfromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index b3fe65d9..c527cbbc 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -288,7 +288,7 @@ TQDateTime Todo::dtRecurrence() const bool Todo::recursOn( const TQDate &date ) const { - TQDate today = TQDate::currentDate(); + TQDate today = TQDate::tqcurrentDate(); return ( Incidence::recursOn(date) && !( date < today && mDtRecurrence.date() < today && mDtRecurrence > recurrence()->startDateTime() ) ); @@ -304,7 +304,7 @@ bool Todo::recurTodo() if ( ( r->duration() == -1 || ( nextDate.isValid() && endDateTime.isValid() && nextDate <= endDateTime ) ) ) { - while ( !recursAt( nextDate ) || nextDate <= TQDateTime::currentDateTime() ) { + while ( !recursAt( nextDate ) || nextDate <= TQDateTime::tqcurrentDateTime() ) { if ( !nextDate.isValid() || ( nextDate > endDateTime && r->duration() != -1 ) ) { @@ -327,7 +327,7 @@ bool Todo::recurTodo() bool Todo::isOverdue() const { - bool inPast = doesFloat() ? dtDue().date() < TQDate::currentDate() - : dtDue() < TQDateTime::currentDateTime(); + bool inPast = doesFloat() ? dtDue().date() < TQDate::tqcurrentDate() + : dtDue() < TQDateTime::tqcurrentDateTime(); return ( inPast && !isCompleted() ); } diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp index 9bcfdb8d..853c5187 100644 --- a/libkcal/vcaldrag.cpp +++ b/libkcal/vcaldrag.cpp @@ -42,7 +42,7 @@ bool VCalDrag::decode( TQMimeSource *de, Calendar *cal ) { bool success = false; - TQByteArray payload = de->encodedData( "text/x-vCalendar" ); + TQByteArray payload = de->tqencodedData( "text/x-vCalendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 8525b0de..16deee5b 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqdialog.h> #include <tqfile.h> @@ -262,7 +262,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl; VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit()); addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE"); - addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status())); } } @@ -355,7 +355,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) // pilot sync stuff tmpStr.sprintf("%lu",anEvent->pilotId()); addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit()); - tmpStr.sprintf("%i",anEvent->syncStatus()); + tmpStr.sprintf("%i",anEvent->synctqStatus()); addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit()); } @@ -422,7 +422,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl; VObject *aProp = addPropValue(vevent, VCAttendeeProp, tmpStr.local8Bit()); addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE"); - addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status())); } } @@ -641,7 +641,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) // pilot sync stuff tmpStr.sprintf("%lu",anEvent->pilotId()); addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit()); - tmpStr.sprintf("%i",anEvent->syncStatus()); + tmpStr.sprintf("%i",anEvent->synctqStatus()); addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit()); } @@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::currentDate(), + anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), TQTime::currentTime())); // organizer @@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) a->setRSVP(vObjectStringZValue(vp)); // is there a status property? if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0) - a->seStatus(readStatus(vObjectStringZValue(vp))); + a->setqStatus(readtqStatus(vObjectStringZValue(vp))); // add the attendee anEvent->addAttendee(a); } @@ -845,11 +845,11 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) anEvent->setPilotId(0); if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) { - anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSyncStatus(Event::SYNCMOD); + anEvent->setSynctqStatus(Event::SYNCMOD); return anEvent; } @@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::currentDate(), + anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), TQTime::currentTime())); // organizer @@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) a->setRSVP(vObjectStringZValue(vp)); // is there a status property? if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0) - a->seStatus(readStatus(vObjectStringZValue(vp))); + a->setqStatus(readtqStatus(vObjectStringZValue(vp))); // add the attendee anEvent->addAttendee(a); } @@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo))); deleteStr(s); // TODO: Define Event status -// anEvent->seStatus(tmpStr); +// anEvent->setqStatus(tmpStr); } else -// anEvent->seStatus("NEEDS ACTION"); +// anEvent->setqStatus("NEEDS ACTION"); #endif // secrecy @@ -1311,11 +1311,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setPilotId(0); if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) { - anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSyncStatus(Event::SYNCMOD); + anEvent->setSynctqStatus(Event::SYNCMOD); return anEvent; } @@ -1565,7 +1565,7 @@ int VCalFormat::numFromDay(const TQString &day) return -1; // something bad happened. :) } -Attendee::PartStat VCalFormat::readStatus(const char *s) const +Attendee::PartStat VCalFormat::readtqStatus(const char *s) const { TQString statStr = s; statStr = statStr.upper(); @@ -1597,7 +1597,7 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const return status; } -TQCString VCalFormat::writeStatus(Attendee::PartStat status) const +TQCString VCalFormat::writetqStatus(Attendee::PartStat status) const { switch(status) { default: diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index facda241..0e1818a2 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -103,8 +103,8 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat /** the reverse of the above function. */ int numFromDay(const TQString &day); - Attendee::PartStat readStatus(const char *s) const; - TQCString writeStatus(Attendee::PartStat status) const; + Attendee::PartStat readtqStatus(const char *s) const; + TQCString writetqStatus(Attendee::PartStat status) const; private: Calendar *mCalendar; diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index 5f38fe00..e51acb6d 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -228,9 +228,9 @@ Use the API isAPropertyOf() to query if a name match the name of VObject tree can be pretty printed with the printVObject() function. The output of pretty printing a VObject representation of the input test file "vobject.vcf" is shown below. Note that the indentation -indicates the tree hirerarchy where the immediate children nodes +indicates the tree hirerarchy where the immediate tqchildren nodes of a parent node is all at the same indentation level and the -immediate children nodes are the immediate properties of the +immediate tqchildren nodes are the immediate properties of the associated parent nodes. In the following, {N,FN,ORG,TITLE,...} are immediate properties of VCARD. {F and G} are properties of N with value {"Alden" and "Roland"} respectively; FN has no property @@ -391,7 +391,7 @@ c. values of a property is determined by the property definition itself. The vobject APIs does not attempt to enforce any of such definition. It is the consumer responsibility to know what value is expected from a property. e.g - most properties have unicode string value, so to access + most properties have tqunicode string value, so to access the value of these type of properties, you will use the vObjectUStringZValue() to read the value and setVObjectUStringZValue() to set or modify the value. @@ -498,7 +498,7 @@ d. properties name (id) are case incensitive. const wchar_t* vObjectUStringZValue(VObject *o); -- retrieve the VObject's value interpreted as - null-terminated unicode string. + null-terminated tqunicode string. unsigned int vObjectIntegerValue(VObject *o); -- retrieve the VObject's value interpreted as @@ -578,7 +578,7 @@ d. properties name (id) are case incensitive. -- convert char* to wchar_t*. extern int uStrLen(const wchar_t *u); - -- length of unicode u. + -- length of tqunicode u. char *fakeCString(const wchar_t *u); -- convert wchar_t to CString (blindly assumes that |