From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkcal/incidencebase.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libkcal/incidencebase.cpp') diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 518d0f63e..bddfcb5a7 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 ) -- cgit v1.2.1