From 303bb571b0d8ef609b566072079096c40a2368c4 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 24 May 2019 19:49:11 +0000 Subject: [PATCH] remove Q_NOREPLY tag leftovers from QDBusMetaObjectGenerator Signed-off-by: Ivailo Monev --- src/dbus/qdbusmetaobject.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 1291fa3eb..ed768c2ba 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -109,7 +109,7 @@ private: }; static const int intsPerProperty = 2; -static const int intsPerMethod = 5; +static const int intsPerMethod = 4; struct QDBusMetaObjectPrivate : public QMetaObjectPrivate { @@ -424,7 +424,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) QMap &map = (x == 0) ? signals_ : methods; for (QMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it) { - // form "prototype\0parameters\0typeName\0tag\0methodname\0inputSignature\0outputSignature" + // form "prototype\0parameters\0typeName\0methodname\0inputSignature\0outputSignature" const Method &mm = it.value(); idata[offset++] = stringdata.length(); @@ -631,7 +631,7 @@ const char *QDBusMetaObject::inputSignatureForMethod(int id) const //id -= methodOffset(); if (id >= 0 && id < priv(d.data)->methodCount) { int handle = priv(d.data)->methodDBusData + id*intsPerMethod; - return d.stringdata + d.data[handle + 1]; + return d.stringdata + d.data[handle]; } return 0; } @@ -641,7 +641,7 @@ const char *QDBusMetaObject::outputSignatureForMethod(int id) const //id -= methodOffset(); if (id >= 0 && id < priv(d.data)->methodCount) { int handle = priv(d.data)->methodDBusData + id*intsPerMethod; - return d.stringdata + d.data[handle + 2]; + return d.stringdata + d.data[handle + 1]; } return 0; } @@ -651,7 +651,7 @@ const int *QDBusMetaObject::inputTypesForMethod(int id) const //id -= methodOffset(); if (id >= 0 && id < priv(d.data)->methodCount) { int handle = priv(d.data)->methodDBusData + id*intsPerMethod; - return reinterpret_cast(d.data + d.data[handle + 3]); + return reinterpret_cast(d.data + d.data[handle + 2]); } return 0; } @@ -661,7 +661,7 @@ const int *QDBusMetaObject::outputTypesForMethod(int id) const //id -= methodOffset(); if (id >= 0 && id < priv(d.data)->methodCount) { int handle = priv(d.data)->methodDBusData + id*intsPerMethod; - return reinterpret_cast(d.data + d.data[handle + 4]); + return reinterpret_cast(d.data + d.data[handle + 3]); } return 0; } -- 2.11.0