| -rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
| -rw-r--r-- | libkcal/icalformatimpl.cpp | 8 | ||||
| -rw-r--r-- | libkcal/incidencebase.cpp | 12 | ||||
| -rw-r--r-- | libkcal/incidencebase.h | 6 | ||||
| -rw-r--r-- | libkcal/sharpformat.cpp | 14 |
5 files changed, 18 insertions, 26 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index fd68dc4..b543eca 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1003,3 +1003,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it - inR->setZaurusStat( SYNC_TEMPSTATE_DELETE ); + inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); //remote->deleteIncidence( inR ); @@ -1173,3 +1173,3 @@ void CalendarView::syncSharp() while ( inc ) { - if ( inc->zaurusStat() == SYNC_TEMPSTATE_NEW_ID ) { + if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { loc = mCalendar->incidence(inc->uid() ); diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 3437f45..df05ab3 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -276,5 +276,2 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) } - if (incidence->zaurusStat() > 0) { - incidence->setNonKDECustomProperty("X-ZAURUSSTAT", QString::number(incidence->zaurusStat())); - } @@ -1295,7 +1292,2 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence) - kp = incidence->nonKDECustomProperty("X-ZAURUSSTAT"); - if (!kp.isNull()) { - incidence->setZaurusStat(kp.toInt()); - } - // Cancel backwards compatibility mode for subsequent changes by the application diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 9479048..707d666 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -42,3 +42,3 @@ IncidenceBase::IncidenceBase() : mZaurusUid = 0; - mZaurusStat = 0; + mTempSyncStat = 0; mSyncStatus = 0; @@ -65,3 +65,3 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : mZaurusUid = i.mZaurusUid; - mZaurusStat = i.mZaurusStat; + mTempSyncStat = i.mTempSyncStat; mSyncStatus = i.mSyncStatus; @@ -364,10 +364,10 @@ void IncidenceBase::setZaurusUid( int id ) -int IncidenceBase::zaurusStat() const +int IncidenceBase::tempSyncStat() const { - return mZaurusStat; + return mTempSyncStat; } -void IncidenceBase::setZaurusStat( int id ) +void IncidenceBase::setTempSyncStat( int id ) { if (mReadOnly) return; - mZaurusStat = id; + mTempSyncStat = id; } diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 0ab7eef..ce6e254 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -132,4 +132,4 @@ class IncidenceBase : public CustomProperties int zaurusUid() const; - void setZaurusStat(int id); - int zaurusStat() const; + void setTempSyncStat(int id); + int tempSyncStat() const; @@ -157,3 +157,3 @@ class IncidenceBase : public CustomProperties int mZaurusUid; - int mZaurusStat; + int mTempSyncStat; diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index 973f19d..d39d2dd 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp @@ -94,3 +94,3 @@ class SharpParser : public QObject event->setZaurusUid( cSum ); - event->setZaurusStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); + event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); @@ -205,3 +205,3 @@ class SharpParser : public QObject todo->setZaurusUid( cSum ); - todo->setZaurusStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); + todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); @@ -470,3 +470,3 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc ) inc->setZaurusUid( getCsum( templist ) ); - inc->setZaurusStat( SYNC_TEMPSTATE_NEW_ID ); + inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); } @@ -509,3 +509,3 @@ bool SharpFormat::save( Calendar *calendar) //qDebug("i %d ", ++i); - if ( ev->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { + if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { status.setText ( message + QString::number ( ++procCount ) ); @@ -513,3 +513,3 @@ bool SharpFormat::save( Calendar *calendar) QString eString = getEventString( ev ); - if ( ev->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete + if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete // deleting empty strings does not work. @@ -595,3 +595,3 @@ bool SharpFormat::save( Calendar *calendar) while ( to ) { - if ( to->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { + if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { status.setText ( message + QString::number ( ++procCount ) ); @@ -599,3 +599,3 @@ bool SharpFormat::save( Calendar *calendar) QString eString = getTodoString( to ); - if ( to->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete + if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete // deleting empty strings does not work. |