Swiftdiff options
| author | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-07-16 12:14:05 (GMT) |
|---|---|---|
| committer | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-07-16 12:14:05 (GMT) |
| commit | b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3 (patch) | |
| tree | e99331d9c20e8199fda582e5f1b603d01b368f2a /Swiften/Whiteboard/WhiteboardTransformer.h | |
| parent | 0ba890e7e8c7e09c1257a7c3b1018f396e6896d1 (diff) | |
| download | swift-contrib-b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3.zip swift-contrib-b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3.tar.bz2 | |
Extended classes handling synchronization with update operation
Diffstat (limited to 'Swiften/Whiteboard/WhiteboardTransformer.h')
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardTransformer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swiften/Whiteboard/WhiteboardTransformer.h b/Swiften/Whiteboard/WhiteboardTransformer.h index 33086d8..0bab4d3 100644 --- a/Swiften/Whiteboard/WhiteboardTransformer.h +++ b/Swiften/Whiteboard/WhiteboardTransformer.h @@ -7,11 +7,16 @@ #pragma once #include <Swiften/Whiteboard/Operations/WhiteboardInsertOperation.h> +#include <Swiften/Whiteboard/Operations/WhiteboardUpdateOperation.h> #include <utility> namespace Swift { class WhiteboardTransformer { public: - static std::pair<WhiteboardInsertOperation::ref, WhiteboardInsertOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp); +static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardOperation::ref clientOp, WhiteboardOperation::ref serverOp); + static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp); + static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp); + static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp); + static std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> transform(WhiteboardInsertOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp); }; } |