summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/StringCodecs/Hexify.cpp
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/StringCodecs/Hexify.cpp')
-rw-r--r--Swiften/StringCodecs/Hexify.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/StringCodecs/Hexify.cpp b/Swiften/StringCodecs/Hexify.cpp
index c762d9b..61732b0 100644
--- a/Swiften/StringCodecs/Hexify.cpp
+++ b/Swiften/StringCodecs/Hexify.cpp
@@ -10,25 +10,25 @@
#include <iomanip>
#include <boost/numeric/conversion/cast.hpp>
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/Base/ByteArray.h"
namespace Swift {
-String Hexify::hexify(unsigned char byte) {
+std::string Hexify::hexify(unsigned char byte) {
std::ostringstream result;
result << std::hex << std::setw(2) << std::setfill('0') << boost::numeric_cast<unsigned int>(byte);
- return String(result.str());
+ return std::string(result.str());
}
-String Hexify::hexify(const ByteArray& data) {
+std::string Hexify::hexify(const ByteArray& data) {
std::ostringstream result;
result << std::hex;
for (unsigned int i = 0; i < data.getSize(); ++i) {
result << std::setw(2) << std::setfill('0') << boost::numeric_cast<unsigned int>(static_cast<unsigned char>(data[i]));
}
- return String(result.str());
+ return std::string(result.str());
}
}