diff options
Diffstat (limited to 'libkcal')
33 files changed, 177 insertions, 177 deletions
diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index a34f97598..d129bc36b 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; - mtqStatus = s; + mStatus = s; mRole = r; mUid = u; } @@ -53,19 +53,19 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 ) a1.delegator() == a2.delegator() ); } -void Attendee::setqStatus( Attendee::PartStat s ) +void Attendee::seStatus( Attendee::PartStat s ) { - mtqStatus = s; + mStatus = s; } Attendee::PartStat Attendee::status() const { - return mtqStatus; + return mStatus; } TQString Attendee::statusStr() const { - return statusName( mtqStatus ); + return statusName( mStatus ); } TQString Attendee::statusName( Attendee::PartStat s ) diff --git a/libkcal/attendee.h b/libkcal/attendee.h index 609974e9d..bf29fb485 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 tqStatus (see enum for list) + @param status Status (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 setqStatus( PartStat s ); + void seStatus( PartStat s ); /** Return status. @@ -146,7 +146,7 @@ class LIBKCAL_EXPORT Attendee : public Person private: bool mRSVP; Role mRole; - PartStat mtqStatus; + PartStat mStatus; TQString mUid; TQString mDelegate; TQString mDelegator; diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 897e90175..6fbb39c31 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -960,8 +960,8 @@ void Calendar::setModified( bool modified ) void Calendar::incidenceUpdated( IncidenceBase *incidence ) { - incidence->setSynctqStatus( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidence->setSyncStatus( Event::SYNCMOD ); + incidence->setLastModified( TQDateTime::currentDateTime() ); // 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 310c65d23..f49f527ca 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -499,7 +499,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms, void CalendarLocal::incidenceUpdated( IncidenceBase *incidence ) { incidence->setSyncStatusSilent( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidence->setLastModified( TQDateTime::currentDateTime() ); // 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 39993e448..f4b07789c 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::tqfromLatin1( "UTC" ) ); + if ( !mSelf ) mSelf = new CalendarNull( TQString::fromLatin1( "UTC" ) ); return mSelf; } diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 1b884b6a2..a2ba6738c 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::tqfromLatin1( "calendar" ) ); + const TQString &family = TQString::fromLatin1( "calendar" ) ); /** Destructor diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp index c065bf448..898ec79cf 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::tqcurrentDateTime() ) { + TQDateTime::currentDateTime() ) { return false; } } if( ( mCriteria & HideInactiveTodos ) && ( todo->hasStartDate() && - TQDateTime::tqcurrentDateTime() < todo->dtStart() || + TQDateTime::currentDateTime() < todo->dtStart() || todo->isCompleted() ) ) return false; diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index be26c3fcf..5035622b3 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -27,8 +27,8 @@ using namespace KCal; -TQString CalFormat::mApplication = TQString::tqfromLatin1("libkcal"); -TQString CalFormat::mProductId = TQString::tqfromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); +TQString CalFormat::mApplication = TQString::fromLatin1("libkcal"); +TQString CalFormat::mProductId = TQString::fromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); CalFormat::CalFormat() diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp index 2c5f2309d..39315f5a6 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->tqencodedData( "text/calendar" ); + TQByteArray payload = de->encodedData( "text/calendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index 25feb42fa..cdf2f43f4 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (messageText.isEmpty()) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "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::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "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::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "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::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "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::tqStatus status; + ScheduleMessage::Status status; switch (result) { case ICAL_XLICCLASS_PUBLISHNEW: diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index bb53a3531..0af7b4c52 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::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" ); + return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" ); } 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::tqcurrentDateTime()); + todo->setCompleted(TQDateTime::currentDateTime()); } 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->synctqStatus())); + // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->syncStatus())); // incidence->setNonKDECustomProperty("X-PILOTID", TQString::number(incidence->pilotId())); icalproperty *p = 0; - p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8()); + p = icalproperty_new_x(TQString::number(incidence->syncStatus()).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::tqcurrentDateTime() ) ) ); + writeICalDateTime( TQDateTime::currentDateTime() ) ) ); // 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::tqfromLatin1("TRUE") ); + const bool floats = ( msade == TQString::fromLatin1("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.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "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.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "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::tqStatus stat; + Incidence::Status 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->setCustomtqStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p)))); + incidence->setCustomStatus(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->setqStatus(stat); + incidence->seStatus(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->setSynctqStatus(value.toInt()); + incidenceBase->setSyncStatus(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.tqstartsWith("mailto:", false ) ) { + if ( email.startsWith("mailto:", false ) ) { email = email.mid( 7 ); } TQString name; diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 0c27da432..b26b62147 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -33,7 +33,7 @@ using namespace KCal; Incidence::Incidence() : IncidenceBase(), - mRelatedTo(0), mtqStatus(StatusNone), mSecrecy(SecrecyPublic), + mRelatedTo(0), mStatus(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; - mtqStatus = i.mtqStatus; + mStatus = i.mStatus; 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; - mtqStatus = i.mtqStatus; + mStatus = i.mStatus; 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() && - mtqStatus == i2.mtqStatus && - ( mtqStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) && + mStatus == i2.mStatus && + ( mStatus == 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::tqcurrentDateTime()); + setCreated(TQDateTime::currentDateTime()); setUid(CalFormat::createUniqueId()); setSchedulingID( TQString() ); setRevision(0); - setLastModified(TQDateTime::tqcurrentDateTime()); + setLastModified(TQDateTime::currentDateTime()); setPilotId( 0 ); - setSynctqStatus( SYNCNONE ); + setSyncStatus( SYNCNONE ); } void Incidence::setReadOnly( bool readOnly ) @@ -738,35 +738,35 @@ int Incidence::priority() const return mPriority; } -void Incidence::setqStatus(Incidence::tqStatus status) +void Incidence::seStatus(Incidence::Status status) { if (mReadOnly || status == StatusX) return; - mtqStatus = status; + mStatus = status; mStatusString = TQString(); updated(); } -void Incidence::setCustomtqStatus(const TQString &status) +void Incidence::setCustomStatus(const TQString &status) { if (mReadOnly) return; - mtqStatus = status.isEmpty() ? StatusNone : StatusX; + mStatus = status.isEmpty() ? StatusNone : StatusX; mStatusString = status; updated(); } -Incidence::tqStatus Incidence::status() const +Incidence::Status Incidence::status() const { - return mtqStatus; + return mStatus; } TQString Incidence::statusStr() const { - if (mtqStatus == StatusX) + if (mStatus == StatusX) return mStatusString; - return statusName(mtqStatus); + return statusName(mStatus); } -TQString Incidence::statusName(Incidence::tqStatus status) +TQString Incidence::statusName(Incidence::Status status) { switch (status) { case StatusTentative: return i18n("incidence status", "Tentative"); diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 089056fba..c1aa402b6 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 tqStatus { + enum Status { StatusNone, StatusTentative, StatusConfirmed, StatusCompleted, StatusNeedsAction, StatusCanceled, StatusInProcess, StatusDraft, StatusFinal, @@ -352,7 +352,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// %%%%% Secrecy and tqStatus methods +// %%%%% Secrecy and Status 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 setqStatus( tqStatus status ); + void seStatus( Status 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 setCustomtqStatus( const TQString &status ); + void setCustomStatus( const TQString &status ); /** Return the event's status. */ - tqStatus status() const; + Status 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( tqStatus ); + static TQString statusName( Status ); // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -566,7 +566,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ TQStringList mResources; TQString mStatusString; - tqStatus mtqStatus; + Status mStatus; int mSecrecy; int mPriority; // 1 = highest, 2 = less, etc. diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index d5dbef56c..a8a6bdb05 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 ), mSynctqStatus( SYNCMOD ) + mPilotId( 0 ), mSyncStatus( SYNCMOD ) { setUid( CalFormat::createUniqueId() ); @@ -56,7 +56,7 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : mFloats = i.mFloats; mLastModified = i.mLastModified; mPilotId = i.mPilotId; - mSynctqStatus = i.mSynctqStatus; + mSyncStatus = i.mSyncStatus; 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; - mSynctqStatus = i.mSynctqStatus; + mSyncStatus = i.mSyncStatus; 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() && - synctqStatus() == i2.synctqStatus() ); + syncStatus() == i2.syncStatus() ); // 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.tqstartsWith("MAILTO:", false) ) + if ( mail.startsWith("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::setSynctqStatus(int stat) +void IncidenceBase::setSyncStatus(int stat) { if (mReadOnly) return; - if ( mSynctqStatus == stat ) return; - mSynctqStatus = stat; + if ( mSyncStatus == stat ) return; + mSyncStatus = stat; updatedSilent(); } void IncidenceBase::setSyncStatusSilent(int stat) { if (mReadOnly) return; - mSynctqStatus = stat; + mSyncStatus = stat; } -int IncidenceBase::synctqStatus() const +int IncidenceBase::syncStatus() const { - return mSynctqStatus; + return mSyncStatus; } void IncidenceBase::setPilotId( unsigned long id ) diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 7d4eec7ec..d54ca8791 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -235,12 +235,12 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties /** Set synchronisation satus. */ - void setSynctqStatus( int status ); + void setSyncStatus( int status ); void setSyncStatusSilent( int status ); /** Return synchronisation status. */ - int synctqStatus() const; + int syncStatus() 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 mSynctqStatus; // status (for sync) + int mSyncStatus; // status (for sync) TQPtrList<Observer> mObservers; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 49c3967aa..a220cd191 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -2426,9 +2426,9 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, // First make the text of the message TQString html; - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"border: solid 1px; margin: 0em;\"" ); - TQString tableHead = TQString::tqfromLatin1( + TQString tableHead = TQString::fromLatin1( "<div align=\"center\">" "<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr><td>").tqarg(tableStyle); @@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) KTNEFParser parser; TQBuffer buf( tnef ); - CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal cal ( TQString::fromLatin1( "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->setqStatus( Attendee::Accepted ); + attendee->seStatus( Attendee::Accepted ); if( bCompatMethodDeclined ) - attendee->setqStatus( Attendee::Declined ); + attendee->seStatus( Attendee::Declined ); if( bCompatMethodAcceptedCond ) - attendee->setqStatus(Attendee::Tentative); + attendee->seStatus(Attendee::Tentative); } else { - attendee->setqStatus( Attendee::NeedsAction ); + attendee->seStatus( 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->setqStatus( Attendee::Accepted ); + attendee->seStatus( Attendee::Accepted ); if( bCompatMethodAcceptedCond ) - attendee->setqStatus( Attendee::Declined ); + attendee->seStatus( Attendee::Declined ); if( bCompatMethodDeclined ) - attendee->setqStatus( Attendee::Tentative ); + attendee->seStatus( Attendee::Tentative ); } else { - attendee->setqStatus(Attendee::NeedsAction); + attendee->seStatus(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 tqcurrentDateTime() + // ### libkcal always uses currentDateTime() // event->setDtStamp(TQDateTime::fromString(s)); s = tnefMsg->findNamedProp( "Keywords" ); diff --git a/libkcal/person.cpp b/libkcal/person.cpp index 00f17ed84..aad80f68f 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.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "mailto:", false ) ) { mEmail = email.mid(7); } else { mEmail = email; diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index bab09728b..c61fa009d 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::tqfromLatin1( "UTC" ) ), + : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "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::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "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::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "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::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "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::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); if ( KStandardDirs::exists( changesCacheFile( type ) ) ) calendar.load( changesCacheFile( type ) ); diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 70f4dbdf5..e0d44f530 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -39,14 +39,14 @@ using namespace KCal; -ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::tqStatus status) +ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::Status status) { mIncidence = incidence; mMethod = method; - mtqStatus = status; + mStatus = status; } -TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status) +TQString ScheduleMessage::statusName(ScheduleMessage::Status status) { switch (status) { case PublishUpdate: @@ -99,7 +99,7 @@ FreeBusyCache *Scheduler::freeBusyCache() const bool Scheduler::acceptTransaction( IncidenceBase *incidence, Method method, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status status, const TQString &attendee ) { kdDebug(5800) << "Scheduler::acceptTransaction, method=" @@ -133,23 +133,23 @@ TQString Scheduler::methodName(Method method) { switch (method) { case Publish: - return TQString::tqfromLatin1("Publish"); + return TQString::fromLatin1("Publish"); case Request: - return TQString::tqfromLatin1("Request"); + return TQString::fromLatin1("Request"); case Refresh: - return TQString::tqfromLatin1("Refresh"); + return TQString::fromLatin1("Refresh"); case Cancel: - return TQString::tqfromLatin1("Cancel"); + return TQString::fromLatin1("Cancel"); case Add: - return TQString::tqfromLatin1("Add"); + return TQString::fromLatin1("Add"); case Reply: - return TQString::tqfromLatin1("Reply"); + return TQString::fromLatin1("Reply"); case Counter: - return TQString::tqfromLatin1("Counter"); + return TQString::fromLatin1("Counter"); case Declinecounter: - return TQString::tqfromLatin1("Decline Counter"); + return TQString::fromLatin1("Decline Counter"); default: - return TQString::tqfromLatin1("Unknown"); + return TQString::fromLatin1("Unknown"); } } @@ -183,7 +183,7 @@ bool Scheduler::deleteTransaction(IncidenceBase *) } bool Scheduler::acceptPublish( IncidenceBase *newIncBase, - ScheduleMessage::tqStatus status, Method method ) + ScheduleMessage::Status 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::tqStatus status, + ScheduleMessage::Status status, const TQString &attendee ) { Incidence *inc = static_cast<Incidence *>(incidence); @@ -389,14 +389,14 @@ TryAgain: return true; } -bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; } bool Scheduler::acceptCancel( IncidenceBase *incidence, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status 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::tqStatus /* status */) +bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { const IncidenceBase *toDelete = mCalendar->incidenceFromSchedulingID( incidence->uid() ); @@ -525,19 +525,19 @@ bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus return ret; } -bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; } -//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::tqStatus status) +//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::Status status) //{ // deleteTransaction(incidence); // return false; //} -bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */, Method method) +bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* status */, Method method) { if(incidence->type()=="FreeBusy") { return acceptFreeBusy(incidence, method); @@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus / if (attIn->email().lower()==attEv->email().lower()) { //update attendee-info kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl; - attEv->setqStatus(attIn->status()); + attEv->seStatus(attIn->status()); attEv->setDelegate(attIn->delegate()); attEv->setDelegator(attIn->delegator()); ret = true; @@ -668,14 +668,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus / return ret; } -bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { // handled in korganizer's IncomingDialog deleteTransaction(incidence); return false; } -bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h index ceeace4a1..4d97ab515 100644 --- a/libkcal/scheduler.h +++ b/libkcal/scheduler.h @@ -47,14 +47,14 @@ class ScheduleMessage /** Message status. */ - enum tqStatus { PublishNew, PublishUpdate, Obsolete, RequestNew, + enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew, RequestUpdate, Unknown }; /** Create a scheduling message with method as defined in Scheduler::Method and a status. */ - ScheduleMessage( IncidenceBase *, int method, tqStatus status ); + ScheduleMessage( IncidenceBase *, int method, Status status ); ~ScheduleMessage() {}; /** @@ -68,7 +68,7 @@ class ScheduleMessage /** Return status of this message. */ - tqStatus status() { return mtqStatus; } + Status status() { return mStatus; } /** 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( tqStatus status ); + static TQString statusName( Status status ); private: IncidenceBase *mIncidence; int mMethod; - tqStatus mtqStatus; + Status mStatus; 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::tqStatus status, + ScheduleMessage::Status status, const TQString& attendee = TQString() ); /** @@ -169,20 +169,20 @@ class LIBKCAL_EXPORT Scheduler FreeBusyCache *freeBusyCache() const; protected: - bool acceptPublish( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status, Method method ); - bool acceptRequest( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); - bool acceptAdd( IncidenceBase *, ScheduleMessage::tqStatus status ); - KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status ); - bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status ); + KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); + bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); bool acceptDeclineCounter( IncidenceBase *, - ScheduleMessage::tqStatus status ); - bool acceptReply( IncidenceBase *, ScheduleMessage::tqStatus status, + ScheduleMessage::Status status ); + bool acceptReply( IncidenceBase *, ScheduleMessage::Status status, Method method ); - bool acceptRefresh( IncidenceBase *, ScheduleMessage::tqStatus status ); - bool acceptCounter( IncidenceBase *, ScheduleMessage::tqStatus status ); + bool acceptRefresh( IncidenceBase *, ScheduleMessage::Status status ); + bool acceptCounter( IncidenceBase *, ScheduleMessage::Status status ); bool acceptFreeBusy( IncidenceBase *, Method method ); Calendar *mCalendar; diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index 8088c1d64..be70a7c8d 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -13,7 +13,7 @@ int main() { ICalFormat f; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); Event *event1 = new Event; event1->setSummary("A"); diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index a1ab54930..076f55cbf 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 48fb68aa0..7d781fc54 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); cal.save("mycal"); } diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index cc835927b..6e63faa98 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); - TQString file = TQString::tqfromLatin1( INPUT ); + TQString file = TQString::fromLatin1( INPUT ); if (!cal.load( file ) ) { kdError() << "Can't load " << file << endl; return 1; } - // 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"); + // 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"); 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->synctqStatus() << endl; + kdDebug() << "Pilot Sync Status = " << e->syncStatus() << 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->setSynctqStatus(KCal::Incidence::SYNCNONE); + e->setSyncStatus(KCal::Incidence::SYNCNONE); - TQString newSummary = TQString::tqfromLatin1("Mooo summary"); + TQString newSummary = TQString::fromLatin1("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::tqfromLatin1("UTC") ); + CalendarLocal cal2( TQString::fromLatin1("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 synctqStatus of 0 + // check for uid1--should have syncStatus 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->synctqStatus() << endl; + kdDebug() << "First Pilot Sync Status = " << e->syncStatus() << endl; } else { kdError() << "No Pilot ID for first test" << endl; return 1; } - if (e->synctqStatus() != KCal::Incidence::SYNCNONE) { + if (e->syncStatus() != 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->synctqStatus() << endl; + kdDebug() << "Second Pilot Sync Status = " << f->syncStatus() << endl; } else { kdError() << "No Pilot ID for second read test" << endl; return 1; } - if (f->synctqStatus() != KCal::Incidence::SYNCMOD) { + if (f->syncStatus() != 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 ca65dbfd2..4fc87b9ea 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 bc1c0d37f..6499abfc0 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 bc1c0d37f..6499abfc0 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 fe949f6dd..e8e33e2b4 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 9e76dcd99..7f8b61c09 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::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("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 c527cbbc7..b3fe65d9c 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::tqcurrentDate(); + TQDate today = TQDate::currentDate(); 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::tqcurrentDateTime() ) { + while ( !recursAt( nextDate ) || nextDate <= TQDateTime::currentDateTime() ) { 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::tqcurrentDate() - : dtDue() < TQDateTime::tqcurrentDateTime(); + bool inPast = doesFloat() ? dtDue().date() < TQDate::currentDate() + : dtDue() < TQDateTime::currentDateTime(); return ( inPast && !isCompleted() ); } diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp index 853c5187e..9bcfdb8d4 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->tqencodedData( "text/x-vCalendar" ); + TQByteArray payload = de->encodedData( "text/x-vCalendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 16deee5b7..8335ee769 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -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, writetqStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writeStatus(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->synctqStatus()); + tmpStr.sprintf("%i",anEvent->syncStatus()); 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, writetqStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writeStatus(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->synctqStatus()); + tmpStr.sprintf("%i",anEvent->syncStatus()); addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit()); } @@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), + anEvent->setLastModified(TQDateTime(TQDate::currentDate(), 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->setqStatus(readtqStatus(vObjectStringZValue(vp))); + a->seStatus(readStatus(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->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSynctqStatus(Event::SYNCMOD); + anEvent->setSyncStatus(Event::SYNCMOD); return anEvent; } @@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), + anEvent->setLastModified(TQDateTime(TQDate::currentDate(), 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->setqStatus(readtqStatus(vObjectStringZValue(vp))); + a->seStatus(readStatus(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->setqStatus(tmpStr); +// anEvent->seStatus(tmpStr); } else -// anEvent->setqStatus("NEEDS ACTION"); +// anEvent->seStatus("NEEDS ACTION"); #endif // secrecy @@ -1311,11 +1311,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setPilotId(0); if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) { - anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSynctqStatus(Event::SYNCMOD); + anEvent->setSyncStatus(Event::SYNCMOD); return anEvent; } @@ -1565,7 +1565,7 @@ int VCalFormat::numFromDay(const TQString &day) return -1; // something bad happened. :) } -Attendee::PartStat VCalFormat::readtqStatus(const char *s) const +Attendee::PartStat VCalFormat::readStatus(const char *s) const { TQString statStr = s; statStr = statStr.upper(); @@ -1597,7 +1597,7 @@ Attendee::PartStat VCalFormat::readtqStatus(const char *s) const return status; } -TQCString VCalFormat::writetqStatus(Attendee::PartStat status) const +TQCString VCalFormat::writeStatus(Attendee::PartStat status) const { switch(status) { default: diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index 0e1818a2f..facda241e 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 readtqStatus(const char *s) const; - TQCString writetqStatus(Attendee::PartStat status) const; + Attendee::PartStat readStatus(const char *s) const; + TQCString writeStatus(Attendee::PartStat status) const; private: Calendar *mCalendar; |