Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 19:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't leave user data pointers around in objects after deletion

Browse source
This commit is contained in:
Brad Davis 2016-02-12 12:07:23 -08:00
parent 31f9da2dcb
commit 28f3e8ba9c
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/ui/src/VrMenu.cpp
View file

@ -28,6 +28,11 @@ public:
init(menu, qmlObject); init(menu, qmlObject);
} }
~MenuUserData() {
_widget->setUserData(USER_DATA_ID, nullptr);
_qml->setUserData(USER_DATA_ID, nullptr);
}
const QUuid uuid{ QUuid::createUuid() }; const QUuid uuid{ QUuid::createUuid() };
static MenuUserData* forObject(QObject* object) { static MenuUserData* forObject(QObject* object) {
@ -37,12 +42,17 @@ public:
private: private:
MenuUserData(const MenuUserData&); MenuUserData(const MenuUserData&);
void init(QObject* widgetObject, QObject* qmlObject) { void init(QObject* widgetObject, QObject* qmlObject) {
_widget = widgetObject;
_qml = qmlObject;
widgetObject->setUserData(USER_DATA_ID, this); widgetObject->setUserData(USER_DATA_ID, this);
qmlObject->setUserData(USER_DATA_ID, this); qmlObject->setUserData(USER_DATA_ID, this);
qmlObject->setObjectName(uuid.toString()); qmlObject->setObjectName(uuid.toString());
// Make sure we can find it again in the future // Make sure we can find it again in the future
Q_ASSERT(VrMenu::_instance->findMenuObject(uuid.toString())); Q_ASSERT(VrMenu::_instance->findMenuObject(uuid.toString()));
} }
QObject* _widget { nullptr };
QObject* _qml { nullptr };
}; };
const int MenuUserData::USER_DATA_ID = QObject::registerUserData(); const int MenuUserData::USER_DATA_ID = QObject::registerUserData();