Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove Q_NOREPLY tag leftovers from QDBusMetaObjectGenerator

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-24 19:49:11 +00:00
parent e8cbe99197
commit 303bb571b0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/dbus/qdbusmetaobject.cpp
View file

@ -109,7 +109,7 @@ private:
}; };
static const int intsPerProperty = 2; static const int intsPerProperty = 2;
static const int intsPerMethod = 5; static const int intsPerMethod = 4;
struct QDBusMetaObjectPrivate : public QMetaObjectPrivate struct QDBusMetaObjectPrivate : public QMetaObjectPrivate
{ {
@ -424,7 +424,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
QMap<QByteArray, Method> &map = (x == 0) ? signals_ : methods; QMap<QByteArray, Method> &map = (x == 0) ? signals_ : methods;
for (QMap<QByteArray, Method>::ConstIterator it = map.constBegin(); for (QMap<QByteArray, Method>::ConstIterator it = map.constBegin();
it != map.constEnd(); ++it) { it != map.constEnd(); ++it) {
// form "prototype\0parameters\0typeName\0tag\0methodname\0inputSignature\0outputSignature" // form "prototype\0parameters\0typeName\0methodname\0inputSignature\0outputSignature"
const Method &mm = it.value(); const Method &mm = it.value();
idata[offset++] = stringdata.length(); idata[offset++] = stringdata.length();
@ -631,7 +631,7 @@ const char *QDBusMetaObject::inputSignatureForMethod(int id) const
//id -= methodOffset(); //id -= methodOffset();
if (id >= 0 && id < priv(d.data)->methodCount) { if (id >= 0 && id < priv(d.data)->methodCount) {
int handle = priv(d.data)->methodDBusData + id*intsPerMethod; int handle = priv(d.data)->methodDBusData + id*intsPerMethod;
return d.stringdata + d.data[handle + 1]; return d.stringdata + d.data[handle];
} }
return 0; return 0;
} }
@ -641,7 +641,7 @@ const char *QDBusMetaObject::outputSignatureForMethod(int id) const
//id -= methodOffset(); //id -= methodOffset();
if (id >= 0 && id < priv(d.data)->methodCount) { if (id >= 0 && id < priv(d.data)->methodCount) {
int handle = priv(d.data)->methodDBusData + id*intsPerMethod; int handle = priv(d.data)->methodDBusData + id*intsPerMethod;
return d.stringdata + d.data[handle + 2]; return d.stringdata + d.data[handle + 1];
} }
return 0; return 0;
} }
@ -651,7 +651,7 @@ const int *QDBusMetaObject::inputTypesForMethod(int id) const
//id -= methodOffset(); //id -= methodOffset();
if (id >= 0 && id < priv(d.data)->methodCount) { if (id >= 0 && id < priv(d.data)->methodCount) {
int handle = priv(d.data)->methodDBusData + id*intsPerMethod; int handle = priv(d.data)->methodDBusData + id*intsPerMethod;
return reinterpret_cast<const int*>(d.data + d.data[handle + 3]); return reinterpret_cast<const int*>(d.data + d.data[handle + 2]);
} }
return 0; return 0;
} }
@ -661,7 +661,7 @@ const int *QDBusMetaObject::outputTypesForMethod(int id) const
//id -= methodOffset(); //id -= methodOffset();
if (id >= 0 && id < priv(d.data)->methodCount) { if (id >= 0 && id < priv(d.data)->methodCount) {
int handle = priv(d.data)->methodDBusData + id*intsPerMethod; int handle = priv(d.data)->methodDBusData + id*intsPerMethod;
return reinterpret_cast<const int*>(d.data + d.data[handle + 4]); return reinterpret_cast<const int*>(d.data + d.data[handle + 3]);
} }
return 0; return 0;
} }