2 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/Examples/MUCListAndJoin/MUCListAndJoin.cpp b/Swiften/Examples/MUCListAndJoin/MUCListAndJoin.cpp
index c3983f1..10b0b40 100644
--- a/Swiften/Examples/MUCListAndJoin/MUCListAndJoin.cpp
+++ b/Swiften/Examples/MUCListAndJoin/MUCListAndJoin.cpp
@@ -9,7 +9,6 @@
 
 #include <boost/optional.hpp>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/Client.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/Disco/GetDiscoItemsRequest.h>
@@ -47,7 +46,7 @@ static void handleRoomsItemsResponse(std::shared_ptr<DiscoItems> items, ErrorPay
 
     int roomCount = 0;
     cout << "List of rooms at " << mucJID.toString() << endl;
-    foreach (DiscoItems::Item item, items->getItems()) {
+    for (auto&& item : items->getItems()) {
         roomCount++;
         cout << "\t" << roomCount << ". " << item.getJID().getNode() << " - " << item.getName() << std::endl;
         if (roomCount == 1) {
diff --git a/Swiften/Examples/SendFile/ReceiveFile.cpp b/Swiften/Examples/SendFile/ReceiveFile.cpp
index 0b61987..193c1b7 100644
--- a/Swiften/Examples/SendFile/ReceiveFile.cpp
+++ b/Swiften/Examples/SendFile/ReceiveFile.cpp
@@ -11,7 +11,6 @@
 #include <boost/filesystem.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/Client.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/Disco/ClientDiscoManager.h>
@@ -56,7 +55,8 @@ class FileReceiver {
         }
 
         void stop() {
-            foreach(const IncomingFileTransfer::ref transfer, incomingFileTransfers) {
+            for (const auto& transfer : incomingFileTransfers) {
+                (void)transfer;
                 //transfer->stop();
             }
             client->disconnect();