diff --git a/tests/src/QZXingTests/TestCase.h b/tests/src/QZXingTests/TestCase.h
index 7701d81..fb788f2 100644
--- a/tests/src/QZXingTests/TestCase.h
+++ b/tests/src/QZXingTests/TestCase.h
@@ -37,6 +37,10 @@ private:
         return QString::number(item);
     }
 
+    static QString itemToString(void* item) {
+        return QString::number(reinterpret_cast<uintptr_t>(item));
+    }
+
     static QString itemToString(long unsigned item) {
         return QString::number(item);
     }
@@ -67,7 +71,7 @@ protected:
                 message += QString::fromStdString(trace.object_filename);
                 message += QString::fromStdString(trace.object_function);
                 message += QString("[");
-                message += QString::number((int)trace.addr);
+                message += itemToString(trace.addr);
                 message += QString("]\n");
             }
 
@@ -85,15 +89,15 @@ protected:
     }
 
     void assertSame(void *expected, void *actual) {
-        assertEquals((int)expected, (int)actual);
+        assertEquals(expected, actual);
     }
 
     void assertTrue(bool actual) {
-        assertEquals(1, (int)actual);
+        assertEquals(true, actual);
     }
 
     void assertFalse(bool actual) {
-        assertEquals(0, (int)actual);
+        assertEquals(false, actual);
     }
 
     void assertDataEquals(const std::string &message,
diff --git a/tests/src/QZXingTests/zxing/qrcode/encoder/BitArrayTests.cpp b/tests/src/QZXingTests/zxing/qrcode/encoder/BitArrayTests.cpp
index 6f792e2..bed838a 100644
--- a/tests/src/QZXingTests/zxing/qrcode/encoder/BitArrayTests.cpp
+++ b/tests/src/QZXingTests/zxing/qrcode/encoder/BitArrayTests.cpp
@@ -34,43 +34,43 @@ void BitArrayTests::testAppendBit()
     // 1
     v.appendBit(true);
     assertEquals(1, v.getSize());
-    assertEquals(0x80000000L, getUnsignedInt(v, 0));
+    assertEquals(0x80000000ul, getUnsignedInt(v, 0));
     // 10
     v.appendBit(false);
     assertEquals(2, v.getSize());
-    assertEquals(0x80000000L, getUnsignedInt(v, 0));
+    assertEquals(0x80000000ul, getUnsignedInt(v, 0));
     // 101
     v.appendBit(true);
     assertEquals(3, v.getSize());
-    assertEquals(0xa0000000L, getUnsignedInt(v, 0));
+    assertEquals(0xa0000000ul, getUnsignedInt(v, 0));
     // 1010
     v.appendBit(false);
     assertEquals(4, v.getSize());
-    assertEquals(0xa0000000L, getUnsignedInt(v, 0));
+    assertEquals(0xa0000000ul, getUnsignedInt(v, 0));
     // 10101
     v.appendBit(true);
     assertEquals(5, v.getSize());
-    assertEquals(0xa8000000L, getUnsignedInt(v, 0));
+    assertEquals(0xa8000000ul, getUnsignedInt(v, 0));
     // 101010
     v.appendBit(false);
     assertEquals(6, v.getSize());
-    assertEquals(0xa8000000L, getUnsignedInt(v, 0));
+    assertEquals(0xa8000000ul, getUnsignedInt(v, 0));
     // 1010101
     v.appendBit(true);
     assertEquals(7, v.getSize());
-    assertEquals(0xaa000000L, getUnsignedInt(v, 0));
+    assertEquals(0xaa000000ul, getUnsignedInt(v, 0));
     // 10101010
     v.appendBit(false);
     assertEquals(8, v.getSize());
-    assertEquals(0xaa000000L, getUnsignedInt(v, 0));
+    assertEquals(0xaa000000ul, getUnsignedInt(v, 0));
     // 10101010 1
     v.appendBit(true);
     assertEquals(9, v.getSize());
-    assertEquals(0xaa800000L, getUnsignedInt(v, 0));
+    assertEquals(0xaa800000ul, getUnsignedInt(v, 0));
     // 10101010 10
     v.appendBit(false);
     assertEquals(10, v.getSize());
-    assertEquals(0xaa800000L, getUnsignedInt(v, 0));
+    assertEquals(0xaa800000ul, getUnsignedInt(v, 0));
 }
 
 void BitArrayTests::testAppendBits()
@@ -78,15 +78,15 @@ void BitArrayTests::testAppendBits()
     BitArray v;
     v.appendBits(0x1, 1);
     assertEquals(1, v.getSize());
-    assertEquals(0x80000000L, getUnsignedInt(v, 0));
+    assertEquals(0x80000000ul, getUnsignedInt(v, 0));
     v = BitArray();
     v.appendBits(0xff, 8);
     assertEquals(8, v.getSize());
-    assertEquals(0xff000000L, getUnsignedInt(v, 0));
+    assertEquals(0xff000000ul, getUnsignedInt(v, 0));
     v = BitArray();
     v.appendBits(0xff7, 12);
     assertEquals(12, v.getSize());
-    assertEquals(0xff700000L, getUnsignedInt(v, 0));
+    assertEquals(0xff700000ul, getUnsignedInt(v, 0));
 }
 
 void BitArrayTests::testNumBytes()
@@ -123,7 +123,7 @@ void BitArrayTests::testXOR()
     BitArray v2;
     v2.appendBits(0xaaaa5555, 32);
     v1.xor_(v2);
-    assertEquals(0xffffffffL, getUnsignedInt(v1, 0));
+    assertEquals(0xfffffffful, getUnsignedInt(v1, 0));
 }
 
 void BitArrayTests::testXOR2()
@@ -133,7 +133,7 @@ void BitArrayTests::testXOR2()
     BitArray v2;
     v2.appendBits(0x55, 7);  // 101 0101
     v1.xor_(v2);
-    assertEquals(0xfe000000L, getUnsignedInt(v1, 0));  // 1111 1110
+    assertEquals(0xfe000000ul, getUnsignedInt(v1, 0));  // 1111 1110
 }
 
 void BitArrayTests::testAt()