summaryrefslogtreecommitdiffabout
path: root/libkcal
Side-by-side diff
Diffstat (limited to 'libkcal') (more/less context) (show whitespace changes)
-rw-r--r--libkcal/icalformatimpl.cpp8
-rw-r--r--libkcal/incidencebase.cpp12
-rw-r--r--libkcal/incidencebase.h6
-rw-r--r--libkcal/sharpformat.cpp14
4 files changed, 16 insertions, 24 deletions
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 3437f45..df05ab3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -274,9 +274,6 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
if (incidence->zaurusUid() > 0) {
incidence->setNonKDECustomProperty("X-ZAURUSUID", QString::number(incidence->zaurusUid()));
}
- if (incidence->zaurusStat() > 0) {
- incidence->setNonKDECustomProperty("X-ZAURUSSTAT", QString::number(incidence->zaurusStat()));
- }
writeIncidenceBase(parent,incidence);
if (incidence->cancelled()) {
@@ -1293,11 +1290,6 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
incidence->setZaurusUid(kp.toInt());
}
- kp = incidence->nonKDECustomProperty("X-ZAURUSSTAT");
- if (!kp.isNull()) {
- incidence->setZaurusStat(kp.toInt());
- }
-
// Cancel backwards compatibility mode for subsequent changes by the application
incidence->recurrence()->setCompatVersion();
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 9479048..707d666 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -40,7 +40,7 @@ IncidenceBase::IncidenceBase() :
mPilotId = 0;
mZaurusId = -1;
mZaurusUid = 0;
- mZaurusStat = 0;
+ mTempSyncStat = 0;
mSyncStatus = 0;
mAttendees.setAutoDelete( true );
}
@@ -63,7 +63,7 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
mPilotId = i.mPilotId;
mZaurusId = i.mZaurusId;
mZaurusUid = i.mZaurusUid;
- mZaurusStat = i.mZaurusStat;
+ mTempSyncStat = i.mTempSyncStat;
mSyncStatus = i.mSyncStatus;
// The copied object is a new one, so it isn't observed by the observer
@@ -362,14 +362,14 @@ void IncidenceBase::setZaurusUid( int id )
mZaurusUid = 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;
}
void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 0ab7eef..ce6e254 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -130,8 +130,8 @@ class IncidenceBase : public CustomProperties
int zaurusId() const;
void setZaurusUid(int id);
int zaurusUid() const;
- void setZaurusStat(int id);
- int zaurusStat() const;
+ void setTempSyncStat(int id);
+ int tempSyncStat() const;
void registerObserver( Observer * );
void unRegisterObserver( Observer * );
@@ -155,7 +155,7 @@ class IncidenceBase : public CustomProperties
bool mHasDuration;
int mZaurusId;
int mZaurusUid;
- int mZaurusStat;
+ int mTempSyncStat;
// PILOT SYNCHRONIZATION STUFF
int mPilotId; // unique id for pilot sync
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 973f19d..d39d2dd 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -92,7 +92,7 @@ class SharpParser : public QObject
event = new Event;
event->setZaurusId( attList[0].toInt() );
event->setZaurusUid( cSum );
- event->setZaurusStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
+ event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
event->setSummary( attList[2] );
event->setLocation( attList[3] );
@@ -203,7 +203,7 @@ class SharpParser : public QObject
todo->setZaurusId( attList[0].toInt() );
todo->setZaurusUid( cSum );
- todo->setZaurusStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
+ todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
todo->setSummary( attList[7] );
todo->setDescription( attList[8]);
@@ -468,7 +468,7 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
retval = newnum;
inc->setZaurusId( newnum );
inc->setZaurusUid( getCsum( templist ) );
- inc->setZaurusStat( SYNC_TEMPSTATE_NEW_ID );
+ inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
}
}
}
@@ -507,11 +507,11 @@ bool SharpFormat::save( Calendar *calendar)
int procCount = 0;
while ( ev ) {
//qDebug("i %d ", ++i);
- if ( ev->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+ if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
QString eString = getEventString( ev );
- if ( ev->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
+ if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
// deleting empty strings does not work.
// we write first and x and then delete the record with the x
eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
@@ -593,11 +593,11 @@ bool SharpFormat::save( Calendar *calendar)
message = i18n("Processing todo # ");
procCount = 0;
while ( to ) {
- if ( to->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+ if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
status.setText ( message + QString::number ( ++procCount ) );
qApp->processEvents();
QString eString = getTodoString( to );
- if ( to->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
+ if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
// deleting empty strings does not work.
// we write first and x and then delete the record with the x
eString = eString.replace( QRegExp(",\"\""),",\"x\"" );