diff options
Diffstat (limited to 'Swiften/StringCodecs/Hexify.cpp')
-rw-r--r-- | Swiften/StringCodecs/Hexify.cpp | 10 |
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()); } } |