1 files changed, 86 insertions, 86 deletions
diff --git a/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp b/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp
index 32c85a3..ad66b3f 100644
--- a/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp
+++ b/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,112 +9,112 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/cast.hpp>
 
+#include <cassert>
+
 #include <Swiften/Parser/PayloadParsers/FormParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/FormParser.h>
-#include <Swiften/Base/foreach.h>
-
 
 #define FILE_TRANSFER_NS "http://jabber.org/protocol/si/profile/file-transfer"
 #define FEATURE_NEG_NS "http://jabber.org/protocol/feature-neg"
 
 namespace Swift {
 
-StreamInitiationParser::StreamInitiationParser() : level(TopLevel), formParser(0), inFile(false), inFeature(false)  {
-	formParserFactory = new FormParserFactory();
+StreamInitiationParser::StreamInitiationParser() : level(TopLevel), formParser(nullptr), inFile(false), inFeature(false)  {
+    formParserFactory = new FormParserFactory();
 }
 
 StreamInitiationParser::~StreamInitiationParser() {
-	delete formParserFactory;
+    delete formParserFactory;
 }
 
 void StreamInitiationParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
-	if (level == TopLevel) {
-		getPayloadInternal()->setID(attributes.getAttribute("id"));
-		if (!attributes.getAttribute("profile").empty()) {
-			getPayloadInternal()->setIsFileTransfer(attributes.getAttribute("profile") == FILE_TRANSFER_NS);
-		}
-	}
-	else if (level == PayloadLevel) {
-		if (element == "file") {
-			inFile = true;
-			currentFile = StreamInitiationFileInfo();
-			currentFile.setName(attributes.getAttribute("name"));
-			try {
-				currentFile.setSize(boost::lexical_cast<unsigned long long>(attributes.getAttribute("size")));
-			}
-			catch (boost::bad_lexical_cast&) {
-			}
-		}
-		else if (element == "feature" && ns == FEATURE_NEG_NS) {
-			inFeature = true;
-		}
-	}
-	else if (level == FileOrFeatureLevel) {
-		if (inFile && element == "desc") {
-			currentText.clear();
-		}
-		else if (inFeature && formParserFactory->canParse(element, ns, attributes)) {
-			assert(!formParser);
-			formParser = boost::polymorphic_downcast<FormParser*>(formParserFactory->createPayloadParser());
-		}
-	}
+    if (level == TopLevel) {
+        getPayloadInternal()->setID(attributes.getAttribute("id"));
+        if (!attributes.getAttribute("profile").empty()) {
+            getPayloadInternal()->setIsFileTransfer(attributes.getAttribute("profile") == FILE_TRANSFER_NS);
+        }
+    }
+    else if (level == PayloadLevel) {
+        if (element == "file") {
+            inFile = true;
+            currentFile = StreamInitiationFileInfo();
+            currentFile.setName(attributes.getAttribute("name"));
+            try {
+                currentFile.setSize(boost::lexical_cast<unsigned long long>(attributes.getAttribute("size")));
+            }
+            catch (boost::bad_lexical_cast&) {
+            }
+        }
+        else if (element == "feature" && ns == FEATURE_NEG_NS) {
+            inFeature = true;
+        }
+    }
+    else if (level == FileOrFeatureLevel) {
+        if (inFile && element == "desc") {
+            currentText.clear();
+        }
+        else if (inFeature && formParserFactory->canParse(element, ns, attributes)) {
+            assert(!formParser);
+            formParser = boost::polymorphic_downcast<FormParser*>(formParserFactory->createPayloadParser());
+        }
+    }
 
-	if (formParser) {
-		formParser->handleStartElement(element, ns, attributes);
-	}
-	++level;
+    if (formParser) {
+        formParser->handleStartElement(element, ns, attributes);
+    }
+    ++level;
 }
 
 void StreamInitiationParser::handleEndElement(const std::string& element, const std::string& ns) {
-	--level;
-	if (formParser) {
-		formParser->handleEndElement(element, ns);
-	}
-	if (level == TopLevel) {
-	}
-	else if (level == PayloadLevel) {
-		if (element == "file") {
-			getPayloadInternal()->setFileInfo(currentFile);
-			inFile = false;
-		}
-		else if (element == "feature" && ns == FEATURE_NEG_NS) {
-			inFeature = false;
-		}
-	}
-	else if (level == FileOrFeatureLevel) {
-		if (inFile && element == "desc") {
-			currentFile.setDescription(currentText);
-		}
-		else if (formParser) {
-			Form::ref form = formParser->getPayloadInternal();
-			if (form) {
-				FormField::ref field = boost::dynamic_pointer_cast<FormField>(form->getField("stream-method"));
-				if (field) {
-					if (form->getType() == Form::FormType) {
-						foreach (const FormField::Option& option, field->getOptions()) {
-							getPayloadInternal()->addProvidedMethod(option.value);
-						}
-					}
-					else if (form->getType() == Form::SubmitType) {
-						if (!field->getValues().empty()) {
-							getPayloadInternal()->setRequestedMethod(field->getValues()[0]);
-						}
-					}
-				}
-			}
-			delete formParser;
-			formParser = NULL;
-		}
-	}
+    --level;
+    if (formParser) {
+        formParser->handleEndElement(element, ns);
+    }
+    if (level == TopLevel) {
+    }
+    else if (level == PayloadLevel) {
+        if (element == "file") {
+            getPayloadInternal()->setFileInfo(currentFile);
+            inFile = false;
+        }
+        else if (element == "feature" && ns == FEATURE_NEG_NS) {
+            inFeature = false;
+        }
+    }
+    else if (level == FileOrFeatureLevel) {
+        if (inFile && element == "desc") {
+            currentFile.setDescription(currentText);
+        }
+        else if (formParser) {
+            Form::ref form = formParser->getPayloadInternal();
+            if (form) {
+                FormField::ref field = std::dynamic_pointer_cast<FormField>(form->getField("stream-method"));
+                if (field) {
+                    if (form->getType() == Form::FormType) {
+                        for (const auto& option : field->getOptions()) {
+                            getPayloadInternal()->addProvidedMethod(option.value);
+                        }
+                    }
+                    else if (form->getType() == Form::SubmitType) {
+                        if (!field->getValues().empty()) {
+                            getPayloadInternal()->setRequestedMethod(field->getValues()[0]);
+                        }
+                    }
+                }
+            }
+            delete formParser;
+            formParser = nullptr;
+        }
+    }
 }
 
 void StreamInitiationParser::handleCharacterData(const std::string& data) {
-	if (formParser) {
-		formParser->handleCharacterData(data);
-	}
-	else {
-		currentText += data;
-	}
+    if (formParser) {
+        formParser->handleCharacterData(data);
+    }
+    else {
+        currentText += data;
+    }
 }