Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-04 14:41:44 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 14:41:44 (GMT) |
| commit | 3c560e31b0f168da917e8d566db01fd1cd997d86 (patch) | |
| tree | a6d1c5c276d3571c6303a31af9f3cefd34b13d52 /Swift/Controllers | |
| parent | 4f3821a090931499b9c68b3b3ad785a98ea9d742 (diff) | |
| download | swift-3c560e31b0f168da917e8d566db01fd1cd997d86.zip swift-3c560e31b0f168da917e8d566db01fd1cd997d86.tar.bz2 | |
Modernize code to use range based for loops using clang-tidy
Run 'clang-tidy -fix -checks=modernize-loop-convert' on all
source code files on OS X. This does not modernize platform
specific code on Linux and Windows
Test-Information:
Code builds and unit tests pass on OS X 10.11.4.
Change-Id: I65b99e0978cfab8ca6de2a3e5342e7a81416c12c
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/AdHocManager.cpp | 4 | ||||
| -rw-r--r-- | Swift/Controllers/ContactSuggester.cpp | 4 | ||||
| -rw-r--r-- | Swift/Controllers/Roster/GroupRosterItem.cpp | 8 | ||||
| -rw-r--r-- | Swift/Controllers/SystemTrayController.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Swift/Controllers/AdHocManager.cpp b/Swift/Controllers/AdHocManager.cpp index 4212b8a..81f80e2 100644 --- a/Swift/Controllers/AdHocManager.cpp +++ b/Swift/Controllers/AdHocManager.cpp @@ -33,8 +33,8 @@ AdHocManager::AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, I AdHocManager::~AdHocManager() { uiEventStream_->onUIEvent.disconnect(boost::bind(&AdHocManager::handleUIEvent, this, _1)); - for (size_t i = 0; i < controllers_.size(); ++i) { - controllers_[i]->onDeleting.disconnect(boost::bind(&AdHocManager::removeController, this, controllers_[i])); + for (auto& controller : controllers_) { + controller->onDeleting.disconnect(boost::bind(&AdHocManager::removeController, this, controller)); } } diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp index 04e9dc4..8a3a6fa 100644 --- a/Swift/Controllers/ContactSuggester.cpp +++ b/Swift/Controllers/ContactSuggester.cpp @@ -74,8 +74,8 @@ bool ContactSuggester::fuzzyMatch(std::string text, std::string match) { std::string lowerMatch = match; boost::algorithm::to_lower(lowerMatch); size_t lastMatch = 0; - for (size_t i = 0; i < lowerMatch.length(); ++i) { - size_t where = lowerText.find_first_of(lowerMatch[i], lastMatch); + for (char i : lowerMatch) { + size_t where = lowerText.find_first_of(i, lastMatch); if (where == std::string::npos) { return false; } diff --git a/Swift/Controllers/Roster/GroupRosterItem.cpp b/Swift/Controllers/Roster/GroupRosterItem.cpp index 5aa3a5e..ac40afd 100644 --- a/Swift/Controllers/Roster/GroupRosterItem.cpp +++ b/Swift/Controllers/Roster/GroupRosterItem.cpp @@ -183,8 +183,8 @@ bool GroupRosterItem::itemLessThanWithStatus(const RosterItem* left, const Roste void GroupRosterItem::setDisplayed(RosterItem* item, bool displayed) { bool found = false; - for (size_t i = 0; i < displayedChildren_.size(); i++) { - if (displayedChildren_[i] == item) { + for (auto& i : displayedChildren_) { + if (i == item) { found = true; } } @@ -211,8 +211,8 @@ void GroupRosterItem::handleChildrenChanged(GroupRosterItem* group) { size_t oldSize = getDisplayedChildren().size(); if (group->getDisplayedChildren().size() > 0) { bool found = false; - for (size_t i = 0; i < displayedChildren_.size(); i++) { - if (displayedChildren_[i] == group) { + for (auto& i : displayedChildren_) { + if (i == group) { found = true; } } diff --git a/Swift/Controllers/SystemTrayController.cpp b/Swift/Controllers/SystemTrayController.cpp index 28dbf5e..8d4b2b7 100644 --- a/Swift/Controllers/SystemTrayController.cpp +++ b/Swift/Controllers/SystemTrayController.cpp @@ -22,8 +22,8 @@ SystemTrayController::SystemTrayController(EventController* eventController, Sys void SystemTrayController::handleEventQueueLengthChange(int /*length*/) { EventList events = eventController_->getEvents(); bool found = false; - for (EventList::iterator it = events.begin(); it != events.end(); ++it) { - if (std::dynamic_pointer_cast<MessageEvent>(*it)) { + for (auto& event : events) { + if (std::dynamic_pointer_cast<MessageEvent>(event)) { found = true; break; } |