diff options
Diffstat (limited to 'libkcal')
77 files changed, 618 insertions, 609 deletions
diff --git a/libkcal/COPYING b/libkcal/COPYING index b05ce718..5c8730e0 100644 --- a/libkcal/COPYING +++ b/libkcal/COPYING @@ -128,7 +128,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp index 8bc40f00..a860072d 100644 --- a/libkcal/alarm.cpp +++ b/libkcal/alarm.cpp @@ -29,8 +29,8 @@ using namespace KCal; -Alarm::Alarm(Incidence *parent) - : mParent(parent), +Alarm::Alarm(Incidence *tqparent) + : mParent(tqparent), mType(Invalid), mDescription(""), // to make operator==() not fail mFile(""), // to make operator==() not fail @@ -163,7 +163,7 @@ void Alarm::setAudioFile(const TQString &audioFile) TQString Alarm::audioFile() const { - return (mType == Audio) ? mFile : TQString::null; + return (mType == Audio) ? mFile : TQString(); } void Alarm::setProcedureAlarm(const TQString &programFile, const TQString &arguments) @@ -184,7 +184,7 @@ void Alarm::setProgramFile(const TQString &programFile) TQString Alarm::programFile() const { - return (mType == Procedure) ? mFile : TQString::null; + return (mType == Procedure) ? mFile : TQString(); } void Alarm::setProgramArguments(const TQString &arguments) @@ -197,7 +197,7 @@ void Alarm::setProgramArguments(const TQString &arguments) TQString Alarm::programArguments() const { - return (mType == Procedure) ? mDescription : TQString::null; + return (mType == Procedure) ? mDescription : TQString(); } void Alarm::setEmailAlarm(const TQString &subject, const TQString &text, @@ -251,7 +251,7 @@ void Alarm::setMailSubject(const TQString &mailAlarmSubject) TQString Alarm::mailSubject() const { - return (mType == Email) ? mMailSubject : TQString::null; + return (mType == Email) ? mMailSubject : TQString(); } void Alarm::setMailAttachment(const TQString &mailAttachFile) @@ -294,7 +294,7 @@ void Alarm::setMailText(const TQString &text) TQString Alarm::mailText() const { - return (mType == Email) ? mDescription : TQString::null; + return (mType == Email) ? mDescription : TQString(); } void Alarm::setDisplayAlarm(const TQString &text) @@ -315,7 +315,7 @@ void Alarm::setText(const TQString &text) TQString Alarm::text() const { - return (mType == Display) ? mDescription : TQString::null; + return (mType == Display) ? mDescription : TQString(); } void Alarm::setTime(const TQDateTime &alarmTime) @@ -476,9 +476,9 @@ Duration Alarm::endOffset() const return (mHasTime || !mEndOffset) ? Duration( 0 ) : mOffset; } -void Alarm::setParent( Incidence *parent ) +void Alarm::setParent( Incidence *tqparent ) { - mParent = parent; + mParent = tqparent; } void Alarm::customPropertyUpdated() diff --git a/libkcal/alarm.h b/libkcal/alarm.h index 893e7be4..fc85e96f 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -52,7 +52,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Construct a new alarm with variables initialized to "sane" values. */ - explicit Alarm( Incidence *parent ); + explicit Alarm( Incidence *tqparent ); /** Destruct Alarm object. */ @@ -95,7 +95,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties @param text text to display when the alarm is triggered. */ - void setDisplayAlarm( const TQString &text = TQString::null ); + void setDisplayAlarm( const TQString &text = TQString() ); /** Set the text to be displayed when the alarm is triggered. @@ -113,7 +113,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties @param audioFile optional file to play when the alarm is triggered. */ - void setAudioAlarm( const TQString &audioFile = TQString::null ); + void setAudioAlarm( const TQString &audioFile = TQString() ); /** Set the file to play when the audio alarm is triggered. Ignored if the alarm is not an audio alarm. @@ -122,7 +122,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Return the name of the audio file for the alarm. - @return The audio file for the alarm, or TQString::null if not an audio alarm. + @return The audio file for the alarm, or TQString() if not an audio alarm. */ TQString audioFile() const; @@ -133,7 +133,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties @param arguments arguments to supply to programFile. */ void setProcedureAlarm( const TQString &programFile, - const TQString &arguments = TQString::null ); + const TQString &arguments = TQString() ); /** Set the program file to execute when the alarm is triggered. Ignored if the alarm is not a procedure alarm. @@ -142,7 +142,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Return the name of the program file to execute when the alarm is triggered. - @return the program file name, or TQString::null if not a procedure alarm. + @return the program file name, or TQString() if not a procedure alarm. */ TQString programFile() const; /** @@ -153,7 +153,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Return the arguments to the program to run when the alarm is triggered. - @return the program arguments, or TQString::null if not a procedure alarm. + @return the program arguments, or TQString() if not a procedure alarm. */ TQString programArguments() const; @@ -227,7 +227,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Return the email body text. - @return the body text, or TQString::null if not an email alarm. + @return the body text, or TQString() if not an email alarm. */ TQString mailText() const; @@ -342,13 +342,13 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties bool enabled() const; /** - Set the alarm's parent incidence. + Set the alarm's tqparent incidence. */ void setParent( Incidence * ); /** - Get the alarm's parent incidence. + Get the alarm's tqparent incidence. */ - Incidence *parent() const { return mParent; } + Incidence *tqparent() const { return mParent; } protected: /** diff --git a/libkcal/attachment.cpp b/libkcal/attachment.cpp index 51858161..0b1db1a3 100644 --- a/libkcal/attachment.cpp +++ b/libkcal/attachment.cpp @@ -72,7 +72,7 @@ TQString Attachment::uri() const if ( !mBinary ) { return mUri; } else { - return TQString::null; + return TQString(); } } diff --git a/libkcal/attachment.h b/libkcal/attachment.h index 7727a5c6..9d36274c 100644 --- a/libkcal/attachment.h +++ b/libkcal/attachment.h @@ -49,7 +49,7 @@ class KDE_EXPORT Attachment @param uri the uri this attachment refers to @param mime the mime type of the resource being linked to */ - Attachment( const TQString &uri, const TQString &mime = TQString::null ); + Attachment( const TQString &uri, const TQString &mime = TQString() ); /** Create a binary attachment. @@ -57,7 +57,7 @@ class KDE_EXPORT Attachment @param base64 the attachment in base64 format @param mime the mime type of the attachment */ - Attachment( const char *base64, const TQString &mime = TQString::null ); + Attachment( const char *base64, const TQString &mime = TQString() ); ~Attachment(); diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 3163def0..eb0fc2b7 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -47,7 +47,7 @@ namespace KCal { -Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName, +Attachment *AttachmentHandler::tqfind( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ) { if ( !incidence ) { @@ -69,15 +69,15 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen if ( !a ) { KMessageBox::error( - parent, + tqparent, i18n( "No attachment named \"%1\" found in the incidence." ).arg( attachmentName ) ); return 0; } if ( a->isUri() ) { - if ( !KIO::NetAccess::exists( a->uri(), true, parent ) ) { + if ( !KIO::NetAccess::exists( a->uri(), true, tqparent ) ) { KMessageBox::sorry( - parent, + tqparent, i18n( "The attachment \"%1\" is a web link that is inaccessible from this computer. " ). arg( KURL::decode_string( a->uri() ) ) ); return 0; @@ -86,7 +86,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen return a; } -Attachment *AttachmentHandler::find( TQWidget *parent, +Attachment *AttachmentHandler::tqfind( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ) { if ( uid.isEmpty() ) { @@ -99,16 +99,16 @@ Attachment *AttachmentHandler::find( TQWidget *parent, Incidence *incidence = cal->incidence( uid ); if ( !incidence ) { KMessageBox::error( - parent, + tqparent, i18n( "The incidence that owns the attachment named \"%1\" could not be found. " "Perhaps it was removed from your calendar?" ).arg( attachmentName ) ); return 0; } - return find( parent, attachmentName, incidence ); + return tqfind( tqparent, attachmentName, incidence ); } -Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName, +Attachment *AttachmentHandler::tqfind( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ) { if ( !message ) { @@ -118,13 +118,13 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen Incidence *incidence = dynamic_cast<Incidence*>( message->event() ); if ( !incidence ) { KMessageBox::error( - parent, + tqparent, i18n( "The calendar invitation stored in this email message is broken in some way. " "Unable to continue." ) ); return 0; } - return find( parent, attachmentName, incidence ); + return tqfind( tqparent, attachmentName, incidence ); } static KTempFile *s_tempFile = 0; @@ -134,10 +134,10 @@ static KURL tempFileForAttachment( Attachment *attachment ) KURL url; TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns(); if ( !patterns.empty() ) { - s_tempFile = new KTempFile( TQString::null, + s_tempFile = new KTempFile( TQString(), TQString( patterns.first() ).remove( '*' ), 0600 ); } else { - s_tempFile = new KTempFile( TQString::null, TQString::null, 0600 ); + s_tempFile = new KTempFile( TQString(), TQString(), 0600 ); } TQFile *qfile = s_tempFile->file(); @@ -157,7 +157,7 @@ static KURL tempFileForAttachment( Attachment *attachment ) return url; } -bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) +bool AttachmentHandler::view( TQWidget *tqparent, Attachment *attachment ) { if ( !attachment ) { return false; @@ -174,7 +174,7 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) } else { stat = false; KMessageBox::error( - parent, + tqparent, i18n( "Unable to create a temporary file for the attachment." ) ); } delete s_tempFile; @@ -183,31 +183,31 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) return stat; } -bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ) +bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ) { - return view( parent, find( parent, attachmentName, incidence ) ); + return view( tqparent, tqfind( tqparent, attachmentName, incidence ) ); } -bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, const TQString &uid ) +bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ) { - return view( parent, find( parent, attachmentName, uid ) ); + return view( tqparent, tqfind( tqparent, attachmentName, uid ) ); } -bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, +bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ) { - return view( parent, find( parent, attachmentName, message ) ); + return view( tqparent, tqfind( tqparent, attachmentName, message ) ); } -bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment ) +bool AttachmentHandler::saveAs( TQWidget *tqparent, Attachment *attachment ) { // get the saveas file name - TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString::null, parent, + TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString(), tqparent, i18n( "Save Attachment" ) ); if ( saveAsFile.isEmpty() || ( TQFile( saveAsFile ).exists() && ( KMessageBox::warningYesNo( - parent, + tqparent, i18n( "%1 already exists. Do you want to overwrite it?"). arg( saveAsFile ) ) == KMessageBox::No ) ) ) { return false; @@ -223,12 +223,12 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment ) if ( tempUrl.isValid() ) { stat = KIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true ); if ( !stat && KIO::NetAccess::lastError() ) { - KMessageBox::error( parent, KIO::NetAccess::lastErrorString() ); + KMessageBox::error( tqparent, KIO::NetAccess::lastErrorString() ); } } else { stat = false; KMessageBox::error( - parent, + tqparent, i18n( "Unable to create a temporary file for the attachment." ) ); } delete s_tempFile; @@ -237,21 +237,21 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment ) return stat; } -bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, +bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ) { - return saveAs( parent, find( parent, attachmentName, incidence ) ); + return saveAs( tqparent, tqfind( tqparent, attachmentName, incidence ) ); } -bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid ) +bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ) { - return saveAs( parent, find( parent, attachmentName, uid ) ); + return saveAs( tqparent, tqfind( tqparent, attachmentName, uid ) ); } -bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, +bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ) { - return saveAs( parent, find( parent, attachmentName, message ) ); + return saveAs( tqparent, tqfind( tqparent, attachmentName, message ) ); } } diff --git a/libkcal/attachmenthandler.h b/libkcal/attachmenthandler.h index 6116f15a..7fc97382 100644 --- a/libkcal/attachmenthandler.h +++ b/libkcal/attachmenthandler.h @@ -49,128 +49,128 @@ namespace AttachmentHandler { /** Finds the attachment in the user's calendar, by @p attachmentName and @p incidence. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); + Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); /** Finds the attachment in the user's calendar, by @p attachmentName and a scheduler message; in other words, this function is intended to retrieve attachments from calendar invitations. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); + Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); /** Finds the attachment in the user's calendar, by @p attachmentName and @p uid. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); + Attachment *tqfind( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachment is a pointer to a valid Attachment object. @return true if the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *parent, Attachment *attachment ); + bool view( TQWidget *tqparent, Attachment *attachment ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); + bool view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); + bool view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); + bool view( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachment is a pointer to a valid Attachment object. @return true if the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *parent, Attachment *attachment ); + bool saveAs( TQWidget *tqparent, Attachment *attachment ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); + bool saveAs( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); + bool saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. + @param tqparent is the tqparent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); + bool saveAs( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); } } 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 a61b07c5..609974e9 100644 --- a/libkcal/attendee.h +++ b/libkcal/attendee.h @@ -48,13 +48,13 @@ 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 */ Attendee( const TQString &name, const TQString &email, bool rsvp = false, PartStat status = None, - Role role = ReqParticipant, const TQString &u = TQString::null ); + Role role = ReqParticipant, const TQString &u = TQString() ); /** Destruct 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 c76ce329..9d9b63f4 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -162,7 +162,7 @@ TQStringList Calendar::categories() thisCats = (*i)->categories(); for ( TQStringList::ConstIterator si = thisCats.constBegin(); si != thisCats.constEnd(); ++si ) { - if ( cats.find( *si ) == cats.end() ) { + if ( cats.tqfind( *si ) == cats.end() ) { cats.append( *si ); } } @@ -474,16 +474,16 @@ bool Calendar::deleteIncidence( Incidence *incidence ) { if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { - // Delete this event's UID from the parent's list of children - Incidence *parentIncidence; + // Delete this event's UID from the tqparent's list of tqchildren + Incidence *tqparentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - parentIncidence = this->incidence(*it); - parentIncidence->deleteChildIncidence(incidence->uid()); + tqparentIncidence = this->incidence(*it); + tqparentIncidence->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 ) { @@ -512,7 +512,7 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, TQDate date, Incidence *newInc = incidence->clone(); newInc->recreate(); newInc->setHasRecurrenceID(false); -// newInc->setRecurrenceID(QString()); +// newInc->setRecurrenceID(TQString()); newInc->setRelatedTo( incidence ); Recurrence *recur = newInc->recurrence(); if ( single ) { @@ -841,7 +841,7 @@ void Calendar::setupRelations( Incidence *forincidence ) // kdDebug(5850) << "Calendar::setupRelations for incidence " << forincidence << " with UID " << forincidence->uid() << ", summary: " << forincidence->summary() << endl; TQString uid = forincidence->uid(); - // First, go over the list of orphans and see if this is their parent + // First, go over the list of orphans and see if this is their tqparent while ( Incidence* i = mOrphans[ uid ] ) { mOrphans.remove( uid ); i->setRelatedTo( forincidence ); @@ -849,19 +849,19 @@ void Calendar::setupRelations( Incidence *forincidence ) mOrphanUids.remove( i->uid() ); } - // Now see about this incidences parent + // Now see about this incidences tqparent if ( !forincidence->relatedTo() && !forincidence->relatedToUid().isEmpty() ) { // This incidence has a uid it is related to but is not registered to it yet // Try to find it - Incidence* parent = incidence( forincidence->relatedToUid() ); - if ( parent ) { + Incidence* tqparent = incidence( forincidence->relatedToUid() ); + if ( tqparent ) { // Found it - forincidence->setRelatedTo( parent ); - parent->addRelation( forincidence ); + forincidence->setRelatedTo( tqparent ); + tqparent->addRelation( 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 tqparent incidence to be inserted. mOrphans.insert( forincidence->relatedToUid(), forincidence ); mOrphanUids.insert( forincidence->uid(), forincidence ); } @@ -883,7 +883,7 @@ void Calendar::removeRelations( Incidence *incidence ) Incidence::List::ConstIterator it; for ( it = relations.begin(); it != relations.end(); ++it ) { Incidence *i = *it; - if ( !mOrphanUids.find( i->uid() ) ) { + if ( !mOrphanUids.tqfind( i->uid() ) ) { mOrphans.insert( uid, i ); mOrphanUids.insert( i->uid(), i ); i->setRelatedTo( 0 ); @@ -901,10 +901,10 @@ void Calendar::removeRelations( Incidence *incidence ) // Since the mOrphans dict might contain the same key (with different // child incidence pointers!) multiple times, take care that we remove // the correct one. So we need to remove all items with the given - // parent UID, and readd those that are not for this item. Also, there + // tqparent UID, and readd those that are not for this item. Also, there // might be other entries with differnet UID that point to this // incidence (this might happen when the relatedTo of the item is - // changed before its parent is inserted. This might happen with + // changed before its tqparent is inserted. This might happen with // groupware servers....). Remove them, too TQStringList relatedToUids; // First get the list of all keys in the mOrphans list that point to the removed item @@ -960,7 +960,7 @@ void Calendar::setModified( bool modified ) void Calendar::incidenceUpdated( IncidenceBase *incidence ) { - incidence->setSyncStatus( Event::SYNCMOD ); + 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. diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 005b513e..c2a4e6e6 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -170,6 +170,7 @@ class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties, public IncidenceBase::Observer { Q_OBJECT + TQ_OBJECT public: diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 95b5a006..310c65d2 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -50,7 +50,7 @@ CalendarLocal::CalendarLocal( const TQString &timeZoneId ) void CalendarLocal::init() { mDeletedIncidences.setAutoDelete( true ); - mFileName = TQString::null; + mFileName = TQString(); } @@ -92,7 +92,7 @@ bool CalendarLocal::save( const TQString &fileName, CalFormat *format ) void CalendarLocal::close() { setObserversEnabled( false ); - mFileName = TQString::null; + mFileName = TQString(); deleteAllEvents(); deleteAllTodos(); @@ -107,7 +107,7 @@ void CalendarLocal::close() void CalendarLocal::closeEvents() { setObserversEnabled( false ); - mFileName = TQString::null; + mFileName = TQString(); deleteAllEvents(); @@ -120,7 +120,7 @@ void CalendarLocal::closeEvents() void CalendarLocal::closeTodos() { setObserversEnabled( false ); - mFileName = TQString::null; + mFileName = TQString(); deleteAllTodos(); @@ -133,7 +133,7 @@ void CalendarLocal::closeTodos() void CalendarLocal::closeJournals() { setObserversEnabled( false ); - mFileName = TQString::null; + mFileName = TQString(); deleteAllJournals(); @@ -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 ) ) { diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index 50c5fba5..9bec7a64 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -108,7 +108,7 @@ ResourceCalendar } KRES::Resource *r; - r = KRES::SelectDialog::getResource( list, parent() ); + r = KRES::SelectDialog::getResource( list, tqparent() ); return static_cast<ResourceCalendar *>( r ); } @@ -215,12 +215,12 @@ void CalendarResources::setAskDestinationPolicy() TQWidget *CalendarResources::dialogParentWidget() { - return mDestinationPolicy->parent(); + return mDestinationPolicy->tqparent(); } -void CalendarResources::setDialogParentWidget( TQWidget *parent ) +void CalendarResources::setDialogParentWidget( TQWidget *tqparent ) { - mDestinationPolicy->setParent( parent ); + mDestinationPolicy->setParent( tqparent ); } void CalendarResources::close() @@ -430,7 +430,7 @@ bool CalendarResources::deleteEvent( Event *event ) kdDebug(5800) << "CalendarResources::deleteEvent" << endl; bool status; - if ( mResourceMap.find( event ) != mResourceMap.end() ) { + if ( mResourceMap.tqfind( event ) != mResourceMap.end() ) { status = mResourceMap[event]->deleteEvent( event ); if ( status ) mPendingDeleteFromResourceMap = true; @@ -487,7 +487,7 @@ bool CalendarResources::deleteTodo( Todo *todo ) kdDebug(5800) << "CalendarResources::deleteTodo" << endl; bool status; - if ( mResourceMap.find( todo ) != mResourceMap.end() ) { + if ( mResourceMap.tqfind( todo ) != mResourceMap.end() ) { status = mResourceMap[todo]->deleteTodo( todo ); if ( status ) mPendingDeleteFromResourceMap = true; @@ -686,7 +686,7 @@ bool CalendarResources::deleteJournal( Journal *journal ) kdDebug(5800) << "CalendarResources::deleteJournal" << endl; bool status; - if ( mResourceMap.find( journal ) != mResourceMap.end() ) { + if ( mResourceMap.tqfind( journal ) != mResourceMap.end() ) { status = mResourceMap[journal]->deleteJournal( journal ); if ( status ) mPendingDeleteFromResourceMap = true; @@ -771,7 +771,7 @@ void CalendarResources::connectResource( ResourceCalendar *resource ) ResourceCalendar *CalendarResources::resource( Incidence *incidence ) { - if ( mResourceMap.find( incidence ) != mResourceMap.end() ) { + if ( mResourceMap.tqfind( incidence ) != mResourceMap.end() ) { return mResourceMap[ incidence ]; } return 0; diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 9a93be53..3f601502 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -66,6 +66,7 @@ class LIBKCAL_EXPORT CalendarResources : public KRES::ManagerObserver<ResourceCalendar> { Q_OBJECT + TQ_OBJECT public: /** @class DestinationPolicy @@ -74,12 +75,12 @@ class LIBKCAL_EXPORT CalendarResources : { public: DestinationPolicy( CalendarResourceManager *manager, - TQWidget *parent = 0 ) : - mManager( manager ), mParent( parent ) {} + TQWidget *tqparent = 0 ) : + mManager( manager ), mParent( tqparent ) {} virtual ResourceCalendar *destination( Incidence *incidence ) = 0; - virtual TQWidget *parent() { return mParent; } - virtual void setParent( TQWidget *newparent ) { mParent = newparent; } + virtual TQWidget *tqparent() { return mParent; } + virtual void setParent( TQWidget *newtqparent ) { mParent = newtqparent; } bool hasCalendarResources(); protected: CalendarResourceManager *resourceManager() @@ -97,8 +98,8 @@ class LIBKCAL_EXPORT CalendarResources : { public: StandardDestinationPolicy( CalendarResourceManager *manager, - TQWidget *parent = 0 ) : - DestinationPolicy( manager, parent ) {} + TQWidget *tqparent = 0 ) : + DestinationPolicy( manager, tqparent ) {} ResourceCalendar *destination( Incidence *incidence ); @@ -114,8 +115,8 @@ class LIBKCAL_EXPORT CalendarResources : { public: AskDestinationPolicy( CalendarResourceManager *manager, - TQWidget *parent = 0 ) : - DestinationPolicy( manager, parent ) {} + TQWidget *tqparent = 0 ) : + DestinationPolicy( manager, tqparent ) {} ResourceCalendar *destination( Incidence *incidence ); @@ -270,8 +271,8 @@ class LIBKCAL_EXPORT CalendarResources : void setAskDestinationPolicy(); /** - Returns the current parent for new dialogs. This is a bad hack, but we need - to properly set the parent for the resource selection dialog. Otherwise + Returns the current tqparent for new dialogs. This is a bad hack, but we need + to properly set the tqparent for the resource selection dialog. Otherwise the dialog will not be modal to the editor dialog in korganizer and the user can still work in the editor dialog (and thus crash korganizer). Afterwards we need to reset it (to avoid pointers to widgets that are @@ -279,12 +280,12 @@ class LIBKCAL_EXPORT CalendarResources : */ TQWidget *dialogParentWidget(); /** - Set the widget parent for new dialogs. This is a bad hack, but we need - to properly set the parent for the resource selection dialog. Otherwise + Set the widget tqparent for new dialogs. This is a bad hack, but we need + to properly set the tqparent for the resource selection dialog. Otherwise the dialog will not be modal to the editor dialog in korganizer and the user can still work in the editor dialog (and thus crash korganizer). */ - void setDialogParentWidget( TQWidget *parent ); + void setDialogParentWidget( TQWidget *tqparent ); /** Request ticket for saving the Calendar. If a ticket is returned the diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp index c065bf44..01df3296 100644 --- a/libkcal/calfilter.cpp +++ b/libkcal/calfilter.cpp @@ -125,7 +125,7 @@ bool CalFilter::filterIncidence(Incidence *incidence) const if ( !todo->attendees().isEmpty() ) { Attendee::List::ConstIterator it; for( it = attendees.begin(); it != attendees.end(); ++it ) { - if ( mEmailList.find( (*it)->email() ) != mEmailList.end() ) { + if ( mEmailList.tqfind( (*it)->email() ) != mEmailList.end() ) { iAmOneOfTheAttendees = true; break; } diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp index ebdb9de9..bb1442f5 100644 --- a/libkcal/calhelper.cpp +++ b/libkcal/calhelper.cpp @@ -146,10 +146,10 @@ ResourceCalendar *CalHelper::incResourceCalendar( Calendar *calendar, Incidence return cal->resource( incidence ); } -QPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar *calendar, +TQPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar *calendar, Incidence *incidence ) { - QPair<ResourceCalendar *, TQString> p( 0, TQString() ); + TQPair<ResourceCalendar *, TQString> p( 0, TQString() ); CalendarResources *cal = dynamic_cast<CalendarResources*>( calendar ); if ( !cal || !incidence ) { diff --git a/libkcal/calhelper.h b/libkcal/calhelper.h index edebecf9..d14149df 100644 --- a/libkcal/calhelper.h +++ b/libkcal/calhelper.h @@ -116,15 +116,15 @@ namespace CalHelper { @param calendar is a pointer to a valid Calendar object. @param incidence is a pointer to an Incidence object. - @return a QPair containing a pointer to the Incidence's ResourceCalendar - in the 'first' element of the QPair and the SubResourceCalendar in the + @return a TQPair containing a pointer to the Incidence's ResourceCalendar + in the 'first' element of the TQPair and the SubResourceCalendar in the 'second' element. @note many resource types do not support subresources, so the 'second' element will be an empty TQString in those situations. @since 4.5 */ - QPair<ResourceCalendar *, TQString> incSubResourceCalendar( Calendar *calendar, + TQPair<ResourceCalendar *, TQString> incSubResourceCalendar( Calendar *calendar, Incidence *incidence ); } diff --git a/libkcal/compat.cpp b/libkcal/compat.cpp index 5b5c6a5a..4a1a38fd 100644 --- a/libkcal/compat.cpp +++ b/libkcal/compat.cpp @@ -37,15 +37,15 @@ Compat *CompatFactory::createCompat( const TQString &productId ) Compat *compat = 0; - int korg = productId.find( "KOrganizer" ); - int outl9 = productId.find( "Outlook 9.0" ); -// int kcal = productId.find( "LibKCal" ); + int korg = productId.tqfind( "KOrganizer" ); + int outl9 = productId.tqfind( "Outlook 9.0" ); +// int kcal = productId.tqfind( "LibKCal" ); // TODO: Use the version of LibKCal to determine the compat class... if ( korg >= 0 ) { - int versionStart = productId.find( " ", korg ); + int versionStart = productId.tqfind( " ", korg ); if ( versionStart >= 0 ) { - int versionStop = productId.find( TQRegExp( "[ /]" ), versionStart + 1 ); + int versionStop = productId.tqfind( TQRegExp( "[ /]" ), versionStart + 1 ); if ( versionStop >= 0 ) { TQString version = productId.mid( versionStart + 1, versionStop - versionStart - 1 ); @@ -54,7 +54,7 @@ Compat *CompatFactory::createCompat( const TQString &productId ) int versionNum = version.section( ".", 0, 0 ).toInt() * 10000 + version.section( ".", 1, 1 ).toInt() * 100 + version.section( ".", 2, 2 ).toInt(); - int releaseStop = productId.find( "/", versionStop ); + int releaseStop = productId.tqfind( "/", versionStop ); TQString release; if ( releaseStop > versionStop ) { release = productId.mid( versionStop+1, releaseStop-versionStop-1 ); diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 9b7f4d31..0d9edf1e 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -30,8 +30,8 @@ using namespace KCal; ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, - TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n("Confirm Save"), Ok | Cancel ) + TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n("Confirm Save"), Ok | Cancel ) { TQFrame *topFrame = makeMainWidget(); diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index c20a4951..cb6a0905 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -32,7 +32,7 @@ namespace KCal { class KDE_EXPORT ConfirmSaveDialog : public KDialogBase { public: - ConfirmSaveDialog( const TQString &destination, TQWidget *parent, + ConfirmSaveDialog( const TQString &destination, TQWidget *tqparent, const char *name = 0 ); void addIncidences( const Incidence::List &incidences, diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index be02fd66..0e4b4352 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -39,7 +39,7 @@ using namespace KCal; static const KCmdLineOptions options[] = { {"q", 0, 0 }, - {"qtopia2icalendar", I18N_NOOP("Convert Qtopia calendar file to iCalendar"), 0 }, + {"qtopia2icalendar", I18N_NOOP("Convert TQtopia calendar file to iCalendar"), 0 }, {"i", 0, 0 }, {"icalendar2qtopia", I18N_NOOP("Convert iCalendar to iCalendar"), 0 }, {"o", 0, 0}, @@ -50,7 +50,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1"); + KAboutData aboutData("convertqtopia",I18N_NOOP("TQtopia calendar file converter"),"0.1"); aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org"); KCmdLineArgs::init(argc,argv,&aboutData); @@ -60,22 +60,22 @@ int main(int argc,char **argv) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - bool sourceQtopia = false; + bool sourceTQtopia = false; bool sourceIcalendar = false; if ( args->isSet( "qtopia2icalendar" ) ) { - sourceQtopia = true; + sourceTQtopia = true; } if ( args->isSet( "icalendar2qtopia" ) ) { sourceIcalendar = true; } - if ( sourceQtopia && sourceIcalendar ) { + if ( sourceTQtopia && sourceIcalendar ) { KCmdLineArgs::usage( i18n("Please specify only one of the conversion options.") ); } - if ( !sourceQtopia && !sourceIcalendar ) { + if ( !sourceTQtopia && !sourceIcalendar ) { KCmdLineArgs::usage( i18n("You have to specify one conversion option.") ); } @@ -92,10 +92,10 @@ int main(int argc,char **argv) kdDebug(5800) << "Input File: '" << inputFile << "'" << endl; kdDebug(5800) << "Output File: '" << outputFile << "'" << endl; - if ( sourceQtopia ) { + if ( sourceTQtopia ) { CalendarLocal cal; - QtopiaFormat qtopiaFormat; + TQtopiaFormat qtopiaFormat; qtopiaFormat.load( &cal, inputFile ); ICalFormat icalendarFormat; diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp index 689a2c85..b79166a2 100644 --- a/libkcal/customproperties.cpp +++ b/libkcal/customproperties.cpp @@ -44,7 +44,7 @@ bool CustomProperties::operator==( const CustomProperties &other ) const TQMap<TQCString, TQString>::ConstIterator it; for( it = mProperties.begin(); it != mProperties.end(); ++it ) { TQMap<TQCString, TQString>::ConstIterator itOther = - other.mProperties.find( it.key() ); + other.mProperties.tqfind( it.key() ); if ( itOther == other.mProperties.end() ) { return false; @@ -87,7 +87,7 @@ void CustomProperties::setNonKDECustomProperty(const TQCString &name, const TQSt void CustomProperties::removeNonKDECustomProperty(const TQCString &name) { - TQMap<TQCString, TQString>::Iterator it = mProperties.find(name); + TQMap<TQCString, TQString>::Iterator it = mProperties.tqfind(name); if (it != mProperties.end()) { mProperties.remove(it); customPropertyUpdated(); @@ -96,9 +96,9 @@ void CustomProperties::removeNonKDECustomProperty(const TQCString &name) TQString CustomProperties::nonKDECustomProperty(const TQCString &name) const { - TQMap<TQCString, TQString>::ConstIterator it = mProperties.find(name); + TQMap<TQCString, TQString>::ConstIterator it = mProperties.tqfind(name); if (it == mProperties.end()) - return TQString::null; + return TQString(); return it.data(); } diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h index 46814ca0..d4347389 100644 --- a/libkcal/customproperties.h +++ b/libkcal/customproperties.h @@ -56,7 +56,7 @@ class LIBKCAL_EXPORT CustomProperties @param app Application name as it appears in the custom property name. @param key Property identifier specific to the application. - @param value The property's value. A call with a value of TQString::null + @param value The property's value. A call with a value of TQString() will be ignored. */ void setCustomProperty( const TQCString &app, const TQCString &key, @@ -73,7 +73,7 @@ class LIBKCAL_EXPORT CustomProperties @param app Application name as it appears in the custom property name. @param key Property identifier specific to the application. - @return Property value, or TQString::null if (and only if) the property + @return Property value, or TQString() if (and only if) the property does not exist. */ TQString customProperty( const TQCString &app, const TQCString &key ) const; @@ -82,7 +82,7 @@ class LIBKCAL_EXPORT CustomProperties Create or modify a non-KDE or non-standard custom calendar property. @param name Full property name - @param value The property's value. A call with a value of TQString::null + @param value The property's value. A call with a value of TQString() will be ignored. */ void setNonKDECustomProperty( const TQCString &name, const TQString &value ); @@ -96,7 +96,7 @@ class LIBKCAL_EXPORT CustomProperties Return the value of a non-KDE or non-standard custom calendar property. @param name Full property name - @return Property value, or TQString::null if (and only if) the property + @return Property value, or TQString() if (and only if) the property does not exist. */ TQString nonKDECustomProperty( const TQCString& name ) const; diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 7f439819..913036d3 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences ) bool DndFactory::copyIncidences( const Incidence::List &incidences ) { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); 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() ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); Incidence::List list; if ( !ICalDrag::decode( cb->data(), &cal ) && @@ -216,7 +216,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime } // All pasted incidences get new uids, must keep track of old uids, - // so we can update child's parents + // so we can update child's tqparents TQMap<TQString,Incidence*> oldUidToNewInc; Incidence::List::ConstIterator it; @@ -233,9 +233,9 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime for ( it = list.constBegin(); it != list.constEnd(); ++it ) { Incidence *inc = *it; if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) { - Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()]; - inc->setRelatedToUid( parentInc->uid() ); - inc->setRelatedTo( parentInc ); + Incidence *tqparentInc = oldUidToNewInc[inc->relatedToUid()]; + inc->setRelatedToUid( tqparentInc->uid() ); + inc->setRelatedTo( tqparentInc ); } else { // not related to anything in the clipboard inc->setRelatedToUid( TQString() ); @@ -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() ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); if ( !ICalDrag::decode( cb->data(), &cal ) && !VCalDrag::decode( cb->data(), &cal ) ) { diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp index 7a824f08..882a7fce 100644 --- a/libkcal/dummyscheduler.cpp +++ b/libkcal/dummyscheduler.cpp @@ -95,7 +95,7 @@ TQPtrList<ScheduleMessage> DummyScheduler::retrieveTransactions() while (!messageLine.isNull()) { // kdDebug(5800) << "++++++++" << messageLine << endl; messageString += messageLine + "\n"; - if (messageLine.find("END:VCALENDAR") >= 0) { + if (messageLine.tqfind("END:VCALENDAR") >= 0) { kdDebug(5800) << "---------------" << messageString << endl; ScheduleMessage *message = mFormat->parseScheduleMessage(mCalendar, messageString); diff --git a/libkcal/exceptions.h b/libkcal/exceptions.h index 8bdf7fa0..4963f40f 100644 --- a/libkcal/exceptions.h +++ b/libkcal/exceptions.h @@ -42,7 +42,7 @@ class Exception /** Construct exception with descriptive message \a message. */ - Exception( const TQString &message = TQString::null ); + Exception( const TQString &message = TQString() ); virtual ~Exception(); /** @@ -84,7 +84,7 @@ class ErrorFormat : public Exception /** Create format error exception. */ - ErrorFormat( ErrorCodeFormat code, const TQString &message = TQString::null ); + ErrorFormat( ErrorCodeFormat code, const TQString &message = TQString() ); /** Return format error message. diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h index 1d12cc4e..16303259 100644 --- a/libkcal/filestorage.h +++ b/libkcal/filestorage.h @@ -32,7 +32,7 @@ class CalFormat; class LIBKCAL_EXPORT FileStorage : public CalStorage { public: - FileStorage( Calendar *, const TQString &fileName = TQString::null, + FileStorage( Calendar *, const TQString &fileName = TQString(), CalFormat *format = 0 ); virtual ~FileStorage(); diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index f5fde5d9..387ba173 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -332,18 +332,18 @@ void HtmlExport::createTodoList ( TQTextStream *ts ) Todo *subev = ev; if ( ev->relatedTo() ) { if ( ev->relatedTo()->type()=="Todo" ) { - if ( rawTodoList.find( static_cast<Todo *>( ev->relatedTo() ) ) == + if ( rawTodoList.tqfind( static_cast<Todo *>( ev->relatedTo() ) ) == rawTodoList.end() ) { rawTodoList.append( static_cast<Todo *>( ev->relatedTo() ) ); } } } - it = rawTodoList.find( subev ); + it = rawTodoList.tqfind( subev ); ++it; } // FIXME: Sort list by priorities. This is brute force and should be - // tqreplaced by a real sorting algorithm. + // replaced by a real sorting algorithm. Todo::List todoList; for ( int i = 1; i <= 9; ++i ) { for( it = rawTodoList.begin(); it != rawTodoList.end(); ++it ) { @@ -403,7 +403,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts ) Todo::List sortedList; // FIXME: Sort list by priorities. This is brute force and should be - // tqreplaced by a real sorting algorithm. + // replaced by a real sorting algorithm. for ( int i = 1; i <= 9; ++i ) { Incidence::List::ConstIterator it2; for( it2 = relations.begin(); it2 != relations.end(); ++it2 ) { @@ -559,7 +559,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event ) #ifndef KORG_NOKABC KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); KABC::Addressee::List addressList; - addressList = add_book->tqfindByEmail(event->organizer().email()); + addressList = add_book->findByEmail(event->organizer().email()); KABC::Addressee o = addressList.first(); if (!o.isEmpty() && addressList.size()<2) { *ts << "<a href=\"mailto:" << event->organizer().email() << "\">"; @@ -598,7 +598,7 @@ TQString HtmlExport::breakString(const TQString &text) int pos = 0; TQString tmp; for(int i=0;i<=number;i++) { - pos = tmpText.find("\n"); + pos = tmpText.tqfind("\n"); tmp = tmpText.left(pos); tmpText = tmpText.right(tmpText.length() - pos - 1); out += tmp + "<br />"; diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h index 1a209e17..0fbe8022 100644 --- a/libkcal/htmlexport.h +++ b/libkcal/htmlexport.h @@ -51,7 +51,7 @@ class KDE_EXPORT HtmlExport /** Writes out the calendar in HTML format. */ - bool save( const TQString &fileName = TQString::null ); + bool save( const TQString &fileName = TQString() ); /** Writes out calendar to text stream. diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp index 2c5f2309..4ff3111a 100644 --- a/libkcal/icaldrag.cpp +++ b/libkcal/icaldrag.cpp @@ -28,8 +28,8 @@ using namespace KCal; -ICalDrag::ICalDrag( Calendar *cal, TQWidget *parent, const char *name ) - : TQStoredDrag( "text/calendar", parent, name ) +ICalDrag::ICalDrag( Calendar *cal, TQWidget *tqparent, const char *name ) + : TQStoredDrag( "text/calendar", tqparent, name ) { ICalFormat icf; TQString scal = icf.toString( cal ); diff --git a/libkcal/icaldrag.h b/libkcal/icaldrag.h index eecb03b9..b1beb436 100644 --- a/libkcal/icaldrag.h +++ b/libkcal/icaldrag.h @@ -32,13 +32,13 @@ namespace KCal { /** iCalendar drag&drop class. */ -class LIBKCAL_EXPORT ICalDrag : public QStoredDrag +class LIBKCAL_EXPORT ICalDrag : public TQStoredDrag { public: /** Create a drag&drop object for iCalendar component \a ical. */ - ICalDrag( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); + ICalDrag( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); ~ICalDrag() {}; /** diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index 76898ec0..8c1cd3b0 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -267,7 +267,7 @@ TQString ICalFormat::toString( Calendar *cal ) if (!text) { setException(new ErrorFormat(ErrorFormat::SaveError, i18n("libical error"))); - return TQString::null; + return TQString(); } return text; @@ -298,15 +298,15 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent *component; TQString text = ""; - // See if there are any parent or child events that must be added to the string + // See if there are any tqparent or child events that must be added to the string if ( incidence->hasRecurrenceID() ) { - // Get the parent + // Get the tqparent IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *parentIncidence; - parentIncidence = calendar->incidence(*it); - il = parentIncidence->childIncidences(); + Incidence *tqparentIncidence; + tqparentIncidence = calendar->incidence(*it); + il = tqparentIncidence->childIncidences(); if (il.count() > 0) { for ( it = il.begin(); it != il.end(); ++it ) { component = mImpl->writeIncidence( calendar->incidence(*it) ); @@ -314,12 +314,12 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent_free( component ); } } - component = mImpl->writeIncidence( parentIncidence ); + component = mImpl->writeIncidence( tqparentIncidence ); text = text + TQString::fromUtf8( icalcomponent_as_ical_string( component ) ); icalcomponent_free( component ); } else { - // This incidence is a potential parent + // This incidence is a potential tqparent IncidenceList il = incidence->childIncidences(); if (il.count() > 0) { IncidenceListIterator it; @@ -377,7 +377,7 @@ TQString ICalFormat::createScheduleMessage(IncidenceBase *incidence, // We have a separation of scheduling ID and UID i = i->clone(); i->setUid( i->schedulingID() ); - i->setSchedulingID( TQString::null ); + i->setSchedulingID( TQString() ); // Build the message with the cloned incidence message = mImpl->createScheduleComponent( i, method ); @@ -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 bdbc1f7b..297118b5 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -83,8 +83,8 @@ const int gSecondsPerHour = gSecondsPerMinute * 60; const int gSecondsPerDay = gSecondsPerHour * 24; const int gSecondsPerWeek = gSecondsPerDay * 7; -ICalFormatImpl::ICalFormatImpl( ICalFormat *parent ) : - mParent( parent ), mCompat( new Compat ) +ICalFormatImpl::ICalFormatImpl( ICalFormat *tqparent ) : + mParent( tqparent ), mCompat( new Compat ) { } @@ -247,11 +247,9 @@ icalcomponent *ICalFormatImpl::writeEvent(Event *event) icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy, Scheduler::Method method) { -#if QT_VERSION >= 300 kdDebug(5800) << "icalformatimpl: writeFreeBusy: startDate: " << freebusy->dtStart().toString("ddd MMMM d yyyy: h:m:s ap") << " End Date: " << freebusy->dtEnd().toString("ddd MMMM d yyyy: h:m:s ap") << endl; -#endif icalcomponent *vfreebusy = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT); @@ -307,30 +305,30 @@ icalcomponent *ICalFormatImpl::writeJournal(Journal *journal) return vjournal; } -void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) +void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence) { // pilot sync stuff // TODO: move this application-specific code to kpilot 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); + icalcomponent_add_property(tqparent,p); p = icalproperty_new_x(TQString::number(incidence->pilotId()).utf8()); icalproperty_set_x_name(p,"X-PILOTID"); - icalcomponent_add_property(parent,p); + icalcomponent_add_property(tqparent,p); } TQString modifiedUid; if ( incidence->hasRecurrenceID() ) { - // Recurring incidences are special; they must match their parent's UID - // Each child has the parent set as the first item in the list + // Recurring incidences are special; they must match their tqparent's UID + // Each child has the tqparent set as the first item in the list // So, get and set the UID... IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -348,53 +346,53 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) else incidence->removeCustomProperty( "LIBKCAL", "ID" ); - writeIncidenceBase(parent,incidence); + writeIncidenceBase(tqparent,incidence); // creation date - icalcomponent_add_property(parent,icalproperty_new_created( + icalcomponent_add_property(tqparent,icalproperty_new_created( writeICalDateTime(incidence->created()))); // unique id // If the scheduling ID is different from the real UID, the real // one is stored on X-REALID above if ( incidence->hasRecurrenceID() ) { - // Recurring incidences are special; they must match their parent's UID - icalcomponent_add_property(parent,icalproperty_new_uid(modifiedUid.utf8())); + // Recurring incidences are special; they must match their tqparent's UID + icalcomponent_add_property(tqparent,icalproperty_new_uid(modifiedUid.utf8())); } else { if ( !incidence->schedulingID().isEmpty() ) { - icalcomponent_add_property(parent,icalproperty_new_uid( + icalcomponent_add_property(tqparent,icalproperty_new_uid( incidence->schedulingID().utf8())); } } // revision if ( incidence->revision() > 0 ) { // 0 is default, so don't write that out - icalcomponent_add_property(parent,icalproperty_new_sequence( + icalcomponent_add_property(tqparent,icalproperty_new_sequence( incidence->revision())); } // last modification date if ( incidence->lastModified().isValid() ) { - icalcomponent_add_property(parent,icalproperty_new_lastmodified( + icalcomponent_add_property(tqparent,icalproperty_new_lastmodified( writeICalDateTime(incidence->lastModified()))); } // description if (!incidence->description().isEmpty()) { - icalcomponent_add_property(parent,icalproperty_new_description( + icalcomponent_add_property(tqparent,icalproperty_new_description( incidence->description().utf8())); } // summary if (!incidence->summary().isEmpty()) { - icalcomponent_add_property(parent,icalproperty_new_summary( + icalcomponent_add_property(tqparent,icalproperty_new_summary( incidence->summary().utf8())); } // location if (!incidence->location().isEmpty()) { - icalcomponent_add_property(parent,icalproperty_new_location( + icalcomponent_add_property(tqparent,icalproperty_new_location( incidence->location().utf8())); } @@ -412,7 +410,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) case Incidence::StatusX: { icalproperty* p = icalproperty_new_status(ICAL_STATUS_X); icalvalue_set_x(icalproperty_get_value(p), incidence->statusStr().utf8()); - icalcomponent_add_property(parent, p); + icalcomponent_add_property(tqparent, p); break; } case Incidence::StatusNone: @@ -420,7 +418,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) break; } if (status != ICAL_STATUS_NONE) - icalcomponent_add_property(parent, icalproperty_new_status(status)); + icalcomponent_add_property(tqparent, icalproperty_new_status(status)); // secrecy icalproperty_class secClass; @@ -437,12 +435,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) break; } if ( secClass != ICAL_CLASS_PUBLIC ) { - icalcomponent_add_property(parent,icalproperty_new_class(secClass)); + icalcomponent_add_property(tqparent,icalproperty_new_class(secClass)); } // priority if ( incidence->priority() > 0 ) { // 0 is undefined priority - icalcomponent_add_property(parent,icalproperty_new_priority( + icalcomponent_add_property(tqparent,icalproperty_new_priority( incidence->priority())); } @@ -450,18 +448,18 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) TQStringList categories = incidence->categories(); TQStringList::Iterator it; for(it = categories.begin(); it != categories.end(); ++it ) { - icalcomponent_add_property(parent,icalproperty_new_categories((*it).utf8())); + icalcomponent_add_property(tqparent,icalproperty_new_categories((*it).utf8())); } // related event if ( !incidence->relatedToUid().isEmpty() ) { - icalcomponent_add_property(parent,icalproperty_new_relatedto( + icalcomponent_add_property(tqparent,icalproperty_new_relatedto( incidence->relatedToUid().utf8())); } // recurrenceid if ( incidence->hasRecurrenceID() ) { - icalcomponent_add_property(parent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) )); + icalcomponent_add_property(tqparent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) )); } // kdDebug(5800) << "Write recurrence for '" << incidence->summary() << "' (" << incidence->uid() @@ -470,27 +468,27 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) RecurrenceRule::List rrules( incidence->recurrence()->rRules() ); RecurrenceRule::List::ConstIterator rit; for ( rit = rrules.begin(); rit != rrules.end(); ++rit ) { - icalcomponent_add_property( parent, icalproperty_new_rrule( + icalcomponent_add_property( tqparent, icalproperty_new_rrule( writeRecurrenceRule( (*rit) ) ) ); } RecurrenceRule::List exrules( incidence->recurrence()->exRules() ); RecurrenceRule::List::ConstIterator exit; for ( exit = exrules.begin(); exit != exrules.end(); ++exit ) { - icalcomponent_add_property( parent, icalproperty_new_rrule( + icalcomponent_add_property( tqparent, icalproperty_new_rrule( writeRecurrenceRule( (*exit) ) ) ); } DateList dateList = incidence->recurrence()->exDates(); DateList::ConstIterator exIt; for(exIt = dateList.begin(); exIt != dateList.end(); ++exIt) { - icalcomponent_add_property(parent,icalproperty_new_exdate( + icalcomponent_add_property(tqparent,icalproperty_new_exdate( writeICalDate(*exIt))); } DateTimeList dateTimeList = incidence->recurrence()->exDateTimes(); DateTimeList::ConstIterator extIt; for(extIt = dateTimeList.begin(); extIt != dateTimeList.end(); ++extIt) { - icalcomponent_add_property(parent,icalproperty_new_exdate( + icalcomponent_add_property(tqparent,icalproperty_new_exdate( writeICalDateTime(*extIt))); } @@ -498,13 +496,13 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) dateList = incidence->recurrence()->rDates(); DateList::ConstIterator rdIt; for( rdIt = dateList.begin(); rdIt != dateList.end(); ++rdIt) { - icalcomponent_add_property( parent, icalproperty_new_rdate( + icalcomponent_add_property( tqparent, icalproperty_new_rdate( writeICalDatePeriod(*rdIt) ) ); } dateTimeList = incidence->recurrence()->rDateTimes(); DateTimeList::ConstIterator rdtIt; for( rdtIt = dateTimeList.begin(); rdtIt != dateTimeList.end(); ++rdtIt) { - icalcomponent_add_property( parent, icalproperty_new_rdate( + icalcomponent_add_property( tqparent, icalproperty_new_rdate( writeICalDateTimePeriod(*rdtIt) ) ); } @@ -512,7 +510,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) Attachment::List attachments = incidence->attachments(); Attachment::List::ConstIterator atIt; for ( atIt = attachments.begin(); atIt != attachments.end(); ++atIt ) { - icalcomponent_add_property( parent, writeAttachment( *atIt ) ); + icalcomponent_add_property( tqparent, writeAttachment( *atIt ) ); } // alarms @@ -521,7 +519,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) alarmIt != incidence->alarms().end(); ++alarmIt ) { if ( (*alarmIt)->enabled() ) { // kdDebug(5800) << "Write alarm for " << incidence->summary() << endl; - icalcomponent_add_component( parent, writeAlarm( *alarmIt ) ); + icalcomponent_add_component( tqparent, writeAlarm( *alarmIt ) ); } } @@ -529,19 +527,19 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) if (incidence->hasDuration()) { icaldurationtype duration; duration = writeICalDuration( incidence->duration() ); - icalcomponent_add_property(parent,icalproperty_new_duration(duration)); + icalcomponent_add_property(tqparent,icalproperty_new_duration(duration)); } } -void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent, +void ICalFormatImpl::writeIncidenceBase( icalcomponent *tqparent, IncidenceBase * incidenceBase ) { - icalcomponent_add_property( parent, icalproperty_new_dtstamp( + icalcomponent_add_property( tqparent, icalproperty_new_dtstamp( writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) ); // organizer stuff if ( !incidenceBase->organizer().isEmpty() ) { - icalcomponent_add_property( parent, writeOrganizer( incidenceBase->organizer() ) ); + icalcomponent_add_property( tqparent, writeOrganizer( incidenceBase->organizer() ) ); } // attendees @@ -549,27 +547,27 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent, Attendee::List::ConstIterator it; for( it = incidenceBase->attendees().begin(); it != incidenceBase->attendees().end(); ++it ) { - icalcomponent_add_property( parent, writeAttendee( *it ) ); + icalcomponent_add_property( tqparent, writeAttendee( *it ) ); } } // comments TQStringList comments = incidenceBase->comments(); for (TQStringList::Iterator it=comments.begin(); it!=comments.end(); ++it) { - icalcomponent_add_property(parent, icalproperty_new_comment((*it).utf8())); + icalcomponent_add_property(tqparent, icalproperty_new_comment((*it).utf8())); } // custom properties - writeCustomProperties( parent, incidenceBase ); + writeCustomProperties( tqparent, incidenceBase ); } -void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties) +void ICalFormatImpl::writeCustomProperties(icalcomponent *tqparent,CustomProperties *properties) { TQMap<TQCString, TQString> custom = properties->customProperties(); for (TQMap<TQCString, TQString>::Iterator c = custom.begin(); c != custom.end(); ++c) { icalproperty *p = icalproperty_new_x(c.data().utf8()); icalproperty_set_x_name(p,c.key()); - icalcomponent_add_property(parent,p); + icalcomponent_add_property(tqparent,p); } } @@ -972,7 +970,7 @@ Todo *ICalFormatImpl::readTodo(icalcomponent *vtodo) todo->setPercentComplete(icalproperty_get_percentcomplete(p)); break; - case ICAL_RELATEDTO_PROPERTY: // related todo (parent) + case ICAL_RELATEDTO_PROPERTY: // related todo (tqparent) todo->setRelatedToUid(TQString::fromUtf8(icalproperty_get_relatedto(p))); mTodosRelate.append(todo); break; @@ -1052,7 +1050,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon dtEndProcessed = true; break; - case ICAL_RELATEDTO_PROPERTY: // related event (parent) + case ICAL_RELATEDTO_PROPERTY: // related event (tqparent) event->setRelatedToUid( TQString::fromUtf8( icalproperty_get_relatedto( p ) ) ); mEventsRelate.append( event ); break; @@ -1178,7 +1176,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) } TQString name; - TQString uid = TQString::null; + TQString uid = TQString(); p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER); if (p) { name = TQString::fromUtf8(icalparameter_get_cn(p)); @@ -1358,11 +1356,11 @@ Attachment *ICalFormatImpl::readAttachment(icalproperty *attach) return attachment; } -void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Incidence *incidence) +void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, Incidence *incidence) { - readIncidenceBase(parent,incidence); + readIncidenceBase(tqparent,incidence); - icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY); const char *text; int intvalue, inttext; @@ -1422,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; @@ -1433,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; } @@ -1468,7 +1466,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci // case ICAL_CONTACT_PROPERTY: // incidenceBase->addContact( -// QString::fromUtf8( icalproperty_get_contact( p ) ) ); +// TQString::fromUtf8( icalproperty_get_contact( p ) ) ); // break; case ICAL_RDATE_PROPERTY: { @@ -1518,7 +1516,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci break; } - p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); + p = icalcomponent_get_next_property(tqparent,ICAL_ANY_PROPERTY); } // Set the scheduling ID @@ -1540,9 +1538,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci incidence->setCategories(categories); // iterate through all alarms - for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); + for (icalcomponent *alarm = icalcomponent_get_first_component(tqparent,ICAL_VALARM_COMPONENT); alarm; - alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { + alarm = icalcomponent_get_next_component(tqparent,ICAL_VALARM_COMPONENT)) { readAlarm(alarm,incidence); } // Fix incorrect alarm settings by other applications (like outloook 9) @@ -1550,9 +1548,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci } -void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) +void ICalFormatImpl::readIncidenceBase(icalcomponent *tqparent,IncidenceBase *incidenceBase) { - icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY); bool uidProcessed = false; @@ -1582,7 +1580,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci break; } - p = icalcomponent_get_next_property( parent, ICAL_ANY_PROPERTY ); + p = icalcomponent_get_next_property( tqparent, ICAL_ANY_PROPERTY ); } if ( !uidProcessed ) { @@ -1606,35 +1604,35 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci // (documented in UsingLibical.txt) icalproperty *next =0; - for ( p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); + for ( p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY); p != 0; p = next ) { - next = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); + next = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY); TQString value = TQString::fromUtf8(icalproperty_get_x(p)); TQString name = icalproperty_get_x_name(p); if (name == "X-PILOTID" && !value.isEmpty()) { incidenceBase->setPilotId(value.toInt()); - icalcomponent_remove_property(parent,p); + icalcomponent_remove_property(tqparent,p); } else if (name == "X-PILOTSTAT" && !value.isEmpty()) { - incidenceBase->setSyncStatus(value.toInt()); - icalcomponent_remove_property(parent,p); + incidenceBase->setSynctqStatus(value.toInt()); + icalcomponent_remove_property(tqparent,p); } } // custom properties - readCustomProperties(parent, incidenceBase); + readCustomProperties(tqparent, incidenceBase); } -void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties) +void ICalFormatImpl::readCustomProperties(icalcomponent *tqparent,CustomProperties *properties) { TQMap<TQCString, TQString> customProperties; TQString lastProperty; - icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY); while (p) { @@ -1646,7 +1644,7 @@ void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties customProperties[name] = customProperties[name].append( "," ).append( value ); } // kdDebug(5800) << "Set custom property [" << name << '=' << value << ']' << endl; - p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); + p = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY); lastProperty = name; } @@ -2168,7 +2166,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (todo) { if (todo->hasRecurrenceID()) { TQString originalUid = todo->uid(); - todo->setUid(originalUid + QString("-recur-%1").arg(todo->recurrenceID().toTime_t())); + todo->setUid(originalUid + TQString("-recur-%1").arg(todo->recurrenceID().toTime_t())); if (!cal->todo(todo->uid())) { if ( !cal->addTodo( todo ) ) { cal->endBatchAdding(); @@ -2179,9 +2177,9 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this todo to its parent + // Add this todo to its tqparent cal->todo(originalUid)->addChildIncidence(todo->uid()); - // And the parent to the child + // And the tqparent to the child todo->addChildIncidence(cal->todo(originalUid)->uid()); } } @@ -2210,16 +2208,16 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (event) { if (event->hasRecurrenceID()) { TQString originalUid = event->uid(); - event->setUid(originalUid + QString("-recur-%1").arg(event->recurrenceID().toTime_t())); + event->setUid(originalUid + TQString("-recur-%1").arg(event->recurrenceID().toTime_t())); if (!cal->event(event->uid())) { cal->addEvent(event); if (!cal->event(originalUid)) { printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this event to its parent + // Add this event to its tqparent cal->event(originalUid)->addChildIncidence(event->uid()); - // And the parent to the child + // And the tqparent to the child event->addChildIncidence(cal->event(originalUid)->uid()); } } @@ -2248,16 +2246,16 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (journal) { if (journal->hasRecurrenceID()) { TQString originalUid = journal->uid(); - journal->setUid(originalUid + QString("-recur-%1").arg(journal->recurrenceID().toTime_t())); + journal->setUid(originalUid + TQString("-recur-%1").arg(journal->recurrenceID().toTime_t())); if (!cal->journal(journal->uid())) { cal->addJournal(journal); if (!cal->event(originalUid)) { printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this journal to its parent + // Add this journal to its tqparent cal->journal(originalUid)->addChildIncidence(journal->uid()); - // And the parent to the child + // And the tqparent to the child journal->addChildIncidence(cal->journal(originalUid)->uid()); } } diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h index 9a2e9f62..215adfe9 100644 --- a/libkcal/icalformatimpl.h +++ b/libkcal/icalformatimpl.h @@ -46,7 +46,7 @@ class ICalFormatImpl { public: /** Create new iCal format for calendar object */ - ICalFormatImpl( ICalFormat *parent ); + ICalFormatImpl( ICalFormat *tqparent ); virtual ~ICalFormatImpl(); bool populate( Calendar *, icalcomponent *fs); @@ -57,7 +57,7 @@ class ICalFormatImpl icalcomponent *writeFreeBusy(FreeBusy *freebusy, Scheduler::Method method = Scheduler::Publish ); icalcomponent *writeJournal(Journal *journal); - void writeIncidence(icalcomponent *parent,Incidence *incidence); + void writeIncidence(icalcomponent *tqparent,Incidence *incidence); icalproperty *writeAttendee(Attendee *attendee); icalproperty *writeOrganizer( const Person &organizer ); icalproperty *writeAttachment(Attachment *attach); @@ -73,7 +73,7 @@ class ICalFormatImpl Attendee *readAttendee(icalproperty *attendee); Person readOrganizer( icalproperty *organizer ); Attachment *readAttachment(icalproperty *attach); - void readIncidence(icalcomponent *parent, icaltimezone *timezone, Incidence *incidence); + void readIncidence(icalcomponent *tqparent, icaltimezone *timezone, Incidence *incidence); void readRecurrenceRule(icalproperty *rrule,Incidence *event ); void readExceptionRule( icalproperty *rrule, Incidence *incidence ); void readRecurrence( const struct icalrecurrencetype &r, RecurrenceRule* recur ); @@ -96,10 +96,10 @@ class ICalFormatImpl protected: void dumpIcalRecurrence(icalrecurrencetype); private: - void writeIncidenceBase(icalcomponent *parent,IncidenceBase *); - void readIncidenceBase(icalcomponent *parent, IncidenceBase *); - void writeCustomProperties(icalcomponent *parent,CustomProperties *); - void readCustomProperties(icalcomponent *parent,CustomProperties *); + void writeIncidenceBase(icalcomponent *tqparent,IncidenceBase *); + void readIncidenceBase(icalcomponent *tqparent, IncidenceBase *); + void writeCustomProperties(icalcomponent *tqparent,CustomProperties *); + void readCustomProperties(icalcomponent *tqparent,CustomProperties *); void readTimezone(icalcomponent *vtimezone); ICalFormat *mParent; diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 4c41e7a9..05fc721c 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() ) && @@ -210,13 +210,13 @@ void Incidence::recreate() setCreated(TQDateTime::tqcurrentDateTime()); setUid(CalFormat::createUniqueId()); - setSchedulingID( TQString::null ); + setSchedulingID( TQString() ); setRevision(0); setLastModified(TQDateTime::tqcurrentDateTime()); setPilotId( 0 ); - setSyncStatus( SYNCNONE ); + setSynctqStatus( SYNCNONE ); } void Incidence::setReadOnly( bool readOnly ) @@ -353,7 +353,7 @@ void Incidence::setRelatedTo(Incidence *relatedTo) if ( mRelatedTo->uid() != mRelatedToUid ) setRelatedToUid( mRelatedTo->uid() ); } else { - setRelatedToUid( TQString::null ); + setRelatedToUid( TQString() ); } } @@ -369,7 +369,7 @@ Incidence::List Incidence::relations() const void Incidence::addRelation( Incidence *event ) { - if ( mRelations.find( event ) == mRelations.end() ) { + if ( mRelations.tqfind( event ) == mRelations.end() ) { mRelations.append( event ); } } @@ -445,9 +445,9 @@ bool Incidence::recursOn(const TQDate &qd, Calendar *cal) const IncidenceList il = childIncidences(); IncidenceListIterator it; for ( it = il.begin(); it != il.end(); ++it ) { - QDateTime modifiedDt = cal->incidence(*it)->recurrenceID(); - modifiedDt.setTime(QTime()); - if (QDateTime(qd) == modifiedDt) { + TQDateTime modifiedDt = cal->incidence(*it)->recurrenceID(); + modifiedDt.setTime(TQTime()); + if (TQDateTime(qd) == modifiedDt) { doesRecur = false; } } @@ -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; - mStatusString = TQString::null; + 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"); @@ -779,7 +779,7 @@ TQString Incidence::statusName(Incidence::Status status) case StatusFinal: return i18n("Final"); case StatusX: case StatusNone: - default: return TQString::null; + default: return TQString(); } } diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 883d08c8..bfb883fd 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -38,8 +38,8 @@ namespace KCal { class Calendar; -typedef QStringList IncidenceList; -typedef QStringList::iterator IncidenceListIterator; +typedef TQStringList IncidenceList; +typedef TQStringList::iterator IncidenceListIterator; /** This class provides the base class common to all calendar components. @@ -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 ); // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -459,14 +459,14 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ TQDateTime recurrenceID() const; /** - Attach a child incidence to a parent incidence. + Attach a child incidence to a tqparent incidence. @param childIncidence is the child incidence to add @since 3.5.12 */ void addChildIncidence( TQString childIncidence ); /** - Detach a child incidence from its parent incidence. + Detach a child incidence from its tqparent incidence. @param childIncidence is the child incidence to remove @since 3.5.12 */ @@ -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 518d0f63..bddfcb5a 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 } @@ -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 fa3a1a61..7d4eec7e 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -222,7 +222,7 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties Return first Attendee with one of the given email addresses. */ Attendee *attendeeByMails( const TQStringList &, - const TQString &email = TQString::null ) const; + const TQString &email = TQString() ) const; /** Return attendee with given uid. */ @@ -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 ebfb68ea..d7dd97e4 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -83,7 +83,7 @@ static TQString htmlAddTag( const TQString & tag, const TQString & text ) int pos = 0; TQString tmp; for( int i = 0; i <= numLineBreaks; i++ ) { - pos = tmpText.find( "\n" ); + pos = tmpText.tqfind( "\n" ); tmp = tmpText.left( pos ); tmpText = tmpText.right( tmpText.length() - pos - 1 ); tmpStr += tmp + "<br>"; @@ -184,7 +184,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->tqfindByEmail( email ); + KABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { KABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { @@ -195,7 +195,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS uid = o.uid(); } else { // Email not found in the addressbook. Don't make a link - uid = TQString::null; + uid = TQString(); } } } @@ -275,7 +275,7 @@ static TQString displayViewFormatAttendees( Incidence *incidence ) tmpStr += "<td>" + displayViewLinkPerson( incidence->organizer().email(), incidence->organizer().name(), - TQString::null ) + + TQString() ) + "</td>"; tmpStr += "</tr>"; } @@ -365,10 +365,10 @@ static TQString displayViewFormatCreationDate( Incidence *incidence ) static TQString displayViewFormatBirthday( Event *event ) { if ( !event ) { - return TQString::null; + return TQString(); } if ( event->customProperty("KABC","BIRTHDAY") != "YES" ) { - return TQString::null; + return TQString(); } TQString uid = event->customProperty("KABC","UID-1"); @@ -452,7 +452,7 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, const TQDate &date ) { if ( !event ) { - return TQString::null; + return TQString(); } TQString tmpStr = displayViewFormatHeader( event ); @@ -625,7 +625,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo, const TQDate &date ) { if ( !todo ) { - return TQString::null; + return TQString(); } TQString tmpStr = displayViewFormatHeader( todo ); @@ -775,7 +775,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo, static TQString displayViewFormatJournal( Calendar *calendar, Journal *journal ) { if ( !journal ) { - return TQString::null; + return TQString(); } TQString tmpStr = displayViewFormatHeader( journal ); @@ -827,7 +827,7 @@ static TQString displayViewFormatJournal( Calendar *calendar, Journal *journal ) static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb ) { if ( !fb ) { - return TQString::null; + return TQString(); } TQString tmpStr = htmlAddTag( "h2", @@ -934,14 +934,14 @@ TQString IncidenceFormatter::extensiveDisplayStr( Calendar *calendar, const TQDate &date ) { if ( !incidence ) { - return TQString::null; + return TQString(); } EventViewerVisitor v; if ( v.act( calendar, incidence, date ) ) { return v.result(); } else { - return TQString::null; + return TQString(); } } @@ -1135,7 +1135,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->tqfindByEmail( email ); + KABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { KABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { @@ -1146,7 +1146,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString uid = o.uid(); } else { // Email not found in the addressbook. Don't make a link - uid = TQString::null; + uid = TQString(); } } } @@ -1274,7 +1274,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) { // Invitation details are formatted into an HTML table if ( !event ) { - return TQString::null; + return TQString(); } TQString sSummary = i18n( "Summary unspecified" ); @@ -1347,7 +1347,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) // } // Invitation Duration Row - QString durStr = IncidenceFormatter::durationString( event ); + TQString durStr = IncidenceFormatter::durationString( event ); if ( !durStr.isEmpty() ) { html += invitationRow( i18n( "Duration:" ), durStr ); } @@ -1385,7 +1385,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode ) { // Task details are formatted into an HTML table if ( !todo ) { - return TQString::null; + return TQString(); } TQString sSummary = i18n( "Summary unspecified" ); @@ -1449,7 +1449,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode ) static TQString invitationDetailsJournal( Journal *journal, bool noHtmlMode ) { if ( !journal ) { - return TQString::null; + return TQString(); } TQString sSummary = i18n( "Summary unspecified" ); @@ -1480,7 +1480,7 @@ static TQString invitationDetailsJournal( Journal *journal, bool noHtmlMode ) static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) { if ( !fb ) - return TQString::null; + return TQString(); TQString html( "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n" ); html += invitationRow( i18n("Person:"), fb->organizer().fullName() ); @@ -1510,7 +1510,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) if ( dur > 0 ) { cont += i18n("1 second", "%n seconds", dur); } - html += invitationRow( TQString::null, i18n("startDate for duration", "%1 for %2") + html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) .arg(cont) ); } else { @@ -1526,7 +1526,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); } - html += invitationRow( TQString::null, cont ); + html += invitationRow( TQString(), cont ); } } @@ -1557,7 +1557,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc ScheduleMessage *msg, const TQString &sender ) { if ( !msg || !event ) - return TQString::null; + return TQString(); switch ( msg->method() ) { case Scheduler::Publish: @@ -1608,7 +1608,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc Attendee::List attendees = event->attendees(); if( attendees.count() == 0 ) { kdDebug(5850) << "No attendees in the iCal reply!" << endl; - return TQString::null; + return TQString(); } if( attendees.count() != 1 ) { kdDebug(5850) << "Warning: attendeecount in the reply should be 1 " @@ -1692,14 +1692,14 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc return i18n("Error: iMIP message with unknown method: '%1'"). arg( msg->method() ); } - return TQString::null; + return TQString(); } static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, ScheduleMessage *msg, const TQString &sender ) { if ( !msg || !todo ) { - return TQString::null; + return TQString(); } switch ( msg->method() ) { @@ -1752,7 +1752,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, Attendee::List attendees = todo->attendees(); if( attendees.count() == 0 ) { kdDebug(5850) << "No attendees in the iCal reply!" << endl; - return TQString::null; + return TQString(); } if( attendees.count() != 1 ) { kdDebug(5850) << "Warning: attendeecount in the reply should be 1 " @@ -1845,13 +1845,13 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, return i18n( "Error: iMIP message with unknown method: '%1'" ). arg( msg->method() ); } - return TQString::null; + return TQString(); } static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg ) { if ( !msg || !journal ) { - return TQString::null; + return TQString(); } switch ( msg->method() ) { @@ -1874,7 +1874,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg Attendee::List attendees = journal->attendees(); if( attendees.count() == 0 ) { kdDebug(5850) << "No attendees in the iCal reply!" << endl; - return TQString::null; + return TQString(); } if( attendees.count() != 1 ) { kdDebug(5850) << "Warning: attendeecount in the reply should be 1 " @@ -1910,13 +1910,13 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg return i18n("Error: iMIP message with unknown method: '%1'"). arg( msg->method() ); } - return TQString::null; + return TQString(); } static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg ) { if ( !msg || !fb ) { - return TQString::null; + return TQString(); } switch ( msg->method() ) { @@ -1965,7 +1965,7 @@ static TQString invitationAttendees( Incidence *incidence ) } tmpStr += "<tr>"; tmpStr += "<td>"; - tmpStr += invitationPerson( a->email(), a->name(), TQString::null ); + tmpStr += invitationPerson( a->email(), a->name(), TQString() ); if ( !a->delegator().isEmpty() ) { tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } @@ -2117,7 +2117,7 @@ class IncidenceFormatter::IncidenceCompareVisitor TQString result() const { if ( mChanges.isEmpty() ) { - return TQString::null; + return TQString(); } TQString html = "<div align=\"left\"><ul><li>"; html += mChanges.join( "</li><li>" ); @@ -2388,7 +2388,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, const TQString &sender ) { if ( invitation.isEmpty() ) { - return TQString::null; + return TQString(); } ICalFormat format; @@ -2399,7 +2399,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, kdDebug( 5850 ) << "Failed to parse the scheduling message" << endl; Q_ASSERT( format.exception() ); kdDebug( 5850 ) << format.exception()->message() << endl; - return TQString::null; + return TQString(); } IncidenceBase *incBase = msg->event(); @@ -2437,12 +2437,12 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, InvitationHeaderVisitor headerVisitor; // The InvitationHeaderVisitor returns false if the incidence is somehow invalid, or not handled if ( !headerVisitor.act( incBase, existingIncidence, msg, sender ) ) - return TQString::null; + return TQString(); html += "<b>" + headerVisitor.result() + "</b>"; InvitationBodyVisitor bodyVisitor( noHtmlMode ); if ( !bodyVisitor.act( incBase, existingIncidence, msg, sender ) ) - return TQString::null; + return TQString(); html += bodyVisitor.result(); if ( msg->method() == Scheduler::Request ) { @@ -2702,14 +2702,14 @@ TQString IncidenceFormatter::formatICalInvitationNoHtml( TQString invitation, //----------------------------------------------------------------------------- static TQString stringProp( KTNEFMessage* tnefMsg, const TQ_UINT32& key, - const TQString& fallback = TQString::null) + const TQString& fallback = TQString()) { return tnefMsg->findProp( key < 0x10000 ? key & 0xFFFF : key >> 16, fallback ); } static TQString sNamedProp( KTNEFMessage* tnefMsg, const TQString& name, - const TQString& fallback = TQString::null ) + const TQString& fallback = TQString() ) { return tnefMsg->findNamedProp( name, fallback ); } @@ -2782,7 +2782,7 @@ static TQDateTime utc2Local( const TQDateTime& utcdt ) } -static TQDateTime pureISOToLocalQDateTime( const TQString& dtStr, +static TQDateTime pureISOToLocalTQDateTime( const TQString& dtStr, bool bDateOnly = false ) { TQDate tmpDate; @@ -2843,7 +2843,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) // Everything depends from property PR_MESSAGE_CLASS // (this is added by KTNEFParser): - TQString msgClass = tnefMsg->findProp( 0x001A, TQString::null, true ) + TQString msgClass = tnefMsg->findProp( 0x001A, TQString(), true ) .upper(); if( !msgClass.isEmpty() ) { // Match the old class names that might be used by Outlook for @@ -2907,9 +2907,9 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) TQString sSenderSearchKeyEmail( tnefMsg->findProp( 0x0C1D ) ); if( !sSenderSearchKeyEmail.isEmpty() ) { - int colon = sSenderSearchKeyEmail.find( ':' ); + int colon = sSenderSearchKeyEmail.tqfind( ':' ); // May be e.g. "SMTP:KHZ@KDE.ORG" - if( sSenderSearchKeyEmail.find( ':' ) == -1 ) + if( sSenderSearchKeyEmail.tqfind( ':' ) == -1 ) sSenderSearchKeyEmail.remove( 0, colon+1 ); } @@ -2920,19 +2920,19 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) it != attendees.end(); ++it ) { // Skip all entries that have no '@' since these are // no mail addresses - if( (*it).find('@') == -1 ) { + if( (*it).tqfind('@') == -1 ) { s = (*it).stripWhiteSpace(); 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); @@ -2943,17 +2943,17 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) // This must be old style, let us use the PR_SENDER_SEARCH_KEY. s = sSenderSearchKeyEmail; if( !s.isEmpty() ) { - Attendee *attendee = new Attendee( TQString::null, TQString::null, + Attendee *attendee = new Attendee( TQString(), TQString(), 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); @@ -2966,12 +2966,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) if( !s.isEmpty() ) event->setOrganizer( s ); - s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString::null ) - .tqreplace( TQChar( ':' ), TQString::null ); + s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString() ) + .tqreplace( TQChar( ':' ), TQString() ); event->setDtStart( TQDateTime::fromString( s ) ); // ## Format?? - s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString::null ) - .tqreplace( TQChar( ':' ), TQString::null ); + s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString() ) + .tqreplace( TQChar( ':' ), TQString() ); event->setDtEnd( TQDateTime::fromString( s ) ); s = tnefMsg->findProp( 0x8208 ); @@ -2988,8 +2988,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) // PENDING(khz): is this value in local timezone? Must it be // adjusted? Most likely this is a bug in the server or in // Outlook - we ignore it for now. - s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString::null ) - .tqreplace( TQChar( ':' ), TQString::null ); + s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString() ) + .tqreplace( TQChar( ':' ), TQString() ); // ### libkcal always uses tqcurrentDateTime() // event->setDtStamp(TQDateTime::fromString(s)); @@ -3009,11 +3009,11 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) if(!tnefMsg->findProp(0x8503).isEmpty()) { Alarm *alarm = new Alarm(event); TQDateTime highNoonTime = - pureISOToLocalQDateTime( tnefMsg->findProp( 0x8502 ) + pureISOToLocalTQDateTime( tnefMsg->findProp( 0x8502 ) .tqreplace( TQChar( '-' ), "" ) .tqreplace( TQChar( ':' ), "" ) ); TQDateTime wakeMeUpTime = - pureISOToLocalQDateTime( tnefMsg->findProp( 0x8560, "" ) + pureISOToLocalTQDateTime( tnefMsg->findProp( 0x8560, "" ) .tqreplace( TQChar( '-' ), "" ) .tqreplace( TQChar( ':' ), "" ) ); alarm->setTime(wakeMeUpTime); @@ -3047,8 +3047,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) addressee.insertCustom( "KADDRESSBOOK", "X-Profession", stringProp( tnefMsg, MAPI_TAG_PR_PROFESSION ) ); TQString s = tnefMsg->findProp( MAPI_TAG_PR_WEDDING_ANNIVERSARY ) - .tqreplace( TQChar( '-' ), TQString::null ) - .tqreplace( TQChar( ':' ), TQString::null ); + .tqreplace( TQChar( '-' ), TQString() ) + .tqreplace( TQChar( ':' ), TQString() ); if( !s.isEmpty() ) addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", s ); @@ -3114,8 +3114,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) ); s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY ) - .tqreplace( TQChar( '-' ), TQString::null ) - .tqreplace( TQChar( ':' ), TQString::null ); + .tqreplace( TQChar( '-' ), TQString() ) + .tqreplace( TQChar( ':' ), TQString() ); if( !s.isEmpty() ) addressee.setBirthday( TQDateTime::fromString( s ) ); @@ -3361,7 +3361,7 @@ static TQString tooltipPerson( const TQString& email, TQString name ) // and name is missing if ( name.isEmpty() && !email.isEmpty() ) { KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->tqfindByEmail( email ); + KABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { KABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { @@ -3469,7 +3469,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden uint maxDescLen = 120; // maximum description chars to print (before elipsis) if ( !incidence ) { - return TQString::null; + return TQString(); } TQString tmp = "<qt>"; @@ -3554,7 +3554,7 @@ TQString IncidenceFormatter::toolTipStr( Calendar *calendar, if ( v.act( calendar, incidence, date, richText ) ) { return v.result(); } else { - return TQString::null; + return TQString(); } } @@ -3709,13 +3709,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal ) TQString IncidenceFormatter::mailBodyString( IncidenceBase *incidence ) { if ( !incidence ) - return TQString::null; + return TQString(); MailBodyVisitor v; if ( v.act( incidence ) ) { return v.result(); } - return TQString::null; + return TQString(); } static TQString recurEnd( Incidence *incidence ) @@ -4039,12 +4039,12 @@ TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date, TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *incidence ) { if ( !calendar || !incidence ) { - return TQString::null; + return TQString(); } CalendarResources *calendarResource = dynamic_cast<CalendarResources*>( calendar ); if ( !calendarResource ) { - return TQString::null; + return TQString(); } ResourceCalendar *resourceCalendar = calendarResource->resource( incidence ); @@ -4060,7 +4060,7 @@ TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *inci return resourceCalendar->resourceName(); } - return TQString::null; + return TQString(); } static TQString secs2Duration( int secs ) diff --git a/libkcal/listbase.h b/libkcal/listbase.h index 2ce1dfa1..ac9e628e 100644 --- a/libkcal/listbase.h +++ b/libkcal/listbase.h @@ -67,7 +67,7 @@ class ListBase : public TQValueList<T *> bool removeRef( T *t ) { - TQValueListIterator<T *> it = find( t ); + TQValueListIterator<T *> it = tqfind( t ); if ( it == TQValueList<T*>::end() ) { return false; } else { diff --git a/libkcal/person.cpp b/libkcal/person.cpp index aad80f68..3d7c2b42 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -64,7 +64,7 @@ TQString Person::fullName() const // Taken from KABC::Addressee::fullEmail TQString name = mName; TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ); - bool weNeedToQuote = name.find( needQuotes ) != -1; + bool weNeedToQuote = name.tqfind( needQuotes ) != -1; if ( weNeedToQuote ) { if ( name[0] != '"' ) name.prepend( '"' ); diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index 372c5230..964e48c5 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -38,17 +38,17 @@ using namespace KCal; -class QtopiaParser : public QXmlDefaultHandler +class TQtopiaParser : public TQXmlDefaultHandler { public: - QtopiaParser( Calendar *calendar ) : mCalendar( calendar ) {} + TQtopiaParser( Calendar *calendar ) : mCalendar( calendar ) {} bool startElement( const TQString &, const TQString &, const TQString & qName, const TQXmlAttributes &attributes ) { if ( qName == "event" ) { Event *event = new Event; - TQString uid = "Qtopia" + attributes.value( "uid" ); + TQString uid = "TQtopia" + attributes.value( "uid" ); event->setUid( uid ); event->setSummary( attributes.value( "description" ) ); @@ -136,11 +136,11 @@ class QtopiaParser : public QXmlDefaultHandler } else if ( qName == "Task" ) { Todo *todo = new Todo; - TQString uid = "Qtopia" + attributes.value( "Uid" ); + TQString uid = "TQtopia" + attributes.value( "Uid" ); todo->setUid( uid ); TQString description = attributes.value( "Description" ); - int pos = description.find( '\n' ); + int pos = description.tqfind( '\n' ); if ( pos > 0 ) { TQString summary = description.left( pos ); todo->setSummary( summary ); @@ -205,7 +205,7 @@ class QtopiaParser : public QXmlDefaultHandler TQString errorString () { - return "QtopiaParser: Error!"; + return "TQtopiaParser: Error!"; } protected: @@ -242,7 +242,7 @@ class QtopiaParser : public QXmlDefaultHandler static TQString category( const TQString &id ) { - TQMap<TQString,TQString>::ConstIterator it = mCategoriesMap.find( id ); + TQMap<TQString,TQString>::ConstIterator it = mCategoriesMap.tqfind( id ); if ( it == mCategoriesMap.end() ) return id; else return *it; } @@ -255,23 +255,23 @@ class QtopiaParser : public QXmlDefaultHandler static TQMap<TQString,TQString> mCategoriesMap; }; -TQMap<TQString,TQString> QtopiaParser::mCategoriesMap; +TQMap<TQString,TQString> TQtopiaParser::mCategoriesMap; -QtopiaFormat::QtopiaFormat() +TQtopiaFormat::TQtopiaFormat() { } -QtopiaFormat::~QtopiaFormat() +TQtopiaFormat::~TQtopiaFormat() { } -bool QtopiaFormat::load( Calendar *calendar, const TQString &fileName) +bool TQtopiaFormat::load( Calendar *calendar, const TQString &fileName) { - kdDebug(5800) << "QtopiaFormat::load() " << fileName << endl; + kdDebug(5800) << "TQtopiaFormat::load() " << fileName << endl; clearException(); - QtopiaParser handler( calendar ); + TQtopiaParser handler( calendar ); TQFile xmlFile( fileName ); TQXmlInputSource source( xmlFile ); TQXmlSimpleReader reader; @@ -279,9 +279,9 @@ bool QtopiaFormat::load( Calendar *calendar, const TQString &fileName) return reader.parse( source ); } -bool QtopiaFormat::save( Calendar *calendar, const TQString &fileName ) +bool TQtopiaFormat::save( Calendar *calendar, const TQString &fileName ) { - kdDebug(5800) << "QtopiaFormat::save(): " << fileName << endl; + kdDebug(5800) << "TQtopiaFormat::save(): " << fileName << endl; clearException(); @@ -304,13 +304,13 @@ bool QtopiaFormat::save( Calendar *calendar, const TQString &fileName ) return true; } -bool QtopiaFormat::fromString( Calendar *, const TQString & ) +bool TQtopiaFormat::fromString( Calendar *, const TQString & ) { - kdDebug(5800) << "QtopiaFormat::fromString() not yet implemented." << endl; + kdDebug(5800) << "TQtopiaFormat::fromString() not yet implemented." << endl; return false; } -TQString QtopiaFormat::toString( Calendar * ) +TQString TQtopiaFormat::toString( Calendar * ) { - return TQString::null; + return TQString(); } diff --git a/libkcal/qtopiaformat.h b/libkcal/qtopiaformat.h index a2950f19..37caf871 100644 --- a/libkcal/qtopiaformat.h +++ b/libkcal/qtopiaformat.h @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KCAL_QTOPIAFORMAT_H -#define KCAL_QTOPIAFORMAT_H +#ifndef KCAL_TQTOPIAFORMAT_H +#define KCAL_TQTOPIAFORMAT_H #include <tqstring.h> @@ -31,13 +31,13 @@ namespace KCal { /** - This class implements the calendar format used by Qtopia. + This class implements the calendar format used by TQtopia. */ -class LIBKCAL_EXPORT QtopiaFormat : public CalFormat +class LIBKCAL_EXPORT TQtopiaFormat : public CalFormat { public: - QtopiaFormat(); - virtual ~QtopiaFormat(); + TQtopiaFormat(); + virtual ~TQtopiaFormat(); bool load( Calendar *, const TQString &fileName ); bool save( Calendar *, const TQString &fileName ); diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 474d885f..47169ae4 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp @@ -839,7 +839,7 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const TQDateTime nextDT = preDateTime; // prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g. // the exrule is identical to the rrule). If an occurrence is found, break - // out of the loop by returning that QDateTime + // out of the loop by returning that TQDateTime // TODO_Recurrence: Is a loop counter of 1000 really okay? I mean for secondly // recurrence, an exdate might exclude more than 1000 intervals! int loop = 0; @@ -893,8 +893,8 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const nextDT = dates.first(); // Check if that date/time is excluded explicitly or by an exrule: - if ( !tqcontainsSorted( mExDates, nextDT.date() ) && - !tqcontainsSorted( mExDateTimes, nextDT ) ) { + if ( !containsSorted( mExDates, nextDT.date() ) && + !containsSorted( mExDateTimes, nextDT ) ) { bool allowed = true; for ( i = 0, end = mExRules.count(); i < end; ++i ) { allowed = allowed && !( mExRules[i]->recursAt( nextDT ) ); @@ -914,7 +914,7 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co TQDateTime prevDT = afterDateTime; // prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g. // the exrule is identical to the rrule). If an occurrence is found, break - // out of the loop by returning that QDateTime + // out of the loop by returning that TQDateTime int loop = 0; while ( loop < 1000 ) { // Outline of the algo: @@ -964,8 +964,8 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co prevDT = dates.last(); // Check if that date/time is excluded explicitly or by an exrule: - if ( !tqcontainsSorted( mExDates, prevDT.date() ) && - !tqcontainsSorted( mExDateTimes, prevDT ) ) { + if ( !containsSorted( mExDates, prevDT.date() ) && + !containsSorted( mExDateTimes, prevDT ) ) { bool allowed = true; for ( i = 0, end = mExRules.count(); i < end; ++i ) { allowed = allowed && !( mExRules[i]->recursAt( prevDT ) ); diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h index 355a922f..ea0bbd33 100644 --- a/libkcal/recurrence.h +++ b/libkcal/recurrence.h @@ -184,7 +184,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer /** Returns the date and time of the next recurrence, after the specified date/time. * If the recurrence has no time, the next date after the specified date is returned. * @param preDateTime the date/time after which to find the recurrence. - * @return date/time of next recurrence (strictly later than the given QDateTiem), or invalid date if none. + * @return date/time of next recurrence (strictly later than the given TQDateTiem), or invalid date if none. */ TQDateTime getNextDateTime( const TQDateTime& preDateTime ) const; /** Returns the date and time of the last previous recurrence, before the specified date/time. diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp index e225edb0..733e3f5e 100644 --- a/libkcal/recurrencerule.cpp +++ b/libkcal/recurrencerule.cpp @@ -35,10 +35,10 @@ using namespace KCal; // Maximum number of intervals to process const int LOOP_LIMIT = 10000; -// FIXME: If Qt is ever changed so that TQDateTime:::addSecs takes into account +// FIXME: If TQt is ever changed so that TQDateTime:::addSecs takes into account // DST shifts, we need to use our own addSecs method, too, since we // need to caalculate things in UTC! -/** Workaround for broken TQDateTime::secsTo (at least in Qt 3.3). While +/** Workaround for broken TQDateTime::secsTo (at least in TQt 3.3). While TQDateTime::secsTo does take time zones into account, TQDateTime::addSecs does not, so we have a problem: TQDateTime d1(TQDate(2005, 10, 30), TQTime(1, 30, 0) ); @@ -104,7 +104,7 @@ TQDate DateHelper::getNthWeek( int year, int weeknumber, short weekstart ) { if ( weeknumber == 0 ) return TQDate(); // Adjust this to the first day of week #1 of the year and add 7*weekno days. - TQDate dt( year, 1, 4 ); // Week #1 is the week that tqcontains Jan 4 + TQDate dt( year, 1, 4 ); // Week #1 is the week that contains Jan 4 int adjust = -(7 + dt.dayOfWeek() - weekstart) % 7; if ( weeknumber > 0 ) { dt = dt.addDays( 7 * (weeknumber-1) + adjust ); @@ -418,7 +418,7 @@ DateTimeList RecurrenceRule::Constraint::dateTimes( RecurrenceRule::PeriodType t bool RecurrenceRule::Constraint::increase( RecurrenceRule::PeriodType type, int freq ) { - // convert the first day of the interval to QDateTime + // convert the first day of the interval to TQDateTime // Sub-daily types need to be converted to UTC to correctly handle DST shifts TQDateTime dt( intervalDateTime( type ) ); @@ -1299,7 +1299,7 @@ DateTimeList RecurrenceRule::timesInInterval( const TQDateTime &dtStart, if ( dt < enddt ) { n = static_cast<int>( ( dt.secsTo( enddt ) - 1 ) / mTimedRepetition ) + 1; // limit n by a sane value else we can "explode". - n = QMIN( n, LOOP_LIMIT ); + n = TQMIN( n, LOOP_LIMIT ); for ( int i = 0; i < n; dt = dt.addSecs( mTimedRepetition ), ++i ) { result += dt; } @@ -1453,7 +1453,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat case rMinutely: modifier *= 60; case rSecondly: periods = ownSecsTo( start, toDate ) / modifier; - periods = QMAX( 0, periods); + periods = TQMAX( 0, periods); if ( periods > 0 ) periods += ( frequency() - 1 - ( (periods - 1) % frequency() ) ); nextValid = start.addSecs( modifier * periods ); @@ -1466,7 +1466,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat modifier *= 7; case rDaily: periods = start.daysTo( toDate ) / modifier; - periods = QMAX( 0, periods); + periods = TQMAX( 0, periods); if ( periods > 0 ) periods += (frequency() - 1 - ( (periods - 1) % frequency() ) ); nextValid = start.addDays( modifier * periods ); @@ -1475,7 +1475,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat case rMonthly: { periods = 12*( toDate.date().year() - start.date().year() ) + ( toDate.date().month() - start.date().month() ); - periods = QMAX( 0, periods); + periods = TQMAX( 0, periods); if ( periods > 0 ) periods += (frequency() - 1 - ( (periods - 1) % frequency() ) ); // set the day to the first day of the month, so we don't have problems @@ -1485,7 +1485,7 @@ RecurrenceRule::Constraint RecurrenceRule::getNextValidDateInterval( const TQDat break; } case rYearly: periods = ( toDate.date().year() - start.date().year() ); - periods = QMAX( 0, periods); + periods = TQMAX( 0, periods); if ( periods > 0 ) periods += ( frequency() - 1 - ( (periods - 1) % frequency() ) ); nextValid.setDate( start.date().addYears( periods ) ); diff --git a/libkcal/recurrencerule.h b/libkcal/recurrencerule.h index 422113b5..a93062d0 100644 --- a/libkcal/recurrencerule.h +++ b/libkcal/recurrencerule.h @@ -148,7 +148,7 @@ Q_INLINE_TEMPLATES int removeSorted( TQValueList<T> &lst, const T &value, int st } template <class T> -Q_INLINE_TEMPLATES bool tqcontainsSorted( const TQValueList<T> &lst, const T &value ) +Q_INLINE_TEMPLATES bool containsSorted( const TQValueList<T> &lst, const T &value ) { return findSorted( lst, value, 0 ) >= 0; } @@ -199,7 +199,7 @@ class LIBKCAL_EXPORT RecurrenceRule // Bounded by -366 and +366, 0 means all weeks in that period }; - RecurrenceRule( /*Incidence *parent, int compatVersion = 0*/ ); + RecurrenceRule( /*Incidence *tqparent, int compatVersion = 0*/ ); RecurrenceRule(const RecurrenceRule&); ~RecurrenceRule(); @@ -207,7 +207,7 @@ class LIBKCAL_EXPORT RecurrenceRule bool operator!=( const RecurrenceRule& r ) const { return !operator==(r); } RecurrenceRule &operator=(const RecurrenceRule&); -// Incidence *parent() const { return mParent; } +// Incidence *tqparent() const { return mParent; } /** Set if recurrence is read-only or can be changed. */ diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index a6365979..0e2d8d56 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -485,7 +485,7 @@ void ResourceCached::calendarIncidenceAdded( Incidence *i ) #endif TQMap<Incidence *,bool>::ConstIterator it; - it = mAddedIncidences.find( i ); + it = mAddedIncidences.tqfind( i ); if ( it == mAddedIncidences.end() ) { mAddedIncidences.insert( i, true ); } @@ -501,7 +501,7 @@ void ResourceCached::calendarIncidenceChanged( Incidence *i ) #endif TQMap<Incidence *,bool>::ConstIterator it; - it = mChangedIncidences.find( i ); + it = mChangedIncidences.tqfind( i ); // FIXME: If you modify an added incidence, there's no need to add it to mChangedIncidences! if ( it == mChangedIncidences.end() ) { mChangedIncidences.insert( i, true ); @@ -518,19 +518,19 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i ) #endif if (i->hasRecurrenceID()) { - // This incidence has a parent; notify the parent of the child's death and do not destroy the parent! - // Get the parent + // This incidence has a tqparent; notify the tqparent of the child's death and do not destroy the tqparent! + // Get the tqparent IncidenceList il = i->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *parentIncidence; - parentIncidence = this->incidence(*it); + Incidence *tqparentIncidence; + tqparentIncidence = this->incidence(*it); // Remove the child - calendarIncidenceChanged(parentIncidence); + calendarIncidenceChanged(tqparentIncidence); } else { TQMap<Incidence *,bool>::ConstIterator it; - it = mDeletedIncidences.find( i ); + it = mDeletedIncidences.tqfind( i ); if ( it == mDeletedIncidences.end() ) { mDeletedIncidences.insert( i, true ); } diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 74fcf5d6..f4302372 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -46,6 +46,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, public KCal::Calendar::Observer { Q_OBJECT + TQ_OBJECT public: /** Reload policy. diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index c1793c26..5224ff8b 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -35,9 +35,9 @@ using namespace KCal; -ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, +ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -75,9 +75,9 @@ void ResourceCachedReloadConfig::slotIntervalStateChanged( int state ) } -ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, +ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index fae77c33..16364f42 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -36,11 +36,12 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT ResourceCachedReloadConfig : public QWidget +class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceCachedReloadConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: void loadSettings( ResourceCached *resource ); @@ -62,11 +63,12 @@ class KDE_EXPORT ResourceCachedReloadConfig : public QWidget @see ResourceCached */ -class KDE_EXPORT ResourceCachedSaveConfig : public QWidget +class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceCachedSaveConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: void loadSettings( ResourceCached *resource ); diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 91f3d1ae..03318737 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -57,6 +57,7 @@ class CalFormat; class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource { Q_OBJECT + TQ_OBJECT public: ResourceCalendar( const KConfig * ); virtual ~ResourceCalendar(); @@ -385,10 +386,10 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource virtual bool removeSubresource( const TQString& resource ); /** - * Add a subresource with the name @param resource and the parent - * id @param parent. + * Add a subresource with the name @param resource and the tqparent + * id @param tqparent. */ - virtual bool addSubresource( const TQString& resource, const TQString& parent ); + virtual bool addSubresource( const TQString& resource, const TQString& tqparent ); /** * Returns the type of the subresource: "event", "todo" or "journal", @@ -440,11 +441,11 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource /** A resource should call this function if a load error happens. */ - void loadError( const TQString &errorMessage = TQString::null ); + void loadError( const TQString &errorMessage = TQString() ); /** A resource should call this function if a save error happens. */ - void saveError( const TQString &errorMessage = TQString::null ); + void saveError( const TQString &errorMessage = TQString() ); private: bool mReceivedLoadError; diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index ce0a112b..a5043a3f 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -45,6 +45,7 @@ class CalFormat; class LIBKCAL_EXPORT ResourceLocal : public ResourceCached { Q_OBJECT + TQ_OBJECT friend class ResourceLocalConfig; diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 49728fe6..65b3cfe7 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -40,8 +40,8 @@ using namespace KCal; -ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +ResourceLocalConfig::ResourceLocalConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index 796355bc..fbd0d00f 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -42,8 +42,9 @@ namespace KCal { class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceLocalConfig( TQWidget* tqparent = 0, const char* name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index e1316f21..c83d5128 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -45,6 +45,7 @@ class Incidence; class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached { Q_OBJECT + TQ_OBJECT friend class ResourceLocalDirConfig; diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index df2412b3..263d1ce2 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -39,8 +39,8 @@ using namespace KCal; -ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h index 5588d36e..df1e682b 100644 --- a/libkcal/resourcelocaldirconfig.h +++ b/libkcal/resourcelocaldirconfig.h @@ -44,8 +44,9 @@ namespace KCal { class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceLocalDirConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 4622716a..54709eb4 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 tqStatus: %1").arg(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=" @@ -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); @@ -330,13 +330,13 @@ bool Scheduler::acceptRequest( IncidenceBase *incidence, return false; } - // FIXME: This is a nasty hack, since we need to set a parent for the + // FIXME: This is a nasty hack, since we need to set a tqparent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmpparent = 0; + TQWidget *tmptqparent = 0; if ( stdcal ) { - tmpparent = stdcal->dialogParentWidget(); + tmptqparent = stdcal->dialogParentWidget(); stdcal->setDialogParentWidget( 0 ); } @@ -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; @@ -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 bf22c9c8..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,8 +140,8 @@ class LIBKCAL_EXPORT Scheduler on who's behalf this transaction is to be performed. */ bool acceptTransaction( IncidenceBase *, Method method, - ScheduleMessage::Status status, - const TQString& attendee = TQString::null ); + ScheduleMessage::tqStatus status, + const TQString& attendee = TQString() ); /** Return a machine-readable name for a iTIP method. @@ -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/testfields.cpp b/libkcal/tests/testfields.cpp index a6117088..bb95d1f3 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -58,8 +58,8 @@ int main(int argc,char **argv) 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. + // 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"); @@ -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 tqStatus = " << e->synctqStatus() << endl; } else { kdError() << "No Pilot ID" << endl; return 1; @@ -86,7 +86,7 @@ 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::tqfromLatin1("Mooo summary"); @@ -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 tqStatus = " << 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 tqStatus = " << 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 ef9d62c8..ca65dbfd 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -109,7 +109,7 @@ int main( int argc, char **argv ) dt = dt.addSecs( -1 ); ++i; dt = incidence->recurrence()->getPreviousDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { if ( !dt.isValid() ) dt = TQDateTime( TQDate( 2005, 7, 31 ), TQTime( 23, 59, 59 ) ); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index 4d0a2fae..bc1c0d37 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -105,7 +105,7 @@ int main( int argc, char **argv ) ++i; dt = dt.addSecs( 1 ); dt = incidence->recurrence()->getNextDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { incidence->recurrence()->dump(); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index 4d0a2fae..bc1c0d37 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -105,7 +105,7 @@ int main( int argc, char **argv ) ++i; dt = dt.addSecs( 1 ); dt = incidence->recurrence()->getNextDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { incidence->recurrence()->dump(); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index 343bad45..fe949f6d 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -102,14 +102,14 @@ int main( int argc, char **argv ) // Output to file for testing purposes while ( dt.year() <= 2010 ) { if ( incidence->recursOn( dt ) ) - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; dt = dt.addDays( 1 ); } } else { dt = TQDate( 2005, 1, 1 ); while ( dt.year() < 2007 ) { if ( incidence->recursOn( dt ) ) - kdDebug(5800) << dt.toString( Qt::ISODate ) << endl; + kdDebug(5800) << dt.toString( TQt::ISODate ) << endl; dt = dt.addDays( 1 ); } } diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index cd5174e2..68251869 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) KApplication app; KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - TQString type = TQString::null; + TQString type = TQString(); if ( args->getOption( "resource" ) ) type = TQString::fromLocal8Bit( args->getOption( "resource" ) ); KConfig *config = 0; @@ -133,9 +133,9 @@ void TestResource::runAll() bool TestResource::check(const TQString& txt, TQString a, TQString b) { if (a.isEmpty()) - a = TQString::null; + a = TQString(); if (b.isEmpty()) - b = TQString::null; + b = TQString(); if (a == b) { kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl; } diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h index 30e61aeb..848d7988 100644 --- a/libkcal/tests/testresource.h +++ b/libkcal/tests/testresource.h @@ -26,9 +26,10 @@ namespace KCal { class ResourceCalendar; -class TestResource : public QObject +class TestResource : public TQObject { Q_OBJECT + TQ_OBJECT public: TestResource( const TQString& type, KConfig *config ); diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp index 853c5187..590263ab 100644 --- a/libkcal/vcaldrag.cpp +++ b/libkcal/vcaldrag.cpp @@ -26,8 +26,8 @@ using namespace KCal; -VCalDrag::VCalDrag( Calendar *cal, TQWidget *parent, const char *name ) - : TQStoredDrag( "text/x-vCalendar", parent, name ) +VCalDrag::VCalDrag( Calendar *cal, TQWidget *tqparent, const char *name ) + : TQStoredDrag( "text/x-vCalendar", tqparent, name ) { VCalFormat format; setEncodedData( format.toString( cal ).utf8() ); diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h index 8855ed5f..c139827a 100644 --- a/libkcal/vcaldrag.h +++ b/libkcal/vcaldrag.h @@ -32,13 +32,13 @@ class Calendar; /** vCalendar drag&drop class. */ -class KDE_EXPORT VCalDrag : public QStoredDrag +class KDE_EXPORT VCalDrag : public TQStoredDrag { public: /** Create a drag&drop object for vCalendar component \a vcal. */ - VCalDrag( Calendar *vcal, TQWidget *parent = 0, const char *name = 0 ); + VCalDrag( Calendar *vcal, TQWidget *tqparent = 0, const char *name = 0 ); ~VCalDrag() {} /** diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 21d8ae4b..40736a90 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -184,7 +184,7 @@ TQString VCalFormat::toString( Calendar *calendar ) Event *event = events.first(); if ( !event ) { cleanVObject( vcal ); - return TQString::null; + return TQString(); } VObject *vevent = eventToVEvent( event ); @@ -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())); } } @@ -270,7 +270,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) if (!anEvent->description().isEmpty()) { VObject *d = addPropValue(vtodo, VCDescriptionProp, anEvent->description().local8Bit()); - if (anEvent->description().find('\n') != -1) + if (anEvent->description().tqfind('\n') != -1) addPropValue(d, VCEncodingProp, VCQuotedPrintableProp); } @@ -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())); } } @@ -530,7 +530,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) if (!anEvent->description().isEmpty()) { VObject *d = addPropValue(vevent, VCDescriptionProp, anEvent->description().local8Bit()); - if (anEvent->description().find('\n') != -1) + if (anEvent->description().tqfind('\n') != -1) addPropValue(d, VCEncodingProp, VCQuotedPrintableProp); } @@ -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()); } @@ -658,7 +658,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // creation date if ((vo = isAPropertyOf(vtodo, VCDCreatedProp)) != 0) { - anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setCreated(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } @@ -673,7 +673,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // last modification date if ((vo = isAPropertyOf(vtodo, VCLastModifiedProp)) != 0) { - anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setLastModified(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else @@ -701,13 +701,13 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) deleteStr(s); tmpStr = tmpStr.simplifyWhiteSpace(); int emailPos1, emailPos2; - if ((emailPos1 = tmpStr.find('<')) > 0) { + if ((emailPos1 = tmpStr.tqfind('<')) > 0) { // both email address and name emailPos2 = tmpStr.findRev('>'); a = new Attendee(tmpStr.left(emailPos1 - 1), tmpStr.mid(emailPos1 + 1, emailPos2 - (emailPos1 + 1))); - } else if (tmpStr.find('@') > 0) { + } else if (tmpStr.tqfind('@') > 0) { // just an email address a = new Attendee(0, tmpStr); } else { @@ -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); } @@ -765,7 +765,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // completion date if ((vo = isAPropertyOf(vtodo, VCCompletedProp)) != 0) { - anEvent->setCompleted(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setCompleted(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } @@ -777,7 +777,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // due date if ((vo = isAPropertyOf(vtodo, VCDueProp)) != 0) { - anEvent->setDtDue(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setDtDue(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); anEvent->setHasDueDate(true); } else { @@ -786,8 +786,8 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) // start time if ((vo = isAPropertyOf(vtodo, VCDTstartProp)) != 0) { - anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); - // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; + anEvent->setDtStart(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; deleteStr(s); anEvent->setHasStartDate(true); } else { @@ -800,7 +800,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) Alarm* alarm = anEvent->newAlarm(); VObject *a; if ((a = isAPropertyOf(vo, VCRunTimeProp))) { - alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a)))); + alarm->setTime(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(a)))); deleteStr(s); } alarm->setEnabled(true); @@ -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; } @@ -864,7 +864,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // creation date if ((vo = isAPropertyOf(vevent, VCDCreatedProp)) != 0) { - anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setCreated(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } @@ -888,7 +888,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // last modification date if ((vo = isAPropertyOf(vevent, VCLastModifiedProp)) != 0) { - anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setLastModified(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else @@ -917,13 +917,13 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) deleteStr(s); tmpStr = tmpStr.simplifyWhiteSpace(); int emailPos1, emailPos2; - if ((emailPos1 = tmpStr.find('<')) > 0) { + if ((emailPos1 = tmpStr.tqfind('<')) > 0) { // both email address and name emailPos2 = tmpStr.findRev('>'); a = new Attendee(tmpStr.left(emailPos1 - 1), tmpStr.mid(emailPos1 + 1, emailPos2 - (emailPos1 + 1))); - } else if (tmpStr.find('@') > 0) { + } else if (tmpStr.tqfind('@') > 0) { // just an email address a = new Attendee(0, tmpStr); } else { @@ -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); } @@ -956,8 +956,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // start time if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) { - anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); - // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; + anEvent->setDtStart(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; deleteStr(s); if (anEvent->dtStart().time().isNull()) anEvent->setFloats(TRUE); @@ -965,7 +965,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // stop time if ((vo = isAPropertyOf(vevent, VCDTendProp)) != 0) { - anEvent->setDtEnd(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setDtEnd(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); if (anEvent->dtEnd().time().isNull()) anEvent->setFloats(TRUE); @@ -1012,7 +1012,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // kdDebug() << " It's a supported type " << endl; // Immediately after the type is the frequency - int index = tmpStr.find(' '); + int index = tmpStr.tqfind(' '); int last = tmpStr.findRev(' ') + 1; // find last entry int rFreq = tmpStr.mid(typelen, (index-1)).toInt(); ++index; // advance to beginning of stuff after freq @@ -1086,7 +1086,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) else { // e.g. MD1 3 #0 while (index < last) { - int index2 = tmpStr.find(' ', index); + int index2 = tmpStr.tqfind(' ', index); short tmpDay = tmpStr.mid(index, (index2-index)).toShort(); index = index2-1; if (tmpStr.mid(index, 1) == "-") @@ -1108,7 +1108,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) else { // e.g. YM1 3 #0 while (index < last) { - int index2 = tmpStr.find(' ', index); + int index2 = tmpStr.tqfind(' ', index); short tmpMonth = tmpStr.mid(index, (index2-index)).toShort(); index = index2 + 1; anEvent->recurrence()->addYearlyMonth( tmpMonth ); @@ -1127,7 +1127,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) else { // e.g. YD1 123 #0 while (index < last) { - int index2 = tmpStr.find(' ', index); + int index2 = tmpStr.tqfind(' ', index); short tmpDay = tmpStr.mid(index, (index2-index)).toShort(); index = index2+1; anEvent->recurrence()->addYearlyDay( tmpDay ); @@ -1146,8 +1146,8 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt(); if ( rDuration > 0 ) anEvent->recurrence()->setDuration( rDuration ); - } else if ( tmpStr.find('T', index) != -1 ) { - TQDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date(); + } else if ( tmpStr.tqfind('T', index) != -1 ) { + TQDate rEndDate = (ISOToTQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date(); anEvent->recurrence()->setEndDateTime( rEndDate ); } // anEvent->recurrence()->dump(); @@ -1164,7 +1164,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) TQStringList exDates = TQStringList::split(",",s); TQStringList::ConstIterator it; for(it = exDates.begin(); it != exDates.end(); ++it ) { - anEvent->recurrence()->addExDate(ISOToQDate(*it)); + anEvent->recurrence()->addExDate(ISOToTQDate(*it)); } deleteStr(s); } @@ -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 @@ -1262,7 +1262,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) Alarm* alarm = anEvent->newAlarm(); VObject *a; if ((a = isAPropertyOf(vo, VCRunTimeProp))) { - alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a)))); + alarm->setTime(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(a)))); deleteStr(s); } alarm->setEnabled(true); @@ -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; } @@ -1372,7 +1372,7 @@ TQString VCalFormat::qDateTimeToISO(const TQDateTime &qdt, bool zulu) return tmpStr; } -TQDateTime VCalFormat::ISOToQDateTime(const TQString & dtStr) +TQDateTime VCalFormat::ISOToTQDateTime(const TQString & dtStr) { TQDate tmpDate; TQTime tmpTime; @@ -1399,7 +1399,7 @@ TQDateTime VCalFormat::ISOToQDateTime(const TQString & dtStr) return tmpDT; } -TQDate VCalFormat::ISOToQDate(const TQString &dateStr) +TQDate VCalFormat::ISOToTQDate(const TQString &dateStr) { int year, month, day; @@ -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(); @@ -1590,14 +1590,14 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const else if (statStr== "DELEGATED") status = Attendee::Delegated; else { - kdDebug(5800) << "error setting attendee mStatus, unknown mStatus!" << endl; + kdDebug(5800) << "error setting attendee mtqStatus, unknown mtqStatus!" << endl; status = Attendee::NeedsAction; } 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 cb51f417..0e1818a2 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -89,10 +89,10 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat TQString qDateTimeToISO(const TQDateTime &, bool zulu=TRUE); /** takes a string in the format YYYYMMDDTHHMMSS and returns a * valid TQDateTime. */ - TQDateTime ISOToQDateTime(const TQString & dtStr); + TQDateTime ISOToTQDateTime(const TQString & dtStr); /** takes a string in the format YYYYMMDD and returns a * valid TQDate. */ - TQDate ISOToQDate(const TQString & dtStr); + TQDate ISOToTQDate(const TQString & dtStr); /** takes a vCalendar tree of VObjects, and puts all of them that have * the "event" property into the dictionary, todos in the todo-list, etc. */ void populate(VObject *vcal); @@ -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/port.h b/libkcal/versit/port.h index afc16dd4..0052b700 100644 --- a/libkcal/versit/port.h +++ b/libkcal/versit/port.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index 5f38fe00..c03ba9b5 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -228,10 +228,10 @@ 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 -of a parent node is all at the same indentation level and the -immediate children nodes are the immediate properties of the -associated parent nodes. In the following, {N,FN,ORG,TITLE,...} +indicates the tree hirerarchy where the immediate tqchildren nodes +of a tqparent node is all at the same indentation level and the +immediate tqchildren nodes are the immediate properties of the +associated tqparent 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 but has the value "Roland H. Alden"; EMAIL has value and @@ -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 diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c index 0dfc6bff..1ff36f7d 100644 --- a/libkcal/versit/vcc.c +++ b/libkcal/versit/vcc.c @@ -122,7 +122,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -259,7 +259,7 @@ enum LexMode { L_VTODO, L_VALUES, L_BASE64, - L_QUOTED_PRINTABLE + L_TQUOTED_PRINTABLE }; /**** Private Forward Declarations ****/ @@ -1288,7 +1288,7 @@ yyreduce: case 15: #line 259 "vcc.y" { - if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE)) + if (lexWithinMode(L_BASE64) || lexWithinMode(L_TQUOTED_PRINTABLE)) lexPopMode(0); lexPopMode(0); ;} @@ -1750,7 +1750,7 @@ static void enterAttr(const char *s1, const char *s2) lexPushMode(L_BASE64); else if (strcasecmp(p1,VCQuotedPrintableProp) == 0 || (s2 && strcasecmp(p2,VCQuotedPrintableProp)==0)) - lexPushMode(L_QUOTED_PRINTABLE); + lexPushMode(L_TQUOTED_PRINTABLE); deleteStr(s1); deleteStr(s2); } @@ -2329,7 +2329,7 @@ static int yylex() { yylval.str = p; return STRING; } - else if (lexWithinMode(L_QUOTED_PRINTABLE)) { + else if (lexWithinMode(L_TQUOTED_PRINTABLE)) { p = lexGetQuotedPrintable(); } else { diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h index 03886d16..0c160910 100644 --- a/libkcal/versit/vcc.h +++ b/libkcal/versit/vcc.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c index e6a19472..e52cecbe 100644 --- a/libkcal/versit/vobject.c +++ b/libkcal/versit/vobject.c @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -867,7 +867,7 @@ static struct PreDefProp propNames[] = { { VCPronunciationProp, 0, 0, 0 }, { VCPSProp, 0, 0, 0 }, { VCPublicKeyProp, 0, 0, 0 }, - { VCQPProp, VCQuotedPrintableProp, 0, 0 }, + { VCTQPProp, VCQuotedPrintableProp, 0, 0 }, { VCQuickTimeProp, 0, 0, 0 }, { VCQuotedPrintableProp, 0, 0, 0 }, { VCRDateProp, 0, 0, 0 }, @@ -1106,7 +1106,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) unsigned long trip; unsigned char b; char quad[5]; -#define MAXQUADS 16 +#define MAXTQUADS 16 quad[4] = 0; @@ -1133,8 +1133,8 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) /* now output 'quad' with appropriate whitespace and line ending */ appendsOFile(fp, (numQuads == 0 ? " " : "")); appendsOFile(fp, quad); - appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : ""))); - numQuads = (numQuads + 1) % MAXQUADS; + appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXTQUADS-1?"\n" : ""))); + numQuads = (numQuads + 1) % MAXTQUADS; } appendcOFile(fp,'\n'); @@ -1142,7 +1142,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) } /* this function really sucks. Too basic. */ -static void writeQPString(OFile *fp, const char *s, int qp) +static void writeTQPString(OFile *fp, const char *s, int qp) { const char *p = s; while (*p) { @@ -1166,17 +1166,17 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size) case VCVT_USTRINGZ: { char *s = fakeCString(USTRINGZ_VALUE_OF(o)); if (isAPropertyOf(o, VCQuotedPrintableProp)) - writeQPString(fp, s, 1); + writeTQPString(fp, s, 1); else - writeQPString(fp, s, 0); + writeTQPString(fp, s, 0); deleteStr(s); break; } case VCVT_STRINGZ: { if (isAPropertyOf(o, VCQuotedPrintableProp)) - writeQPString(fp, STRINGZ_VALUE_OF(o), 1); + writeTQPString(fp, STRINGZ_VALUE_OF(o), 1); else - writeQPString(fp, STRINGZ_VALUE_OF(o), 0); + writeTQPString(fp, STRINGZ_VALUE_OF(o), 0); break; } case VCVT_UINT: { diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h index c84d4c8a..835a4b13 100644 --- a/libkcal/versit/vobject.h +++ b/libkcal/versit/vobject.h @@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS. IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT, -INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -206,9 +206,9 @@ extern "C" { #define VCPronunciationProp "SOUND" #define VCPSProp "PS" #define VCPublicKeyProp "KEY" -#define VCQPProp "QP" -#define VCQuickTimeProp "QTIME" -#define VCQuotedPrintableProp "QUOTED-PRINTABLE" +#define VCTQPProp "QP" +#define VCQuickTimeProp "TQTIME" +#define VCQuotedPrintableProp "TQUOTED-PRINTABLE" #define VCRDateProp "RDATE" #define VCRegionProp "R" #define VCRelatedToProp "RELATED-TO" |