2 files changed, 21 insertions, 0 deletions
diff --git a/Swiften/Base/String.cpp b/Swiften/Base/String.cpp
index 7ddf614..242b8e5 100644
--- a/Swiften/Base/String.cpp
+++ b/Swiften/Base/String.cpp
@@ -6,6 +6,8 @@
 
 #include <cassert>
 #include <algorithm>
+#include <sstream>
+#include <iomanip>
 
 #include <Swiften/Base/String.h>
 
@@ -95,4 +97,20 @@ std::vector<std::string> String::split(const std::string& s, char c) {
 	return result;
 }
 
+std::string String::convertIntToHexString(int h) {
+	std::stringstream ss;
+	ss << std::setbase(16);
+	ss << h;
+	return ss.str();
+}
+
+int String::convertHexStringToInt(const std::string& s) {
+	std::stringstream ss;
+	int h;
+	ss << std::setbase(16);
+	ss << s;
+	ss >> h;
+	return h;
+}
+
 }
diff --git a/Swiften/Base/String.h b/Swiften/Base/String.h
index 26cc3f4..de181a1 100644
--- a/Swiften/Base/String.h
+++ b/Swiften/Base/String.h
@@ -29,6 +29,9 @@ namespace Swift {
 			inline bool endsWith(const std::string& s, char c) { 
 				return s.size() > 0 && s[s.size()-1] == c; 
 			}
+
+			std::string convertIntToHexString(int h);
+			int convertHexStringToInt(const std::string& s);
 	};
 
 	class SWIFTEN_API makeString {