Made sync code more readable by using defines

2 files changed, 30 insertions, 7 deletions

diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index f83f72e..973f19d 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -44,2 +44,3 @@
 #include "sharpformat.h"
+#include "syncdefines.h"
 
@@ -93,3 +94,3 @@ class SharpParser : public QObject
             event->setZaurusUid( cSum );
-            event->setZaurusStat( -2 );
+            event->setZaurusStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
@@ -204,3 +205,3 @@ class SharpParser : public QObject
             todo->setZaurusUid( cSum );
-            todo->setZaurusStat( -2 );
+            todo->setZaurusStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
@@ -469,3 +470,3 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
                 inc->setZaurusUid( getCsum( templist ) );
-                inc->setZaurusStat( -4 );
+                inc->setZaurusStat( SYNC_TEMPSTATE_NEW_ID );
             }
@@ -508,3 +509,3 @@ bool SharpFormat::save( Calendar *calendar)
         //qDebug("i %d ", ++i);
-        if ( ev->zaurusStat() != -2 ) {
+        if ( ev->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
             status.setText ( message + QString::number ( ++procCount ) );
@@ -512,3 +513,3 @@ bool SharpFormat::save( Calendar *calendar)
             QString eString = getEventString( ev );
-            if ( ev->zaurusStat() == -3 ) { // delete
+            if ( ev->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
@@ -594,3 +595,3 @@ bool SharpFormat::save( Calendar *calendar)
     while ( to ) {
-       if ( to->zaurusStat() != -2 ) {
+       if ( to->zaurusStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              status.setText ( message + QString::number ( ++procCount ) );
@@ -598,3 +599,3 @@ bool SharpFormat::save( Calendar *calendar)
             QString eString = getTodoString( to );
-            if ( to->zaurusStat() == -3 ) { // delete
+            if ( to->zaurusStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
diff --git a/libkcal/syncdefines.h b/libkcal/syncdefines.h
new file mode 100644
index 0000000..57642ec
--- a/dev/null
+++ b/libkcal/syncdefines.h
@@ -0,0 +1,22 @@
+ 
+#ifndef _KSYNC_DEFINES_H_
+#define _KSYNC_DEFINES_H_
+
+#define SYNC_PREF_LOCAL 0
+#define SYNC_PREF_REMOTE 1
+#define SYNC_PREF_NEWEST 2
+#define SYNC_PREF_ASK 3
+#define SYNC_PREF_FORCE_LOCAL 4
+#define SYNC_PREF_FORCE_REMOTE 5
+#define SYNC_PREF_TAKE_BOTH 6
+
+#define SYNC_MODE_NORMAL 0
+#define SYNC_MODE_EXTERNAL 1
+
+#define SYNC_TEMPSTATE_INITIAL 0
+#define SYNC_TEMPSTATE_NEW_EXTERNAL  -2
+#define SYNC_TEMPSTATE_DELETE -3
+#define SYNC_TEMPSTATE_NEW_ID -4
+
+
+#endif