1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Parser/SerializingParser.cpp b/Swiften/Parser/SerializingParser.cpp
index 43dfc51..096ffc1 100644
--- a/Swiften/Parser/SerializingParser.cpp
+++ b/Swiften/Parser/SerializingParser.cpp
@@ -4,10 +4,9 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Parser/SerializingParser.h"
-#include "Swiften/Serializer/XML/XMLTextNode.h"
-#include "Swiften/Base/foreach.h"
-#include <iostream>
+#include <Swiften/Parser/SerializingParser.h>
+#include <Swiften/Serializer/XML/XMLTextNode.h>
+#include <Swiften/Base/foreach.h>
 
 namespace Swift {
 
@@ -16,8 +15,9 @@ SerializingParser::SerializingParser() {
 
 void SerializingParser::handleStartElement(const std::string& tag, const std::string&  ns, const AttributeMap& attributes) {
 	boost::shared_ptr<XMLElement> element(new XMLElement(tag, ns));
-	for (AttributeMap::const_iterator i = attributes.begin(); i != attributes.end(); ++i) {
-		element->setAttribute((*i).first, (*i).second);
+	// FIXME: Ignoring attribute namespace
+	foreach (const AttributeMap::Entry& e, attributes.getEntries()) {
+		element->setAttribute(e.getAttribute().getName(), e.getValue());
 	}
 
 	if (elementStack_.empty()) {