diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/corelib/kernel/qobject.h | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 7d47c377da..7beaa32855 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -161,12 +161,8 @@ public: inline QList<T> findChildren(const QString &aName = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList<T> list; - union { - QList<T> *typedList; - QList<void *> *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, aName, reinterpret_cast<T>(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, aName, reinterpret_cast<T>(0)->staticMetaObject, + reinterpret_cast<QList<void *> *>(&list), options); return list; } @@ -175,12 +171,8 @@ public: inline QList<T> findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList<T> list; - union { - QList<T> *typedList; - QList<void *> *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, re, reinterpret_cast<T>(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, re, reinterpret_cast<T>(0)->staticMetaObject, + reinterpret_cast<QList<void *> *>(&list), options); return list; } #endif @@ -190,12 +182,8 @@ public: inline QList<T> findChildren(const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList<T> list; - union { - QList<T> *typedList; - QList<void *> *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, re, reinterpret_cast<T>(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, re, reinterpret_cast<T>(0)->staticMetaObject, + reinterpret_cast<QList<void *> *>(&list), options); return list; } #endif |