diff options
Diffstat (limited to 'kresources/exchange')
-rw-r--r-- | kresources/exchange/dateset.cpp | 8 | ||||
-rw-r--r-- | kresources/exchange/dateset.h | 8 | ||||
-rw-r--r-- | kresources/exchange/resourceexchange.cpp | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp index a2372c874..2fed82af6 100644 --- a/kresources/exchange/dateset.cpp +++ b/kresources/exchange/dateset.cpp @@ -155,24 +155,24 @@ void DateSet::remove( TQDate const& from, TQDate const& to ) } } -bool DateSet::contains( TQDate const& date ) +bool DateSet::tqcontains( TQDate const& date ) { if (mDates->isEmpty()) { return false; } uint i = find( date ); -// kdDebug() << "contains looking for " << date.toString() << " at range " << i << endl; +// kdDebug() << "tqcontains looking for " << date.toString() << " at range " << i << endl; if ( i == mDates->count() ) return false; QPair<TQDate,TQDate>* item = mDates->at( i ); - // kdDebug() << "contains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl; + // kdDebug() << "tqcontains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl; return ( item->first <= date ); } // returns true if and only if the whole range is in the set -bool DateSet::contains( TQDate const& from, TQDate const& to ) +bool DateSet::tqcontains( TQDate const& from, TQDate const& to ) { if (mDates->isEmpty()) { return false; diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h index 989d774cb..d4e9a9fef 100644 --- a/kresources/exchange/dateset.h +++ b/kresources/exchange/dateset.h @@ -34,8 +34,8 @@ class DateRange { DateRange( TQDate const& from, TQDate const& to ) : mFrom( from ), mTo( to ) { } bool operator< ( const DateRange& r ) { return mFrom < r.from(); } - bool contains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); } - bool contains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); } + bool tqcontains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); } + bool tqcontains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); } TQDate from() { return mFrom; } TQDate to() { return mTo; } @@ -68,9 +68,9 @@ class DateSet { void remove( TQDate const& date ); void remove( TQDate const& from, TQDate const& to ); - bool contains( TQDate const& date ); + bool tqcontains( TQDate const& date ); // returns true if and only if the whole range is in the set - bool contains( TQDate const& from, TQDate const& to ); + bool tqcontains( TQDate const& from, TQDate const& to ); int find( TQDate const &date ); void print(); diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp index 82c0ab07d..ec203b9cd 100644 --- a/kresources/exchange/resourceexchange.cpp +++ b/kresources/exchange/resourceexchange.cpp @@ -78,7 +78,7 @@ ResourceExchange::ResourceExchange( const KConfig *config ) { mLock = new KABC::LockNull( true ); - mTimeZoneId = TQString::fromLatin1( "UTC" ); + mTimeZoneId = TQString::tqfromLatin1( "UTC" ); kdDebug() << "Creating ResourceExchange" << endl; if (config ) { @@ -139,7 +139,7 @@ bool ResourceExchange::doOpen() mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 ); #endif - TQWidgetList* widgets = TQApplication::topLevelWidgets(); + TQWidgetList* widgets = TQApplication::tqtopLevelWidgets(); if ( !widgets->isEmpty() ) mClient->setWindow( widgets->first() ); delete widgets; @@ -477,11 +477,11 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd, if (!mCache) return Event::List(); // If the events for this date are not in the cache, or if they are old, // get them again - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); // kdDebug() << "Now is " << now.toString() << endl; // kdDebug() << "mDates: " << mDates << endl; TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month - if ( mDates && ( !mDates->contains( start ) || + if ( mDates && ( !mDates->tqcontains( start ) || (*mCacheDates)[start].secsTo( now ) > mCachedSeconds ) ) { TQDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month // Get events that occur in this period from the cache |