Skip to content

Remove deprecated usage of setUserData.#1502

Merged
daleglass merged 2 commits into
vircadia:masterfrom
daleglass:qt5-fix-userdata
Jan 22, 2022
Merged

Remove deprecated usage of setUserData.#1502
daleglass merged 2 commits into
vircadia:masterfrom
daleglass:qt5-fix-userdata

Conversation

@daleglass

@daleglass daleglass commented Nov 29, 2021

Copy link
Copy Markdown
Contributor

This removes the usage of QObjectUserData, setUserData and userData.

The actual change is minor but this required rearranging things a bit. MenuUserData class is now declared in the header so that the Q_OBJECT macro is processed properly.

Fixes #1305

Builds on top of #1485

@daleglass daleglass added enhancement New feature or request housekeeping Code or documentation cleanup needs CR (code review) needs testing (QA) The PR is ready for testing labels Nov 29, 2021
@digisomni

Copy link
Copy Markdown
Member

Needs testing by someone in VR. :)

@ksuprynowicz

Copy link
Copy Markdown
Contributor

I just tested it in VR, especially with the tablet. Works perfectly fine.

@digisomni digisomni changed the title Remove deprecated usage of setUserData Remove deprecated usage of setUserData. Jan 8, 2022
@digisomni digisomni added this to the 2022.1.1 Selene Release milestone Jan 8, 2022
@digisomni digisomni added QA Approved The PR has been tested successfully. and removed needs testing (QA) The PR is ready for testing labels Jan 8, 2022
@digisomni

Copy link
Copy Markdown
Member

This should be ready for review after 1485 is merged.

@ctrlaltdavid ctrlaltdavid left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs updating with PR #1485 changes once that PR is merged.

Comment thread libraries/ui/src/VrMenu.cpp Outdated
This removes the usage of QObjectUserData, setUserData and userData.

Fixes vircadia#1305
@ctrlaltdavid ctrlaltdavid added CR Approved At least one code reviewer has approved the PR. and removed needs CR (code review) labels Jan 20, 2022
@daleglass daleglass merged commit ec18f7a into vircadia:master Jan 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CR Approved At least one code reviewer has approved the PR. enhancement New feature or request housekeeping Code or documentation cleanup QA Approved The PR has been tested successfully.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

QObject::registerUserData() is deprecated

5 participants