Reuse QArray initializer macro in QByteArray

Change-Id: Ieb12ee290846dce88f2ea9fbf943103899337e0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index 4d79c92..b038e85 100644 (file)
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -195,10 +195,13 @@ struct QArrayDataPointerRef
     QTypedArrayData<T> *ptr;
 };
 
-#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) { \
-    Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, \
-    (sizeof(QArrayData) + (Q_ALIGNOF(type) - 1)) \
-        & ~(Q_ALIGNOF(type) - 1) } \
+#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
+    { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
+    /**/
+
+#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) \
+    Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size,\
+        (sizeof(QArrayData) + (Q_ALIGNOF(type) - 1) & ~(Q_ALIGNOF(type) - 1) )) \
     /**/
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 6d4c155..79a7377 100644 (file)
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -140,7 +140,7 @@ struct QByteArrayDataPtr
 };
 
 #define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
-    { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
+    Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset)
     /**/
 
 #define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(size) \