1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDBusMetaObjectGenerator: replace a few more int

Browse Source 
The meta object is actually uint, even though we end up treating it as
int elsewhere. I've also replaced one flags use with quint32.

That leaves int in this file for meta type IDs only. Replacing them with
QMetaTypeInterface pointers is left as an exercise for the reader.

Task-number: QTBUG-103548
Change-Id: Ie4bb662dcb274440ab8bfffd17096e0f85e4ea5a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2022-08-08 10:15:50 -07:00 committed by Marc Mutz
parent 68eb0e673c
commit 4ba4c4f07c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dbus/qdbusmetaobject.cpp
View File

@ -41,14 +41,14 @@ private:
QVarLengthArray<int, 4> inputTypes; QVarLengthArray<int, 4> inputTypes;
QVarLengthArray<int, 4> outputTypes; QVarLengthArray<int, 4> outputTypes;
QByteArray rawReturnType; QByteArray rawReturnType;
int flags; quint32 flags;
}; };
struct Property { struct Property {
QByteArray typeName; QByteArray typeName;
QByteArray signature; QByteArray signature;
int type; int type;
int flags; quint32 flags;
}; };
struct Type { struct Type {
int id; int id;
@ -381,8 +381,8 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
if (className.isEmpty()) if (className.isEmpty())
className = "QDBusInterface"_L1; className = "QDBusInterface"_L1;
QVarLengthArray<int> idata; QVarLengthArray<uint> idata;
idata.resize(sizeof(QDBusMetaObjectPrivate) / sizeof(int)); idata.resize(sizeof(QDBusMetaObjectPrivate) / sizeof(uint));
qsizetype methodParametersDataSize = qsizetype methodParametersDataSize =
((aggregateParameterCount(signals_) ((aggregateParameterCount(signals_)
@ -495,12 +495,12 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
idata[signatureOffset++] = typeidOffset; idata[signatureOffset++] = typeidOffset;
idata[typeidOffset++] = mm.inputTypes.count(); idata[typeidOffset++] = mm.inputTypes.count();
memcpy(idata.data() + typeidOffset, mm.inputTypes.data(), mm.inputTypes.count() * sizeof(int)); memcpy(idata.data() + typeidOffset, mm.inputTypes.data(), mm.inputTypes.count() * sizeof(uint));
typeidOffset += mm.inputTypes.count(); typeidOffset += mm.inputTypes.count();
idata[signatureOffset++] = typeidOffset; idata[signatureOffset++] = typeidOffset;
idata[typeidOffset++] = mm.outputTypes.count(); idata[typeidOffset++] = mm.outputTypes.count();
memcpy(idata.data() + typeidOffset, mm.outputTypes.data(), mm.outputTypes.count() * sizeof(int)); memcpy(idata.data() + typeidOffset, mm.outputTypes.data(), mm.outputTypes.count() * sizeof(uint));
typeidOffset += mm.outputTypes.count(); typeidOffset += mm.outputTypes.count();
} }
} }
@ -540,7 +540,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
strings.writeBlob(string_data); strings.writeBlob(string_data);
uint *uint_data = new uint[idata.size()]; uint *uint_data = new uint[idata.size()];
memcpy(uint_data, idata.data(), idata.size() * sizeof(int)); memcpy(uint_data, idata.data(), idata.size() * sizeof(uint));
// put the metaobject together // put the metaobject together
obj->d.data = uint_data; obj->d.data = uint_data;