From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkcal/calendar.cpp | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libkcal/calendar.cpp') diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 4c9e568a3..3d57e7546 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -40,7 +40,7 @@ using namespace KCal; -Calendar::Calendar( const QString &timeZoneId ) +Calendar::Calendar( const TQString &timeZoneId ) { mTimeZoneId = timeZoneId; mLocalTime = false; @@ -81,7 +81,7 @@ void Calendar::setOwner( const Person &owner ) setModified( true ); } -void Calendar::setTimeZoneId( const QString &timeZoneId ) +void Calendar::setTimeZoneId( const TQString &timeZoneId ) { mTimeZoneId = timeZoneId; mLocalTime = false; @@ -90,7 +90,7 @@ void Calendar::setTimeZoneId( const QString &timeZoneId ) doSetTimeZoneId( timeZoneId ); } -QString Calendar::timeZoneId() const +TQString Calendar::timeZoneId() const { return mTimeZoneId; } @@ -122,16 +122,16 @@ CalFilter *Calendar::filter() return mFilter; } -QStringList Calendar::categories() +TQStringList Calendar::categories() { Incidence::List rawInc( rawIncidences() ); - QStringList cats, thisCats; + TQStringList cats, thisCats; // @TODO: For now just iterate over all incidences. In the future, // the list of categories should be built when reading the file. for ( Incidence::List::ConstIterator i = rawInc.constBegin(); i != rawInc.constEnd(); ++i ) { thisCats = (*i)->categories(); - for ( QStringList::ConstIterator si = thisCats.constBegin(); + for ( TQStringList::ConstIterator si = thisCats.constBegin(); si != thisCats.constEnd(); ++si ) { if ( cats.find( *si ) == cats.end() ) { cats.append( *si ); @@ -141,7 +141,7 @@ QStringList Calendar::categories() return cats; } -Incidence::List Calendar::incidences( const QDate &date ) +Incidence::List Calendar::incidences( const TQDate &date ) { return mergeIncidenceList( events( date ), todos( date ), journals( date ) ); } @@ -248,7 +248,7 @@ Event::List Calendar::sortEvents( Event::List *eventList, } -Event::List Calendar::events( const QDate &date, +Event::List Calendar::events( const TQDate &date, EventSortField sortField, SortDirection sortDirection ) { @@ -257,14 +257,14 @@ Event::List Calendar::events( const QDate &date, return el; } -Event::List Calendar::events( const QDateTime &qdt ) +Event::List Calendar::events( const TQDateTime &qdt ) { Event::List el = rawEventsForDate( qdt ); mFilter->apply( &el ); return el; } -Event::List Calendar::events( const QDate &start, const QDate &end, +Event::List Calendar::events( const TQDate &start, const TQDate &end, bool inclusive) { Event::List el = rawEvents( start, end, inclusive ); @@ -301,7 +301,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) /** Dissociate a single occurrence or all future occurrences from a recurring sequence. The new incidence is returned, but not automatically inserted into the calendar, which is left to the calling application */ -Incidence *Calendar::dissociateOccurrence( Incidence *incidence, QDate date, +Incidence *Calendar::dissociateOccurrence( Incidence *incidence, TQDate date, bool single ) { if ( !incidence || !incidence->doesRecur() ) @@ -332,7 +332,7 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, QDate date, // Adjust the date of the incidence if ( incidence->type() == "Event" ) { Event *ev = static_cast( newInc ); - QDateTime start( ev->dtStart() ); + TQDateTime start( ev->dtStart() ); int daysTo = start.date().daysTo( date ); ev->setDtStart( start.addDays( daysTo ) ); ev->setDtEnd( ev->dtEnd().addDays( daysTo ) ); @@ -341,13 +341,13 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, QDate date, bool haveOffset = false; int daysTo = 0; if ( td->hasDueDate() ) { - QDateTime due( td->dtDue() ); + TQDateTime due( td->dtDue() ); daysTo = due.date().daysTo( date ); td->setDtDue( due.addDays( daysTo ), true ); haveOffset = true; } if ( td->hasStartDate() ) { - QDateTime start( td->dtStart() ); + TQDateTime start( td->dtStart() ); if ( !haveOffset ) daysTo = start.date().daysTo( date ); td->setDtStart( start.addDays( daysTo ) ); @@ -367,7 +367,7 @@ Incidence *Calendar::dissociateOccurrence( Incidence *incidence, QDate date, return newInc; } -Incidence *Calendar::incidence( const QString &uid ) +Incidence *Calendar::incidence( const TQString &uid ) { Incidence *i = event( uid ); if ( i ) @@ -379,7 +379,7 @@ Incidence *Calendar::incidence( const QString &uid ) return i; } -Incidence::List Calendar::incidencesFromSchedulingID( const QString &UID ) +Incidence::List Calendar::incidencesFromSchedulingID( const TQString &UID ) { Incidence::List result; Incidence::List incidences = rawIncidences(); @@ -390,7 +390,7 @@ Incidence::List Calendar::incidencesFromSchedulingID( const QString &UID ) return result; } -Incidence *Calendar::incidenceFromSchedulingID( const QString &UID ) +Incidence *Calendar::incidenceFromSchedulingID( const TQString &UID ) { Incidence::List incidences = rawIncidences(); Incidence::List::iterator it = incidences.begin(); @@ -554,7 +554,7 @@ Todo::List Calendar::todos( TodoSortField sortField, return tl; } -Todo::List Calendar::todos( const QDate &date ) +Todo::List Calendar::todos( const TQDate &date ) { Todo::List el = rawTodosForDate( date ); mFilter->apply( &el ); @@ -622,7 +622,7 @@ Journal::List Calendar::journals( JournalSortField sortField, return jl; } -Journal::List Calendar::journals( const QDate &date ) +Journal::List Calendar::journals( const TQDate &date ) { Journal::List el = rawJournalsForDate( date ); mFilter->apply( &el ); @@ -635,7 +635,7 @@ void Calendar::setupRelations( Incidence *forincidence ) { if ( !forincidence ) return; // kdDebug(5850) << "Calendar::setupRelations for incidence " << forincidence << " with UID " << forincidence->uid() << ", summary: " << forincidence->summary() << endl; - QString uid = forincidence->uid(); + TQString uid = forincidence->uid(); // First, go over the list of orphans and see if this is their parent while ( Incidence* i = mOrphans[ uid ] ) { @@ -673,7 +673,7 @@ void Calendar::removeRelations( Incidence *incidence ) } // kdDebug(5850) << "Calendar::removeRelations for incidence " << forincidence << " with UID " << forincidence->uid() << ", summary: " << forincidence->summary() << endl; - QString uid = incidence->uid(); + TQString uid = incidence->uid(); Incidence::List relations = incidence->relations(); Incidence::List::ConstIterator it; @@ -702,17 +702,17 @@ void Calendar::removeRelations( Incidence *incidence ) // incidence (this might happen when the relatedTo of the item is // changed before its parent is inserted. This might happen with // groupware servers....). Remove them, too - QStringList relatedToUids; + TQStringList relatedToUids; // First get the list of all keys in the mOrphans list that point to the removed item relatedToUids << incidence->relatedToUid(); - for ( QDictIterator it( mOrphans ); it.current(); ++it ) { + for ( TQDictIterator it( mOrphans ); it.current(); ++it ) { if ( it.current()->uid() == uid ) { relatedToUids << it.currentKey(); } } // now go through all uids that have one entry that point to the incidence - for ( QStringList::Iterator uidit = relatedToUids.begin(); + for ( TQStringList::Iterator uidit = relatedToUids.begin(); uidit != relatedToUids.end(); ++uidit ) { Incidence::List tempList; // Remove all to get access to the remaining entries @@ -757,7 +757,7 @@ void Calendar::setModified( bool modified ) void Calendar::incidenceUpdated( IncidenceBase *incidence ) { incidence->setSyncStatus( Event::SYNCMOD ); - incidence->setLastModified( QDateTime::currentDateTime() ); + incidence->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. @@ -809,12 +809,12 @@ void Calendar::customPropertyUpdated() setModified( true ); } -void Calendar::setProductId( const QString &productId ) +void Calendar::setProductId( const TQString &productId ) { mProductId = productId; } -QString Calendar::productId() +TQString Calendar::productId() { return mProductId; } -- cgit v1.2.1