3 files changed, 19 insertions, 16 deletions
diff --git a/Swiften/Compress/UnitTest/ZLibCompressorTest.cpp b/Swiften/Compress/UnitTest/ZLibCompressorTest.cpp
index 8b3a48b..9320ae1 100644
--- a/Swiften/Compress/UnitTest/ZLibCompressorTest.cpp
+++ b/Swiften/Compress/UnitTest/ZLibCompressorTest.cpp
@@ -9,6 +9,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
+#include <QA/Checker/IO.h>
 #include <Swiften/Compress/ZLibCompressor.h>
 
 using namespace Swift;
@@ -26,17 +27,17 @@ class ZLibCompressorTest : public CppUnit::TestFixture
 
 		void testProcess() {
 			ZLibCompressor testling;
-			ByteArray result = testling.process("foo");
+			ByteArray result = testling.process(createByteArray("foo"));
 
-			CPPUNIT_ASSERT_EQUAL(ByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11), result);
+			CPPUNIT_ASSERT_EQUAL(createByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11), result);
 		}
 
 		void testProcess_Twice() {
 			ZLibCompressor testling;
-			testling.process("foo");
-			ByteArray result = testling.process("bar");
+			testling.process(createByteArray("foo"));
+			ByteArray result = testling.process(createByteArray("bar"));
 
-			CPPUNIT_ASSERT_EQUAL(ByteArray("\x4a\x4a\x2c\x02\x00\x00\x00\xff\xff",9), result); 
+			CPPUNIT_ASSERT_EQUAL(createByteArray("\x4a\x4a\x2c\x02\x00\x00\x00\xff\xff",9), result); 
 		}
 };
 
diff --git a/Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp b/Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp
index 7a26d50..00aae6e 100644
--- a/Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp
+++ b/Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp
@@ -9,6 +9,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
+#include <QA/Checker/IO.h>
 #include <Swiften/Compress/ZLibDecompressor.h>
 #include <Swiften/Compress/ZLibCompressor.h>
 #include <Swiften/Compress/ZLibException.h>
@@ -31,22 +32,22 @@ class ZLibDecompressorTest : public CppUnit::TestFixture
 
 		void testProcess() {
 			ZLibDecompressor testling;
-			ByteArray result = testling.process(ByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11));
+			ByteArray result = testling.process(createByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11));
 
-			CPPUNIT_ASSERT_EQUAL(ByteArray("foo"), result);
+			CPPUNIT_ASSERT_EQUAL(createByteArray("foo"), result);
 		}
 
 		void testProcess_Twice() {
 			ZLibDecompressor testling;
-			testling.process(ByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11));
-			ByteArray result = testling.process(ByteArray("\x4a\x4a\x2c\x02\x00\x00\x00\xff\xff", 9)); 
+			testling.process(createByteArray("\x78\xda\x4a\xcb\xcf\x07\x00\x00\x00\xff\xff", 11));
+			ByteArray result = testling.process(createByteArray("\x4a\x4a\x2c\x02\x00\x00\x00\xff\xff", 9)); 
 
-			CPPUNIT_ASSERT_EQUAL(ByteArray("bar"), result);
+			CPPUNIT_ASSERT_EQUAL(createByteArray("bar"), result);
 		}
 
 		void testProcess_Invalid() {
 			ZLibDecompressor testling;
-			CPPUNIT_ASSERT_THROW(testling.process(ByteArray("invalid")), ZLibException);
+			CPPUNIT_ASSERT_THROW(testling.process(createByteArray("invalid")), ZLibException);
 		}
 
 		void testProcess_Huge() {
@@ -55,7 +56,7 @@ class ZLibDecompressorTest : public CppUnit::TestFixture
 			for (unsigned int i = 0; i < 2048; ++i) {
 				data.push_back(static_cast<char>(i));
 			}
-			ByteArray original(&data[0], data.size());
+			ByteArray original(createByteArray(&data[0], data.size()));
 			ByteArray compressed = ZLibCompressor().process(original);
 			ByteArray decompressed = ZLibDecompressor().process(compressed);
 
@@ -68,7 +69,7 @@ class ZLibDecompressorTest : public CppUnit::TestFixture
 			for (unsigned int i = 0; i < 1024; ++i) {
 				data.push_back(static_cast<char>(i));
 			}
-			ByteArray original(&data[0], data.size());
+			ByteArray original(createByteArray(&data[0], data.size()));
 			ByteArray compressed = ZLibCompressor().process(original);
 			ByteArray decompressed = ZLibDecompressor().process(compressed);
 
diff --git a/Swiften/Compress/ZLibCodecompressor.cpp b/Swiften/Compress/ZLibCodecompressor.cpp
index 1fb3a94..872c154 100644
--- a/Swiften/Compress/ZLibCodecompressor.cpp
+++ b/Swiften/Compress/ZLibCodecompressor.cpp
@@ -7,6 +7,7 @@
 #include <Swiften/Compress/ZLibCodecompressor.h>
 
 #include <cassert>
+#include <string.h>
 
 #include <Swiften/Compress/ZLibException.h>
 
@@ -26,13 +27,13 @@ ZLibCodecompressor::~ZLibCodecompressor() {
 
 ByteArray ZLibCodecompressor::process(const ByteArray& input) {
 	ByteArray output;
-	stream_.avail_in = input.getSize();
-	stream_.next_in = reinterpret_cast<Bytef*>(const_cast<unsigned char*>(input.getData()));
+	stream_.avail_in = input.size();
+	stream_.next_in = reinterpret_cast<Bytef*>(const_cast<unsigned char*>(vecptr(input)));
 	int outputPosition = 0;
 	do {
 		output.resize(outputPosition + CHUNK_SIZE);
 		stream_.avail_out = CHUNK_SIZE;
-		stream_.next_out = reinterpret_cast<Bytef*>(output.getData() + outputPosition);
+		stream_.next_out = reinterpret_cast<Bytef*>(vecptr(output) + outputPosition);
 		int result = processZStream();
 		if (result != Z_OK && result != Z_BUF_ERROR) {
 			throw ZLibException(/* stream_.msg */);