From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- kresources/kolab/kabc/contact.cpp | 6 ++--- kresources/kolab/kcal/event.cpp | 16 ++++++------- kresources/kolab/kcal/incidence.cpp | 28 +++++++++++----------- kresources/kolab/kcal/incidence.h | 4 ++-- kresources/kolab/kcal/resourcekolab.cpp | 4 ++-- kresources/kolab/kcal/task.cpp | 34 +++++++++++++-------------- kresources/kolab/kcal/task.h | 6 ++--- kresources/kolab/knotes/resourcekolab.cpp | 2 +- kresources/kolab/shared/kolabbase.cpp | 32 ++++++++++++------------- kresources/kolab/shared/kolabbase.h | 10 ++++---- kresources/kolab/shared/resourcekolabbase.cpp | 2 +- 11 files changed, 72 insertions(+), 72 deletions(-) (limited to 'kresources/kolab') diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index 7a26f62f7..3bb0054ed 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const writeString( element, (*it).name, (*it).value ); } else { // skip writing the freebusyurl as it is a hack we need to remove eventually - if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) { + if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) { continue; } @@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // (includes e.g. crypto settings, and extra im addresses) TQStringList knownCustoms; for ( const char** p = s_knownCustomFields; *p; ++p ) - knownCustoms << TQString::tqfromLatin1( *p ); + knownCustoms << TQString::fromLatin1( *p ); TQStringList customs = addressee->customs(); for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) { // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves @@ -1253,7 +1253,7 @@ void Contact::saveTo( KABC::Addressee* addressee ) } for( TQValueList::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) { - TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app; + TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app; addressee->insertCustom( app, (*it).name, (*it).value ); } //kdDebug(5006) << addressee->customs() << endl; diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp index fedeca0c2..5f85cde22 100644 --- a/kresources/kolab/kcal/event.cpp +++ b/kresources/kolab/kcal/event.cpp @@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date ) { mEndDate = date; mHasEndDate = true; - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) kdDebug() << "ERROR: Time on end date but no time on the event\n"; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Event::setEndDate( const TQDate& date ) { mEndDate = date; mHasEndDate = true; - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) kdDebug() << "ERROR: No time on end date but time on the event\n"; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } void Event::setEndDate( const TQString& endDate ) @@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const else writeString( element, "show-time-as", "busy" ); if ( mHasEndDate ) { - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) writeString( element, "end-date", dateTimeToString( endDate() ) ); else writeString( element, "end-date", dateToString( endDate().date() ) ); @@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event ) if ( event->hasEndDate() || event->hasDuration() ) { if ( event->doesFloat() ) { // This is a floating event. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setEndDate( event->dtEnd().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setEndDate( localToUTC( event->dtEnd() ) ); } } else { @@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event ) event->setHasEndDate( mHasEndDate ); if ( mHasEndDate ) { - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) // This is a floating event. Don't timezone move this one event->setDtEnd( endDate() ); else diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp index 602321795..9155ad43c 100644 --- a/kresources/kolab/kcal/incidence.cpp +++ b/kresources/kolab/kcal/incidence.cpp @@ -51,7 +51,7 @@ using namespace Kolab; Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum, const TQString& tz ) - : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ), + : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ), mResource( res ), mSubResource( subResource ), mSernum( sernum ) @@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const void Incidence::setStartDate( const TQDateTime& startDate ) { mStartDate = startDate; - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) kdDebug() << "ERROR: Time on start date but no time on the event\n"; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Incidence::setStartDate( const TQDate& startDate ) { mStartDate = startDate; - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) kdDebug() << "ERROR: No time on start date but time on the event\n"; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } void Incidence::setStartDate( const TQString& startDate ) @@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const // Save the base class elements KolabBase::saveAttributes( element ); - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) writeString( element, "start-date", dateTimeToString( startDate() ) ); else writeString( element, "start-date", dateToString( startDate().date() ) ); @@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element ) mCustomList.append( custom ); } -static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s ) +static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s ) { if ( s == "none" ) return KCal::Attendee::NeedsAction; @@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence ) if ( incidence->doesFloat() ) { // This is a floating event. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setStartDate( incidence->dtStart().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setStartDate( localToUTC( incidence->dtStart() ) ); } @@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence ) if ( incidence->pilotId() != 0 ) setPilotSyncId( incidence->pilotId() ); - setPilotSynctqStatus( incidence->synctqStatus() ); + setPilotSyncStatus( incidence->syncStatus() ); // Unhandled tags and other custom properties (see libkcal/customproperties.h) const TQMap map = incidence->customProperties(); @@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence ) { KolabBase::saveTo( incidence ); - if ( mFloatingtqStatus == AllDay ) { + if ( mFloatingStatus == AllDay ) { // This is a floating event. Don't timezone move this one incidence->setDtStart( startDate() ); incidence->setFloats( true ); @@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence ) incidence->clearAttendees(); TQValueList::ConstIterator it; for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) { - KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status ); + KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status ); KCal::Attendee::Role role = attendeeStringToRole( (*it).role ); KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName, (*it).smtpAddress, @@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence ) } if ( hasPilotSyncId() ) incidence->setPilotId( pilotSyncId() ); - if ( hasPilotSynctqStatus() ) - incidence->setSynctqStatus( pilotSynctqStatus() ); + if ( hasPilotSyncStatus() ) + incidence->setSyncStatus( pilotSyncStatus() ); for( TQValueList::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) { incidence->setNonKDECustomProperty( (*it).key, (*it).value ); diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h index e5df23820..926ec1e4f 100644 --- a/kresources/kolab/kcal/incidence.h +++ b/kresources/kolab/kcal/incidence.h @@ -123,7 +123,7 @@ public: virtual bool saveAttributes( TQDomElement& ) const; protected: - enum FloatingtqStatus { Unset, AllDay, HasTime }; + enum FloatingStatus { Unset, AllDay, HasTime }; // Read all known fields from this ical incidence void setFields( const KCal::Incidence* ); @@ -150,7 +150,7 @@ protected: TQString mLocation; Email mOrganizer; TQDateTime mStartDate; - FloatingtqStatus mFloatingtqStatus; + FloatingStatus mFloatingStatus; float mAlarm; bool mHasAlarm; Recurrence mRecurrence; diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index e0ea6d164..8fa16eea3 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const KConfig *config ) : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), - mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, + mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, "mResourceChangedTimer" ), mBatchAddingInProgress( false ) { if ( !config ) { @@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase ) } incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD ); - incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidencebase->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 570bb47bc..488daf4af 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/kresources/kolab/kcal/task.cpp @@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser const TQString& tz, KCal::Todo* task ) : Incidence( res, subResource, sernum, tz ), mPriority( 5 ), mPercentCompleted( 0 ), - mtqStatus( KCal::Incidence::StatusNone ), + mStatus( KCal::Incidence::StatusNone ), mHasStartDate( false ), mHasDueDate( false ), mHasCompletedDate( false ) { @@ -126,14 +126,14 @@ int Task::percentCompleted() const return mPercentCompleted; } -void Task::setqStatus( KCal::Incidence::tqStatus status ) +void Task::seStatus( KCal::Incidence::Status status ) { - mtqStatus = status; + mStatus = status; } -KCal::Incidence::tqStatus Task::status() const +KCal::Incidence::Status Task::status() const { - return mtqStatus; + return mStatus; } void Task::setParent( const TQString& parentUid ) @@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date ) { mDueDate = date; mHasDueDate = true; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Task::setDueDate( const TQDate &date ) { mDueDate = date; mHasDueDate = true; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } @@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element ) setPercentCompleted( percent ); } else if ( tagName == "status" ) { if ( element.text() == "in-progress" ) - setqStatus( KCal::Incidence::StatusInProcess ); + seStatus( KCal::Incidence::StatusInProcess ); else if ( element.text() == "completed" ) - setqStatus( KCal::Incidence::StatusCompleted ); + seStatus( KCal::Incidence::StatusCompleted ); else if ( element.text() == "waiting-on-someone-else" ) - setqStatus( KCal::Incidence::StatusNeedsAction ); + seStatus( KCal::Incidence::StatusNeedsAction ); else if ( element.text() == "deferred" ) // Guessing a status here - setqStatus( KCal::Incidence::StatusCanceled ); + seStatus( KCal::Incidence::StatusCanceled ); else // Default - setqStatus( KCal::Incidence::StatusNone ); + seStatus( KCal::Incidence::StatusNone ); } else if ( tagName == "due-date" ) { setDueDate( element.text() ); } else if ( tagName == "parent" ) { @@ -300,7 +300,7 @@ bool Task::saveAttributes( TQDomElement& element ) const } if ( hasDueDate() ) { - if ( mFloatingtqStatus == HasTime ) { + if ( mFloatingStatus == HasTime ) { writeString( element, "due-date", dateTimeToString( dueDate() ) ); } else { writeString( element, "due-date", dateToString( dueDate().date() ) ); @@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task ) setPriority( task->priority() ); setPercentCompleted( task->percentComplete() ); - setqStatus( task->status() ); + seStatus( task->status() ); setHasStartDate( task->hasStartDate() ); if ( task->hasDueDate() ) { setDueDate( localToUTC( task->dtDue() ) ); if ( task->doesFloat() ) { // This is a floating task. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setDueDate( task->dtDue().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setDueDate( localToUTC( task->dtDue() ) ); } } else { @@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task ) task->setPriority( priority() ); task->setPercentComplete( percentCompleted() ); - task->setqStatus( status() ); + task->seStatus( status() ); task->setHasStartDate( hasStartDate() ); task->setHasDueDate( hasDueDate() ); if ( hasDueDate() ) diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h index 43780c00e..981c56ab7 100644 --- a/kresources/kolab/kcal/task.h +++ b/kresources/kolab/kcal/task.h @@ -77,8 +77,8 @@ public: virtual void setPercentCompleted( int percent ); virtual int percentCompleted() const; - virtual void setqStatus( KCal::Incidence::tqStatus status ); - virtual KCal::Incidence::tqStatus status() const; + virtual void seStatus( KCal::Incidence::Status status ); + virtual KCal::Incidence::Status status() const; virtual void setParent( const TQString& parentUid ); virtual TQString parent() const; @@ -126,7 +126,7 @@ protected: int mKCalPriorityFromDom; int mPercentCompleted; - KCal::Incidence::tqStatus mtqStatus; + KCal::Incidence::Status mStatus; TQString mParent; bool mHasStartDate; diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index 132decdf5..b92a723a5 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const KConfig *config ) : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ), - mCalendar( TQString::tqfromLatin1("UTC") ) + mCalendar( TQString::fromLatin1("UTC") ) { if ( !config ) { setResourceName( i18n( "Kolab Server" ) ); diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp index 09ec2cd6b..a0f32529f 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/kresources/kolab/shared/kolabbase.cpp @@ -44,10 +44,10 @@ using namespace Kolab; KolabBase::KolabBase( const TQString& tz ) - : mCreationDate( TQDateTime::tqcurrentDateTime() ), - mLastModified( TQDateTime::tqcurrentDateTime() ), + : mCreationDate( TQDateTime::currentDateTime() ), + mLastModified( TQDateTime::currentDateTime() ), mSensitivity( Public ), mTimeZoneId( tz ), - mHasPilotSyncId( false ), mHasPilotSynctqStatus( false ) + mHasPilotSyncId( false ), mHasPilotSyncStatus( false ) { } @@ -58,7 +58,7 @@ KolabBase::~KolabBase() void KolabBase::setFields( const KCal::Incidence* incidence ) { // So far unhandled KCal::IncidenceBase fields: - // mPilotID, mSynctqStatus, mFloats + // mPilotID, mSyncStatus, mFloats setUid( incidence->uid() ); setBody( incidence->description() ); @@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) kdDebug(5006) << "Creation time string: " << creationString << endl; TQDateTime creationDate; if ( creationString.isEmpty() ) { - creationDate = TQDateTime::tqcurrentDateTime(); + creationDate = TQDateTime::currentDateTime(); kdDebug(5006) << "Creation date set to current time\n"; } else { @@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) - modified = TQDateTime::tqcurrentDateTime(); + modified = TQDateTime::currentDateTime(); setLastModified( modified ); if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation @@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const return mPilotSyncId; } -void KolabBase::setPilotSynctqStatus( int status ) +void KolabBase::setPilotSyncStatus( int status ) { - mHasPilotSynctqStatus = true; - mPilotSynctqStatus = status; + mHasPilotSyncStatus = true; + mPilotSyncStatus = status; } -bool KolabBase::hasPilotSynctqStatus() const +bool KolabBase::hasPilotSyncStatus() const { - return mHasPilotSynctqStatus; + return mHasPilotSyncStatus; } -int KolabBase::pilotSynctqStatus() const +int KolabBase::pilotSyncStatus() const { - return mPilotSynctqStatus; + return mPilotSyncStatus; } bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email ) @@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element ) return true; } if ( tagName == "pilot-sync-status" ) { - setPilotSynctqStatus( element.text().toInt() ); + setPilotSyncStatus( element.text().toInt() ); return true; } break; @@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const writeString( element, "sensitivity", sensitivityToString( sensitivity() ) ); if ( hasPilotSyncId() ) writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) ); - if ( hasPilotSynctqStatus() ) - writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) ); + if ( hasPilotSyncStatus() ) + writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) ); return true; } diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h index d4621c722..294a7d81b 100644 --- a/kresources/kolab/shared/kolabbase.h +++ b/kresources/kolab/shared/kolabbase.h @@ -94,9 +94,9 @@ public: virtual bool hasPilotSyncId() const; virtual unsigned long pilotSyncId() const; - virtual void setPilotSynctqStatus( int status ); - virtual bool hasPilotSynctqStatus() const; - virtual int pilotSynctqStatus() const; + virtual void setPilotSyncStatus( int status ); + virtual bool hasPilotSyncStatus() const; + virtual int pilotSyncStatus() const; // String - Date conversion methods static TQString dateTimeToString( const TQDateTime& time ); @@ -167,9 +167,9 @@ protected: TQString mTimeZoneId; // KPilot synchronization stuff - bool mHasPilotSyncId, mHasPilotSynctqStatus; + bool mHasPilotSyncId, mHasPilotSyncStatus; unsigned long mPilotSyncId; - int mPilotSynctqStatus; + int mPilotSyncStatus; }; } diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index a357b0d62..1599acaa0 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -126,7 +126,7 @@ static TQString plainTextBody() " Groupware format.\nFor a list of such email clients please" " visit\n%1" ); const char * url = "http://www.kolab.org/kolab2-clients.html"; - TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).tqarg( url ); + TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).tqarg( url ); TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url ); if ( firstPartText != firstPartTextUntranslated ) { firstPartText.append("\n\n-----------------------------------------------------\n\n"); -- cgit v1.2.1