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

QMetaCallEvent::create: pass arguments by const ref

Browse Source 
Amends 4d7ae8a74e70896a757f483865fe7095120fedc1.

Change-Id: Id4379324c2399f2360b3553d297f38dd793af21c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 38a00d2c978eba90e9006418de5ebaf89092b079)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2023-06-09 23:41:36 +02:00 committed by Qt Cherry-pick Bot
parent dcffd0035c
commit 7f807cdd42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qobject_p.h
View File

@ -389,14 +389,14 @@ public:
template<typename ...Args> template<typename ...Args>
static QMetaCallEvent *create(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender, static QMetaCallEvent *create(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender,
int signal_index, Args ...argv) int signal_index, const Args &...argv)
{ {
auto metaCallEvent = std::make_unique<QMetaCallEvent>(slotObj, sender, auto metaCallEvent = std::make_unique<QMetaCallEvent>(slotObj, sender,
signal_index, int(1 + sizeof...(Args))); signal_index, int(1 + sizeof...(Args)));
void **args = metaCallEvent->args(); void **args = metaCallEvent->args();
QMetaType *types = metaCallEvent->types(); QMetaType *types = metaCallEvent->types();
const std::array<void *, sizeof...(Args) + 1> argp{ nullptr, std::addressof(argv)... }; const std::array<const void *, sizeof...(Args) + 1> argp{ nullptr, std::addressof(argv)... };
const std::array metaTypes{ QMetaType::fromType<void>(), QMetaType::fromType<Args>()... }; const std::array metaTypes{ QMetaType::fromType<void>(), QMetaType::fromType<Args>()... };
for (size_t i = 0; i < sizeof...(Args) + 1; ++i) { for (size_t i = 0; i < sizeof...(Args) + 1; ++i) {
types[i] = metaTypes[i]; types[i] = metaTypes[i];