1 files changed, 102 insertions, 101 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleParser.cpp b/Swiften/Parser/PayloadParsers/JingleParser.cpp
index 7041a92..a88a5b2 100644
--- a/Swiften/Parser/PayloadParsers/JingleParser.cpp
+++ b/Swiften/Parser/PayloadParsers/JingleParser.cpp
@@ -5,115 +5,116 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Parser/PayloadParsers/JingleParser.h>
-#include <Swiften/Parser/PayloadParserFactory.h>
-#include <Swiften/Elements/JingleContentPayload.h>
-#include <Swiften/Elements/JingleFileTransferHash.h>
-#include <Swiften/Base/Log.h>
 
 #include <boost/intrusive_ptr.hpp>
 
+#include <Swiften/Base/Log.h>
+#include <Swiften/Elements/JingleContentPayload.h>
+#include <Swiften/Elements/JingleFileTransferHash.h>
+#include <Swiften/Parser/PayloadParserFactory.h>
+
 namespace Swift {
 
-	JingleParser::JingleParser(PayloadParserFactoryCollection* factories) : factories(factories), level(0) {
-		
-	}
-
-	void JingleParser::handleStartElement(const std::string& element, const std::string &ns, const AttributeMap& attributes) {
-		if (level == 0) {
-			// <jingle > tag
-			JinglePayload::ref payload = getPayloadInternal();
-			payload->setAction(stringToAction(attributes.getAttributeValue("action").get_value_or("")));
-			payload->setInitiator(JID(attributes.getAttributeValue("initiator").get_value_or("")));
-			payload->setResponder(JID(attributes.getAttributeValue("responder").get_value_or("")));
-			payload->setSessionID(attributes.getAttributeValue("sid").get_value_or(""));
-		}
-		
-		if (level == 1) {
-			PayloadParserFactory* payloadParserFactory = factories->getPayloadParserFactory(element, ns, attributes);
-			if (payloadParserFactory) {
-				currentPayloadParser.reset(payloadParserFactory->createPayloadParser());
-			}
-		}
-		
-		if (level >= 1 && currentPayloadParser) {
-			currentPayloadParser->handleStartElement(element, ns, attributes);
-		}
-		
-		++level;
-	}
-	
-	void JingleParser::handleEndElement(const std::string& element, const std::string &ns) {
-		--level;
-		if (currentPayloadParser) {
-			if (level >= 1) {
-				currentPayloadParser->handleEndElement(element, ns);
-			}
-			
-			if (level == 1) {
-				boost::shared_ptr<JinglePayload::Reason> reason = boost::dynamic_pointer_cast<JinglePayload::Reason>(currentPayloadParser->getPayload());
-				if (reason) {
-					getPayloadInternal()->setReason(*reason);
-				}
-				
-				boost::shared_ptr<JingleContentPayload> payload = boost::dynamic_pointer_cast<JingleContentPayload>(currentPayloadParser->getPayload());
-				if (payload) {
-					getPayloadInternal()->addContent(payload);
-				}
-
-				boost::shared_ptr<JingleFileTransferHash> hash = boost::dynamic_pointer_cast<JingleFileTransferHash>(currentPayloadParser->getPayload());
-				if (hash) {
-					getPayloadInternal()->addPayload(hash);
-				}
-			}
-		}
-	}
-	
-	void JingleParser::handleCharacterData(const std::string& data) {
-		if (level > 1 && currentPayloadParser) {
-			currentPayloadParser->handleCharacterData(data);
-		}
-	}
-	
-	JinglePayload::Action JingleParser::stringToAction(const std::string &str) const {
-		if (str == "content-accept") {
-			return JinglePayload::ContentAccept;
-		} else if (str == "content-add") {
-			return JinglePayload::ContentAdd;
-		} else if (str == "content-modify") {
-			return JinglePayload::ContentModify;
-		} else if (str == "content-reject") {
-			return JinglePayload::ContentReject;
-		} else if (str == "content-remove") {
-			return JinglePayload::ContentRemove;
-		} else if (str == "description-info") {
-			return JinglePayload::DescriptionInfo;
-		} else if (str == "security-info") {
-			return JinglePayload::SecurityInfo;
-		} else if (str == "session-accept") {
-			return JinglePayload::SessionAccept;
-		} else if (str == "session-info") {
-			return JinglePayload::SessionInfo;
-		} else if (str == "session-initiate") {
-			return JinglePayload::SessionInitiate;
-		} else if (str == "session-terminate") {
-			return JinglePayload::SessionTerminate;
-		} else if (str == "transport-accept") {
-			return JinglePayload::TransportAccept;
-		} else if (str == "transport-info") {
-			return JinglePayload::TransportInfo;
-		} else if (str == "transport-reject") {
-			return JinglePayload::TransportReject;
-		} else if (str == "transport-replace") {
-			return JinglePayload::TransportReplace;
-		} else {
-			return JinglePayload::UnknownAction;
-		}
-
-	}
+    JingleParser::JingleParser(PayloadParserFactoryCollection* factories) : factories(factories), level(0) {
+
+    }
+
+    void JingleParser::handleStartElement(const std::string& element, const std::string &ns, const AttributeMap& attributes) {
+        if (level == 0) {
+            // <jingle > tag
+            JinglePayload::ref payload = getPayloadInternal();
+            payload->setAction(stringToAction(attributes.getAttributeValue("action").get_value_or("")));
+            payload->setInitiator(JID(attributes.getAttributeValue("initiator").get_value_or("")));
+            payload->setResponder(JID(attributes.getAttributeValue("responder").get_value_or("")));
+            payload->setSessionID(attributes.getAttributeValue("sid").get_value_or(""));
+        }
+
+        if (level == 1) {
+            PayloadParserFactory* payloadParserFactory = factories->getPayloadParserFactory(element, ns, attributes);
+            if (payloadParserFactory) {
+                currentPayloadParser.reset(payloadParserFactory->createPayloadParser());
+            }
+        }
+
+        if (level >= 1 && currentPayloadParser) {
+            currentPayloadParser->handleStartElement(element, ns, attributes);
+        }
+
+        ++level;
+    }
+
+    void JingleParser::handleEndElement(const std::string& element, const std::string &ns) {
+        --level;
+        if (currentPayloadParser) {
+            if (level >= 1) {
+                currentPayloadParser->handleEndElement(element, ns);
+            }
+
+            if (level == 1) {
+                std::shared_ptr<JinglePayload::Reason> reason = std::dynamic_pointer_cast<JinglePayload::Reason>(currentPayloadParser->getPayload());
+                if (reason) {
+                    getPayloadInternal()->setReason(*reason);
+                }
+
+                std::shared_ptr<JingleContentPayload> payload = std::dynamic_pointer_cast<JingleContentPayload>(currentPayloadParser->getPayload());
+                if (payload) {
+                    getPayloadInternal()->addContent(payload);
+                }
+
+                std::shared_ptr<JingleFileTransferHash> hash = std::dynamic_pointer_cast<JingleFileTransferHash>(currentPayloadParser->getPayload());
+                if (hash) {
+                    getPayloadInternal()->addPayload(hash);
+                }
+            }
+        }
+    }
+
+    void JingleParser::handleCharacterData(const std::string& data) {
+        if (level > 1 && currentPayloadParser) {
+            currentPayloadParser->handleCharacterData(data);
+        }
+    }
+
+    JinglePayload::Action JingleParser::stringToAction(const std::string &str) const {
+        if (str == "content-accept") {
+            return JinglePayload::ContentAccept;
+        } else if (str == "content-add") {
+            return JinglePayload::ContentAdd;
+        } else if (str == "content-modify") {
+            return JinglePayload::ContentModify;
+        } else if (str == "content-reject") {
+            return JinglePayload::ContentReject;
+        } else if (str == "content-remove") {
+            return JinglePayload::ContentRemove;
+        } else if (str == "description-info") {
+            return JinglePayload::DescriptionInfo;
+        } else if (str == "security-info") {
+            return JinglePayload::SecurityInfo;
+        } else if (str == "session-accept") {
+            return JinglePayload::SessionAccept;
+        } else if (str == "session-info") {
+            return JinglePayload::SessionInfo;
+        } else if (str == "session-initiate") {
+            return JinglePayload::SessionInitiate;
+        } else if (str == "session-terminate") {
+            return JinglePayload::SessionTerminate;
+        } else if (str == "transport-accept") {
+            return JinglePayload::TransportAccept;
+        } else if (str == "transport-info") {
+            return JinglePayload::TransportInfo;
+        } else if (str == "transport-reject") {
+            return JinglePayload::TransportReject;
+        } else if (str == "transport-replace") {
+            return JinglePayload::TransportReplace;
+        } else {
+            return JinglePayload::UnknownAction;
+        }
+
+    }
 }