5 files changed, 14 insertions, 13 deletions
diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
index 3cd0947..caec38c 100644
--- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
+++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
@@ -6,15 +6,15 @@
 
 #pragma once
 
-#include <string>
+#include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
 	class XMLConsoleWidget {
 		public:
 			virtual ~XMLConsoleWidget();
 
-			virtual void handleDataRead(const std::string& data) = 0;
-			virtual void handleDataWritten(const std::string& data) = 0;
+			virtual void handleDataRead(const SafeByteArray& data) = 0;
+			virtual void handleDataWritten(const SafeByteArray& data) = 0;
 
 			virtual void show() = 0;
 			virtual void activate() = 0;
diff --git a/Swift/Controllers/XMLConsoleController.cpp b/Swift/Controllers/XMLConsoleController.cpp
index a3510d1..d21f312 100644
--- a/Swift/Controllers/XMLConsoleController.cpp
+++ b/Swift/Controllers/XMLConsoleController.cpp
@@ -30,13 +30,13 @@ void XMLConsoleController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) {
 	}
 }
 
-void XMLConsoleController::handleDataRead(const std::string& data) {
+void XMLConsoleController::handleDataRead(const SafeByteArray& data) {
 	if (xmlConsoleWidget) {
 		xmlConsoleWidget->handleDataRead(data);
 	}
 }
 
-void XMLConsoleController::handleDataWritten(const std::string& data) {
+void XMLConsoleController::handleDataWritten(const SafeByteArray& data) {
 	if (xmlConsoleWidget) {
 		xmlConsoleWidget->handleDataWritten(data);
 	}
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index d12982f..6426a85 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -11,6 +11,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
+#include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
 	
@@ -23,8 +24,8 @@ namespace Swift {
 			~XMLConsoleController();
 
 		public:
-			void handleDataRead(const std::string& data);
-			void handleDataWritten(const std::string& data);
+			void handleDataRead(const SafeByteArray& data);
+			void handleDataWritten(const SafeByteArray& data);
 
 		private:
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
diff --git a/Swift/QtUI/QtXMLConsoleWidget.cpp b/Swift/QtUI/QtXMLConsoleWidget.cpp
index c1b1d0d..b0c0385 100644
--- a/Swift/QtUI/QtXMLConsoleWidget.cpp
+++ b/Swift/QtUI/QtXMLConsoleWidget.cpp
@@ -71,12 +71,12 @@ void QtXMLConsoleWidget::closeEvent(QCloseEvent* event) {
 	event->accept();
 }
 
-void QtXMLConsoleWidget::handleDataRead(const std::string& data) {
-	appendTextIfEnabled(std::string(tr("<!-- IN -->").toUtf8()) + "\n" + data + "\n", QColor(33,98,33));
+void QtXMLConsoleWidget::handleDataRead(const SafeByteArray& data) {
+	appendTextIfEnabled(std::string(tr("<!-- IN -->").toUtf8()) + "\n" + safeByteArrayToString(data) + "\n", QColor(33,98,33));
 }
 
-void QtXMLConsoleWidget::handleDataWritten(const std::string& data) {
-	appendTextIfEnabled(std::string(tr("<!-- OUT -->").toUtf8()) + "\n" + data + "\n", QColor(155,1,0));
+void QtXMLConsoleWidget::handleDataWritten(const SafeByteArray& data) {
+	appendTextIfEnabled(std::string(tr("<!-- OUT -->").toUtf8()) + "\n" + safeByteArrayToString(data) + "\n", QColor(155,1,0));
 }
 
 void QtXMLConsoleWidget::appendTextIfEnabled(const std::string& data, const QColor& color) {
diff --git a/Swift/QtUI/QtXMLConsoleWidget.h b/Swift/QtUI/QtXMLConsoleWidget.h
index a345495..73a3bad 100644
--- a/Swift/QtUI/QtXMLConsoleWidget.h
+++ b/Swift/QtUI/QtXMLConsoleWidget.h
@@ -23,8 +23,8 @@ namespace Swift {
 			void show();
 			void activate();
 
-			virtual void handleDataRead(const std::string& data);
-			virtual void handleDataWritten(const std::string& data);
+			virtual void handleDataRead(const SafeByteArray& data);
+			virtual void handleDataWritten(const SafeByteArray& data);
 
 		private:
 			virtual void closeEvent(QCloseEvent* event);