1 files changed, 11 insertions, 11 deletions
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 03adcfe..27b9c9e 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -14,14 +14,14 @@ namespace Swift {
 			MockChatWindow() {};
 			virtual ~MockChatWindow();
 
-			virtual String addMessage(const String& message, const String& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const String& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
-			virtual String addAction(const String& message, const String& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const String& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
-			virtual void addSystemMessage(const String& /*message*/) {};
-			virtual void addErrorMessage(const String& /*message*/) {};
-			virtual void addPresenceMessage(const String& /*message*/) {};
+			virtual std::string addMessage(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
+			virtual std::string addAction(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
+			virtual void addSystemMessage(const std::string& /*message*/) {};
+			virtual void addErrorMessage(const std::string& /*message*/) {};
+			virtual void addPresenceMessage(const std::string& /*message*/) {};
 
 			virtual void setContactChatState(ChatState::ChatStateType /*state*/) {};
-			virtual void setName(const String& name) {name_ = name;};
+			virtual void setName(const std::string& name) {name_ = name;};
 			virtual void show() {};
 			virtual void activate() {};
 			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabel>& labels) {labels_ = labels;};
@@ -33,16 +33,16 @@ namespace Swift {
 			virtual void setInputEnabled(bool /*enabled*/) {};
 			virtual void setRosterModel(Roster* /*roster*/) {};
 			virtual void setTabComplete(TabComplete*) {};
-			virtual void replaceLastMessage(const Swift::String&) {};
-			void setAckState(const String& /*id*/, AckState /*state*/) {};
+			virtual void replaceLastMessage(const std::string&) {};
+			void setAckState(const std::string& /*id*/, AckState /*state*/) {};
 			virtual void flash() {};
 
 			boost::signal<void ()> onClosed;
 			boost::signal<void ()> onAllMessagesRead;
-			boost::signal<void (const String&)> onSendMessageRequest;
+			boost::signal<void (const std::string&)> onSendMessageRequest;
 
-			String name_;
-			String lastMessageBody_;
+			std::string name_;
+			std::string lastMessageBody_;
 			std::vector<SecurityLabel> labels_;
 			bool labelsEnabled_;
 	};