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;
         }