summaryrefslogtreecommitdiffstats
path: root/kitchensync/libqopensync/syncupdates.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-07 22:30:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-07 22:30:29 +0000
commitd8b40941f9d1a221add0b9094eb09405a91a8aab (patch)
tree0b8e9b6347f6e75925bb3c386a47c5300b1a4775 /kitchensync/libqopensync/syncupdates.h
parent009631d0fc83f471d6c515e2a5001337a5a2ea21 (diff)
downloadtdepim-d8b40941f9d1a221add0b9094eb09405a91a8aab.tar.gz
tdepim-d8b40941f9d1a221add0b9094eb09405a91a8aab.zip
Part 2/2 of Chakra patch commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172727 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/libqopensync/syncupdates.h')
-rw-r--r--kitchensync/libqopensync/syncupdates.h41
1 files changed, 19 insertions, 22 deletions
diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h
index 14a2d9193..96741b059 100644
--- a/kitchensync/libqopensync/syncupdates.h
+++ b/kitchensync/libqopensync/syncupdates.h
@@ -42,14 +42,12 @@ class SyncMemberUpdate
public:
enum Type {
Connected,
- SentChanges,
- CommittedAll,
Disconnected,
- ConnectError,
- GetChangesError,
- CommittedAllError,
- SyncDoneError,
- DisconnectedError
+ Read,
+ Written,
+ SyncDone,
+ Discovered,
+ Error
};
SyncMemberUpdate();
@@ -72,11 +70,9 @@ class SyncChangeUpdate
public:
enum Type {
- Received = 1,
- ReceivedInfo,
- Sent,
- WriteError,
- ReceiveError
+ Read = 1,
+ Written,
+ Error
};
SyncChangeUpdate();
@@ -86,14 +82,14 @@ class SyncChangeUpdate
Type type() const;
Result result() const;
SyncChange change() const;
- int memberId() const;
+ Member member() const;
int mappingId() const;
private:
Type mType;
Result mResult;
SyncChange mChange;
- int mMemberId;
+ Member mMember;
int mMappingId;
};
@@ -104,8 +100,8 @@ class SyncMappingUpdate
public:
enum Type {
Solved = 1,
- Synced,
- WriteError
+ //Synced,
+ Error
};
SyncMappingUpdate();
@@ -130,14 +126,15 @@ class SyncEngineUpdate
public:
enum Type {
- EndPhaseConnected = 1,
- EndPhaseRead,
- EndPhaseWrite,
- EndPhaseDisconnected,
+ Connected = 1,
+ Read,
+ Written,
+ Disconnected,
Error,
- SyncSuccessfull,
+ SyncSuccessful,
PrevUnclean,
- EndConflicts
+ EndConflicts,
+ SyncDone
};
SyncEngineUpdate();