diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-04-03 13:23:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 23:29:52 +0200 |
| commit | 4c892e14c6929e174c8bccc9ec5693a63a8ce69c (patch) | |
| tree | c8e08cd6dc541fd122f395ea2c74f8733f31fc63 /src/dbus | |
| parent | a959f34d716f42925b22d42838e7a4b97e415c69 (diff) | |
Introduce initializer macros for QString- and QByteArrayData
This enables easier updating of those structs, by reducing the amount of
code that needs to be fixed. The common (and known) use cases are
covered by the two macros being introduced in each case.
Change-Id: I44981ca9b9b034f99238a11797b30bb85471cfb7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index cc2712297d..dda20cde04 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -327,11 +327,11 @@ struct qt_meta_stringdata_QDBusAdaptorConnector_t { QByteArrayData data[10]; char stringdata[96]; }; -#define QT_MOC_LITERAL(idx, ofs, len) { \ - Q_REFCOUNT_INITIALIZE_STATIC, len, 0, 0, \ +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ offsetof(qt_meta_stringdata_QDBusAdaptorConnector_t, stringdata) + ofs \ - idx * sizeof(QByteArrayData) \ - } + ) static const qt_meta_stringdata_QDBusAdaptorConnector_t qt_meta_stringdata_QDBusAdaptorConnector = { { QT_MOC_LITERAL(0, 0, 21), |