3 files changed, 2 insertions, 6 deletions
diff --git a/Swift/Controllers/Storages/AvatarFileStorage.cpp b/Swift/Controllers/Storages/AvatarFileStorage.cpp
index cded945..a103920 100644
--- a/Swift/Controllers/Storages/AvatarFileStorage.cpp
+++ b/Swift/Controllers/Storages/AvatarFileStorage.cpp
@@ -1,45 +1,44 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Storages/AvatarFileStorage.h>
 
 #include <iostream>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include <Swiften/Base/String.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/StringCodecs/Hexify.h>
 
 namespace Swift {
 
 AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& avatarsDir, const boost::filesystem::path& avatarsFile, CryptoProvider* crypto) : avatarsDir(avatarsDir), avatarsFile(avatarsFile), crypto(crypto) {
     if (boost::filesystem::exists(avatarsFile)) {
         try {
             boost::filesystem::ifstream file(avatarsFile);
             std::string line;
             if (file.is_open()) {
                 while (!file.eof()) {
                     getline(file, line);
                     std::pair<std::string, std::string> r = String::getSplittedAtFirst(line, ' ');
                     JID jid(r.second);
                     if (jid.isValid()) {
                         jidAvatars.insert(std::make_pair(jid, r.first));
                     }
                     else if (!r.first.empty() || !r.second.empty()) {
                         std::cerr << "Invalid entry in avatars file: " << r.second << std::endl;
                     }
                 }
             }
         }
         catch (...) {
             std::cerr << "Error reading avatars file" << std::endl;
         }
     }
 }
 
diff --git a/Swift/Controllers/Storages/CertificateMemoryStorage.cpp b/Swift/Controllers/Storages/CertificateMemoryStorage.cpp
index 08c6ee7..545ca65 100644
--- a/Swift/Controllers/Storages/CertificateMemoryStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateMemoryStorage.cpp
@@ -1,27 +1,25 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Storages/CertificateMemoryStorage.h>
 
-#include <Swiften/Base/foreach.h>
-
 using namespace Swift;
 
 CertificateMemoryStorage::CertificateMemoryStorage() {
 }
 
 bool CertificateMemoryStorage::hasCertificate(Certificate::ref certificate) const {
-    foreach(Certificate::ref storedCert, certificates) {
+    for (auto&& storedCert : certificates) {
         if (storedCert->toDER() == certificate->toDER()) {
             return true;
         }
     }
     return false;
 }
 
 void CertificateMemoryStorage::addCertificate(Certificate::ref certificate) {
     certificates.push_back(certificate);
 }
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index dbb6799..2fdadf6 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -1,46 +1,45 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Storages/VCardFileStorage.h>
 
 #include <iostream>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include <Swiften/Base/Path.h>
 #include <Swiften/Base/String.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Elements/VCard.h>
 #include <Swiften/Entity/GenericPayloadPersister.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h>
 #include <Swiften/Parser/PayloadParsers/VCardParser.h>
 #include <Swiften/Serializer/PayloadSerializers/VCardSerializer.h>
 #include <Swiften/StringCodecs/Hexify.h>
 
 using namespace Swift;
 
 typedef GenericPayloadPersister<VCard, VCardParser, VCardSerializer> VCardPersister;
 
 VCardFileStorage::VCardFileStorage(boost::filesystem::path dir, CryptoProvider* crypto) : VCardStorage(crypto), vcardsPath(dir), crypto(crypto) {
     cacheFile = vcardsPath / "phashes";
     if (boost::filesystem::exists(cacheFile)) {
         try {
             boost::filesystem::ifstream file(cacheFile);
             std::string line;
             if (file.is_open()) {
                 while (!file.eof()) {
                     getline(file, line);
                     std::pair<std::string, std::string> r = String::getSplittedAtFirst(line, ' ');
                     JID jid(r.second);
                     if (jid.isValid()) {
                         photoHashes.insert(std::make_pair(jid, r.first));
                     }
                     else if (!r.first.empty() || !r.second.empty()) {
                         std::cerr << "Invalid entry in phashes file" << std::endl;
                     }