3 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
index 1354ebf..7533a1e 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayload.h
@@ -14,14 +14,14 @@ class EchoPayload : public Payload {
 	public:
 		EchoPayload() {}
 
-		const String& getMessage() const {
+		const std::string& getMessage() const {
 			return message;
 		}
 
-		void setMessage(const String& message) {
+		void setMessage(const std::string& message) {
 			this->message = message;
 		}
 
 	private:
-		String message;
+		std::string message;
 };
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
index 3af616c..9cbb795 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadParserFactory.h
@@ -16,24 +16,24 @@ class EchoPayloadParser : public GenericPayloadParser<EchoPayload> {
 		EchoPayloadParser() : currentDepth(0) {}
 
 		void handleStartElement(
-				const String& /* element */, const String& /* ns */, const AttributeMap&) {
+				const std::string& /* element */, const std::string& /* ns */, const AttributeMap&) {
 			currentDepth++;
 		}
 
-		void handleEndElement(const String& /* element */, const String& /* ns */) {
+		void handleEndElement(const std::string& /* element */, const std::string& /* ns */) {
 			currentDepth--;
 			if (currentDepth == 0) {
 				getPayloadInternal()->setMessage(currentText);
 			}
 		}
 
-		void handleCharacterData(const String& data) {
+		void handleCharacterData(const std::string& data) {
 			currentText += data;
 		}
 
 	private:
 		int currentDepth;
-		String currentText;
+		std::string currentText;
 };
 
 class EchoPayloadParserFactory : public GenericPayloadParserFactory<EchoPayloadParser> {
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
index 1b18be4..85e8e67 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoPayloadSerializer.h
@@ -13,7 +13,7 @@ using namespace Swift;
 
 class EchoPayloadSerializer : public GenericPayloadSerializer<EchoPayload> {
 	public:
-		String serializePayload(boost::shared_ptr<EchoPayload> payload) const {
+		std::string serializePayload(boost::shared_ptr<EchoPayload> payload) const {
 			XMLElement element("echo", "http://swift.im/protocol/echo");
 			element.addNode(XMLTextNode::ref(new XMLTextNode(payload->getMessage())));
 			return element.serialize();