2 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index 20b976d..be16baa 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -134,7 +134,7 @@ class StreamStackTest : public CppUnit::TestFixture {
 	private:
 		class MyStreamLayer : public StreamLayer {
 			public:
-				MyStreamLayer(const String& prepend) : prepend_(prepend) {
+				MyStreamLayer(const std::string& prepend) : prepend_(prepend) {
 				}
 
 				virtual void writeData(const ByteArray& data) {
@@ -146,7 +146,7 @@ class StreamStackTest : public CppUnit::TestFixture {
 				}
 
 			private:
-				String prepend_;
+				std::string prepend_;
 		};
 
 		class TestLowLayer : public LowLayer {
diff --git a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
index 77e6f7e..6c69a5f 100644
--- a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
+++ b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
@@ -78,19 +78,19 @@ class XMPPLayerTest : public CppUnit::TestFixture {
 			header.setTo("example.com");
 			testling_->writeHeader(header);
 
-			CPPUNIT_ASSERT_EQUAL(String("<?xml version=\"1.0\"?><stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" to=\"example.com\" version=\"1.0\">"), lowLayer_->writtenData);
+			CPPUNIT_ASSERT_EQUAL(std::string("<?xml version=\"1.0\"?><stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" to=\"example.com\" version=\"1.0\">"), lowLayer_->writtenData);
 		}
 
 		void testWriteElement() {
 			testling_->writeElement(boost::shared_ptr<Presence>(new Presence()));
 
-			CPPUNIT_ASSERT_EQUAL(String("<presence/>"), lowLayer_->writtenData);
+			CPPUNIT_ASSERT_EQUAL(std::string("<presence/>"), lowLayer_->writtenData);
 		}
 
 		void testWriteFooter() {
 			testling_->writeFooter();
 
-			CPPUNIT_ASSERT_EQUAL(String("</stream:stream>"), lowLayer_->writtenData);
+			CPPUNIT_ASSERT_EQUAL(std::string("</stream:stream>"), lowLayer_->writtenData);
 		}
 
 		void handleElement(boost::shared_ptr<Element>) {
@@ -124,7 +124,7 @@ class XMPPLayerTest : public CppUnit::TestFixture {
 					writtenData += std::string(data.getData(), data.getSize());
 				}
 				
-				String writtenData;
+				std::string writtenData;
 		};
 
 		FullPayloadParserFactoryCollection parserFactories_;