From dce792fe9583fcb99b5367c089e749aef269d6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Mon, 12 Nov 2012 21:08:59 +0100 Subject: Use more efficient empty check. Change-Id: I8690af82a7f73d3883057b2a58a19197d6b09842 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 @@ -27,7 +27,7 @@ SingleThreadedEventLoop::~SingleThreadedEventLoop() { void SingleThreadedEventLoop::waitForEvents() { boost::unique_lock lock(eventsMutex_); - while (events_.size() == 0 && !shouldShutDown_) { + while (events_.empty() && !shouldShutDown_) { eventsAvailable_.wait(lock); } 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 @@ -27,7 +27,7 @@ namespace Swift { op = boost::make_shared(*deleteOp); } - if (bridge_.size() > 0) { + if (!bridge_.empty()) { op->setParentID(bridge_.back()->getID()); } bridge_.push_back(op); @@ -48,7 +48,7 @@ namespace Swift { } - if (serverOperations_.size() > 0) { + if (!serverOperations_.empty()) { op->setParentID(serverOperations_.back()->getID()); } lastSentOperationID_ = operation->getID(); @@ -69,11 +69,11 @@ namespace Swift { 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(); } 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 @@ -15,7 +15,7 @@ namespace Swift { WhiteboardOperation::ref WhiteboardServer::handleClientOperationReceived(WhiteboardOperation::ref newOperation) { std::list::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; } -- cgit v0.10.2-6-g49f6