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

QObjectPrivate: use placement new/delete for SignalVector

Browse Source 
Just to be pedantically correct, but also makes the construction code
slightly more readable.

Change-Id: I29f1c141c0f7436393d9fffd16e2bbf0f361c024
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit d1e9cab81ca94f450b1391822091ed81fec60c92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-04-04 08:44:17 -07:00 committed by Qt Cherry-pick Bot
parent dd4b0a3ab9
commit 9458373cd0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,8 +276,10 @@ public:
if (c)
deleteOrphaned(c);
SignalVector *v = signalVector.loadRelaxed();
if (v)
if (v) {
v->~SignalVector();
free(v);
}
}
// must be called on the senders connection data
@ -308,7 +310,9 @@ public:
if (vector && vector->allocated > size)
return;
size = (size + 7) & ~7;
SignalVector *newVector = reinterpret_cast<SignalVector *>(malloc(sizeof(SignalVector) + (size + 1) * sizeof(ConnectionList)));
void *ptr = malloc(sizeof(SignalVector) + (size + 1) * sizeof(ConnectionList));
auto newVector = new (ptr) SignalVector;
int start = -1;
if (vector) {
// not (yet) existing trait: