Reverse OpenSync patch as it causes a build failure on Debian

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 22 insertions, 19 deletions

diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h
index 96741b059..14a2d9193 100644
--- a/kitchensync/libqopensync/syncupdates.h
+++ b/kitchensync/libqopensync/syncupdates.h
@@ -42,12 +42,14 @@ class SyncMemberUpdate
   public:
     enum Type {
       Connected,
+      SentChanges,
+      CommittedAll,
       Disconnected,
-      Read,
-      Written,
-      SyncDone,
-      Discovered,
-      Error
+      ConnectError,
+      GetChangesError,
+      CommittedAllError,
+      SyncDoneError,
+      DisconnectedError
     };
 
     SyncMemberUpdate();
@@ -70,9 +72,11 @@ class SyncChangeUpdate
 
   public:
     enum Type {
-      Read = 1,
-      Written,
-      Error
+      Received = 1,
+      ReceivedInfo,
+      Sent,
+      WriteError,
+      ReceiveError
     };
 
     SyncChangeUpdate();
@@ -82,14 +86,14 @@ class SyncChangeUpdate
     Type type() const;
     Result result() const;
     SyncChange change() const;
-    Member member() const;
+    int memberId() const;
     int mappingId() const;
 
   private:
     Type mType;
     Result mResult;
     SyncChange mChange;
-    Member mMember;
+    int mMemberId;
     int mMappingId;
 };
 
@@ -100,8 +104,8 @@ class SyncMappingUpdate
   public:
     enum Type {
       Solved = 1,
-      //Synced,
-      Error
+      Synced,
+      WriteError
     };
 
     SyncMappingUpdate();
@@ -126,15 +130,14 @@ class SyncEngineUpdate
 
   public:
     enum Type {
-      Connected = 1,
-      Read,
-      Written,
-      Disconnected,
+      EndPhaseConnected = 1,
+      EndPhaseRead,
+      EndPhaseWrite,
+      EndPhaseDisconnected,
       Error,
-      SyncSuccessful,
+      SyncSuccessfull,
       PrevUnclean,
-      EndConflicts,
-      SyncDone
+      EndConflicts
     };
 
     SyncEngineUpdate();