From 4ba4c4f07cf678087abd6ecbed8ffc5fd558bee8 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 8 Aug 2022 10:15:50 -0700
Subject: QDBusMetaObjectGenerator: replace a few more int

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>
---
 src/dbus/qdbusmetaobject.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/dbus')

diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 668a039a46..c7ae280295 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -41,14 +41,14 @@ private:
         QVarLengthArray<int, 4> inputTypes;
         QVarLengthArray<int, 4> outputTypes;
         QByteArray rawReturnType;
-        int flags;
+        quint32 flags;
     };
 
     struct Property {
         QByteArray typeName;
         QByteArray signature;
         int type;
-        int flags;
+        quint32 flags;
     };
     struct Type {
         int id;
@@ -381,8 +381,8 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     if (className.isEmpty())
         className = "QDBusInterface"_L1;
 
-    QVarLengthArray<int> idata;
-    idata.resize(sizeof(QDBusMetaObjectPrivate) / sizeof(int));
+    QVarLengthArray<uint> idata;
+    idata.resize(sizeof(QDBusMetaObjectPrivate) / sizeof(uint));
 
     qsizetype methodParametersDataSize =
             ((aggregateParameterCount(signals_)
@@ -495,12 +495,12 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
 
             idata[signatureOffset++] = typeidOffset;
             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();
 
             idata[signatureOffset++] = typeidOffset;
             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();
         }
     }
@@ -540,7 +540,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     strings.writeBlob(string_data);
 
     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
     obj->d.data = uint_data;
-- 
cgit v1.2.3