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/Base/ByteArray.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Base/ByteArray.h')
-rw-r--r--Swiften/Base/ByteArray.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Base/ByteArray.h b/Swiften/Base/ByteArray.h
index b5cbfb0..90a4907 100644
--- a/Swiften/Base/ByteArray.h
+++ b/Swiften/Base/ByteArray.h
@@ -10,7 +10,7 @@
#include <vector>
#include <iostream>
-#include "Swiften/Base/String.h"
+#include <string>
namespace Swift {
class ByteArray
@@ -20,7 +20,7 @@ namespace Swift {
ByteArray() : data_() {}
- ByteArray(const String& s) : data_(s.getUTF8String().begin(), s.getUTF8String().end()) {}
+ ByteArray(const std::string& s) : data_(s.begin(), s.end()) {}
ByteArray(const char* c) {
while (*c) {
@@ -107,11 +107,11 @@ namespace Swift {
return data_.end();
}
- String toString() const {
- return String(getData(), getSize());
+ std::string toString() const {
+ return std::string(getData(), getSize());
}
- void readFromFile(const String& file);
+ void readFromFile(const std::string& file);
void clear() {
data_.clear();