Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-11-12 20:08:59 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-11-12 20:18:11 (GMT) |
| commit | dce792fe9583fcb99b5367c089e749aef269d6e9 (patch) | |
| tree | 045b49d93a436cfe7bce888e655c63a07107f939 /Swiften/Whiteboard/WhiteboardClient.cpp | |
| parent | 9b83adf9eb38d10f8cd1108d4c608117a1f8459d (diff) | |
| download | swift-dce792fe9583fcb99b5367c089e749aef269d6e9.zip swift-dce792fe9583fcb99b5367c089e749aef269d6e9.tar.bz2 | |
Use more efficient empty check.
Change-Id: I8690af82a7f73d3883057b2a58a19197d6b09842
Diffstat (limited to 'Swiften/Whiteboard/WhiteboardClient.cpp')
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardClient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Whiteboard/WhiteboardClient.cpp b/Swiften/Whiteboard/WhiteboardClient.cpp index 8fad22e..c17b9f9 100644 --- a/Swiften/Whiteboard/WhiteboardClient.cpp +++ b/Swiften/Whiteboard/WhiteboardClient.cpp @@ -18,71 +18,71 @@ namespace Swift { if (insertOp) { op = boost::make_shared<WhiteboardInsertOperation>(*insertOp); } WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation); if (updateOp) { op = boost::make_shared<WhiteboardUpdateOperation>(*updateOp); } WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation); if (deleteOp) { op = boost::make_shared<WhiteboardDeleteOperation>(*deleteOp); } - if (bridge_.size() > 0) { + if (!bridge_.empty()) { op->setParentID(bridge_.back()->getID()); } bridge_.push_back(op); if (lastSentOperationID_.empty()) { WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation); if (insertOp) { op = boost::make_shared<WhiteboardInsertOperation>(*insertOp); } WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation); if (updateOp) { op = boost::make_shared<WhiteboardUpdateOperation>(*updateOp); } WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation); if (deleteOp) { op = boost::make_shared<WhiteboardDeleteOperation>(*deleteOp); } - if (serverOperations_.size() > 0) { + if (!serverOperations_.empty()) { op->setParentID(serverOperations_.back()->getID()); } lastSentOperationID_ = operation->getID(); return op; } else { return WhiteboardOperation::ref(); } } WhiteboardClient::Result WhiteboardClient::handleServerOperationReceived(WhiteboardOperation::ref operation) { serverOperations_.push_back(operation); Result result; // if (localOperations_.empty()) {// || localOperations_.back()->getID() == operation->getParentID()) { //Situation where client and server are in sync if (localOperations_.size() == serverOperations_.size()-1) { localOperations_.push_back(operation); // clientOp = operation; result.client = operation; } else if (lastSentOperationID_ == operation->getID()) { //Client received confirmation about own operation and it sends next operation to server - if (bridge_.size() > 0 && lastSentOperationID_ == bridge_.front()->getID()) { + if (!bridge_.empty() && lastSentOperationID_ == bridge_.front()->getID()) { bridge_.erase(bridge_.begin()); } - if (bridge_.size() > 0 && (bridge_.front())->getParentID() == lastSentOperationID_) { + if (!bridge_.empty() && (bridge_.front())->getParentID() == lastSentOperationID_) { lastSentOperationID_ = (bridge_.front())->getID(); result.server = bridge_.front(); } if (!result.server) { lastSentOperationID_.clear(); } } else { std::list<WhiteboardOperation::ref>::iterator it = bridge_.begin(); std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> opPair; WhiteboardOperation::ref temp; opPair = WhiteboardTransformer::transform(*it, operation); temp = opPair.first; |