Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecated usage of multiple keys in QHash and QMap. #1468

Merged
merged 2 commits into from
Dec 3, 2021

Conversation

daleglass
Copy link
Contributor

This replaces those uses with QMultiHash and QMultiMap. This removes a fair amount of warnings. Only 157 to go.

@digisomni digisomni added this to the 2022.1.1 Selene Release milestone Nov 23, 2021
@digisomni digisomni added housekeeping Code or documentation cleanup needs CR (code review) labels Nov 23, 2021
@digisomni digisomni changed the title Fix deprecated usage of multiple keys in QHash and QMap Fix deprecated usage of multiple keys in QHash and QMap. Nov 23, 2021
Copy link
Collaborator

@HifiExperiments HifiExperiments left a comment

Choose a reason for hiding this comment

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

hm these white space changes might cause some annoying conflicts with other PRs but otherwise ok

I also wonder if these Maps were actually originally supposed to be Maps or if they were intended to be Hashes

@daleglass
Copy link
Contributor Author

@HifiExperiments Yeah, the space stuff isn't ideal but that's easy enough to fix if anything conflicts. Also makes things a bit less annoying, as it avoids the need to mess with the whitespace by hand.

I think maybe we could just do a giant whitespace tidying commit some day and then install a rule that from now on, it must be perfect.

@HifiExperiments HifiExperiments added CR Approved At least one code reviewer has approved the PR. and removed needs CR (code review) labels Nov 25, 2021
…d QMap

This replaces those uses with QMultiHash and QMultiMap
uniqueKeys() is deprecated, and _resources shouldn't contain duplicated keys.
Copy link
Member

@digisomni digisomni left a comment

Choose a reason for hiding this comment

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

The Interface on Windows and macOS runs, the server runs on Windows.

@digisomni digisomni added QA Approved The PR has been tested successfully. and removed needs testing (QA) The PR is ready for testing labels Dec 3, 2021
@digisomni digisomni merged commit b7734e3 into vircadia:master Dec 3, 2021
digisomni added a commit that referenced this pull request Jan 15, 2022
Fix MultiHash issues added in PR #1468.
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. 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.

4 participants