diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-26 12:33:26 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:19:11 +0200 |
| commit | 92a31781bb17d31ab09291ca00efb4346cb2f371 (patch) | |
| tree | e8a07d6461193047132727bba78686ee3add0513 /src | |
| parent | 1697fbdf05ff643d617a9ba1614454926e86a3d9 (diff) | |
Return a qsizetype from QMetaType::sizeOf()/alignOf()
Object sizes in Qt 6 should use qsizetype.
Change-Id: I76ceb5faf361d7f6be88d88c772358ad6d701d54
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 595cfd9900..e37629ffa3 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -505,7 +505,7 @@ int QMetaType::id() const \sa QMetaType::construct(), QMetaType::sizeOf(), QMetaType::alignOf() */ -int QMetaType::sizeOf() const +qsizetype QMetaType::sizeOf() const { if (d_ptr) return d_ptr->size; @@ -526,7 +526,7 @@ int QMetaType::sizeOf() const \sa QMetaType::construct(), QMetaType::sizeOf() */ -int QMetaType::alignOf() const +qsizetype QMetaType::alignOf() const { if (d_ptr) return d_ptr->alignment; diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index ba4f2e8050..b2f8e640c2 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -404,8 +404,8 @@ public: bool isValid() const; bool isRegistered() const; int id() const; - int sizeOf() const; - int alignOf() const; + qsizetype sizeOf() const; + qsizetype alignOf() const; TypeFlags flags() const; const QMetaObject *metaObject() const; const char *name() const; |