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

BeatsPointer: Use std::shared_ptr instead of QSharedPointer #4259

Merged
merged 1 commit into from
Sep 4, 2021

Conversation

Holzhaus
Copy link
Member

@Holzhaus Holzhaus commented Sep 3, 2021

BeatGrid/BeatMap don't inherit from QObject, so we can simply use
std::shared_ptr.

Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

QSharedPointer is as generic as std::shared_ptr, works like std::shared_ptr and doesn't depend on QObject. I agree that using std::shared_ptr is more idiomatic to avoid this misunderstanding.

LGTM

@Be-ing
Copy link
Contributor

Be-ing commented Sep 3, 2021

There is a merge conflict now.

BeatGrid/BeatMap don't inherit from QObject, so we can simply use
std::shared_ptr.
@Holzhaus Holzhaus force-pushed the beats-std-ptr branch 2 times, most recently from b59b12e to 3e4c2be Compare September 4, 2021 10:36
@Holzhaus
Copy link
Member Author

Holzhaus commented Sep 4, 2021

There is a merge conflict now.

Resolved.

@uklotzde uklotzde merged commit 9d11158 into mixxxdj:main Sep 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants