1 files changed, 4 insertions, 14 deletions
diff --git a/Swiften/Parser/PayloadParsers/DelayParser.cpp b/Swiften/Parser/PayloadParsers/DelayParser.cpp
index 3425b84..e18d09d 100644
--- a/Swiften/Parser/PayloadParsers/DelayParser.cpp
+++ b/Swiften/Parser/PayloadParsers/DelayParser.cpp
@@ -4,28 +4,18 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Parser/PayloadParsers/DelayParser.h"
+#include <Swiften/Parser/PayloadParsers/DelayParser.h>
 
-#include <locale>
-
-#include <boost/date_time/time_facet.hpp>
+#include <Swiften/Base/DateTime.h>
 
 namespace Swift {
 
-DelayParser::DelayParser(const std::locale& locale) : locale(locale), level_(0) {
-}
-
-boost::posix_time::ptime DelayParser::dateFromString(const std::string& string) {
-	std::istringstream stream(string); 
-	stream.imbue(locale);
-	boost::posix_time::ptime result(boost::posix_time::not_a_date_time);
-	stream >> result;
-	return result;
+DelayParser::DelayParser() : level_(0) {
 }
 
 void DelayParser::handleStartElement(const std::string& /*element*/, const std::string& /*ns*/, const AttributeMap& attributes) {
 	if (level_ == 0) {
-		boost::posix_time::ptime stamp = dateFromString(attributes.getAttribute("stamp"));
+		boost::posix_time::ptime stamp = stringToDateTime(attributes.getAttribute("stamp"));
 		getPayloadInternal()->setStamp(stamp);
 		if (!attributes.getAttribute("from").empty()) {
 			std::string from = attributes.getAttribute("from");