3 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/EventLoop/SingleThreadedEventLoop.cpp b/Swiften/EventLoop/SingleThreadedEventLoop.cpp
index 4c5e209..c2235b1 100644
--- a/Swiften/EventLoop/SingleThreadedEventLoop.cpp
+++ b/Swiften/EventLoop/SingleThreadedEventLoop.cpp
@@ -18,25 +18,25 @@ SingleThreadedEventLoop::SingleThreadedEventLoop()
 : shouldShutDown_(false)
 {
 }
 
 SingleThreadedEventLoop::~SingleThreadedEventLoop() {
 	if (!events_.empty()) {
 		std::cerr << "Warning: Pending events in SingleThreadedEventLoop at destruction time." << std::endl;
 	}
 }
 
 void SingleThreadedEventLoop::waitForEvents() {
 	boost::unique_lock<boost::mutex> lock(eventsMutex_);
-	while (events_.size() == 0 && !shouldShutDown_) {
+	while (events_.empty() && !shouldShutDown_) {
 		eventsAvailable_.wait(lock);
 	}
 
 	if (shouldShutDown_)
 		throw EventLoopCanceledException();
 }
 
 void SingleThreadedEventLoop::handleEvents() {
 	// Make a copy of the list of events so we don't block any threads that post 
 	// events while we process them.
 	std::vector<Event> events;
 	{
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;
diff --git a/Swiften/Whiteboard/WhiteboardServer.cpp b/Swiften/Whiteboard/WhiteboardServer.cpp
index be595fd..94f8cff 100644
--- a/Swiften/Whiteboard/WhiteboardServer.cpp
+++ b/Swiften/Whiteboard/WhiteboardServer.cpp
@@ -6,25 +6,25 @@
 
 #include <Swiften/Whiteboard/WhiteboardServer.h>
 #include <Swiften/Whiteboard/WhiteboardTransformer.h>
 #include <iostream>
 
 namespace Swift {
 	void WhiteboardServer::handleLocalOperationReceived(WhiteboardOperation::ref operation) {
 		operations_.push_back(operation);
 	}
 
 	WhiteboardOperation::ref WhiteboardServer::handleClientOperationReceived(WhiteboardOperation::ref newOperation) {
 		std::list<WhiteboardOperation::ref>::reverse_iterator it;
-		if (operations_.size() == 0 || newOperation->getParentID() == operations_.back()->getID()) {
+		if (operations_.empty() || newOperation->getParentID() == operations_.back()->getID()) {
 			operations_.push_back(newOperation);
 			return newOperation;
 		}
 		for (it = operations_.rbegin(); it != operations_.rend(); ++it) {
 			WhiteboardOperation::ref operation = *it;
 			while (newOperation->getParentID() == operation->getParentID()) {
 				std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> tResult = WhiteboardTransformer::transform(newOperation, operation);
 
 				if (it == operations_.rbegin()) {
 					operations_.push_back(tResult.second);
 					return tResult.second;
 				} else {