Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-03 12:25:57 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-03 12:46:12 (GMT) |
| commit | 21fda3308975201eeebeacd98e2b587ef4448862 (patch) | |
| tree | e8aebe473a636cf5a312814d4054d8af0d9ad6a6 /Swiften/StringCodecs | |
| parent | 10334c139670861d4860da59ad837fc3fe6fd41e (diff) | |
| download | swift-21fda3308975201eeebeacd98e2b587ef4448862.zip swift-21fda3308975201eeebeacd98e2b587ef4448862.tar.bz2 | |
Limit the use of the SafeString type.
Diffstat (limited to 'Swiften/StringCodecs')
| -rw-r--r-- | Swiften/StringCodecs/Base64.cpp | 5 | ||||
| -rw-r--r-- | Swiften/StringCodecs/Base64.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/StringCodecs/Base64.cpp b/Swiften/StringCodecs/Base64.cpp index d8511b4..e4eaa4e 100644 --- a/Swiften/StringCodecs/Base64.cpp +++ b/Swiften/StringCodecs/Base64.cpp @@ -10,7 +10,6 @@ #include <Swiften/StringCodecs/Base64.h> #include <Swiften/Base/Algorithm.h> -#include <Swiften/Base/SafeString.h> namespace Swift { @@ -56,8 +55,8 @@ std::string Base64::encode(const ByteArray &s) { return base64Encode<std::string, ByteArray>(s); } -SafeString Base64::encode(const SafeByteArray &s) { - return base64Encode<SafeString, SafeByteArray>(s); +SafeByteArray Base64::encode(const SafeByteArray &s) { + return base64Encode<SafeByteArray, SafeByteArray>(s); } ByteArray Base64::decode(const std::string& input) { diff --git a/Swiften/StringCodecs/Base64.h b/Swiften/StringCodecs/Base64.h index 00a290d..2d67971 100644 --- a/Swiften/StringCodecs/Base64.h +++ b/Swiften/StringCodecs/Base64.h @@ -16,7 +16,7 @@ namespace Swift { class Base64 { public: static std::string encode(const ByteArray& s); - static SafeString encode(const SafeByteArray& s); + static SafeByteArray encode(const SafeByteArray& s); static ByteArray decode(const std::string &s); }; |