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

clean: deprecations that won't break Qt5 compatibility #1433

Merged
merged 2 commits into from
Mar 22, 2024

Conversation

shenlebantongying
Copy link
Collaborator

No description provided.

setAudioPlaybackProgram( *externalPlayer );
playerPtr.reset( externalPlayer.take() );
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

They realize that .take() makes the existence of this pointer type pointless, so it is removed.

qt/qtbase@612a01b

@@ -41,7 +41,7 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg ):
// anyone?
QItemEditorCreatorBase * programTypeEditorCreator = new QStandardItemEditorCreator< ProgramTypeEditor >();

itemEditorFactory->registerEditor( QVariant::Int, programTypeEditorCreator );
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@@ -72,14 +72,14 @@ void ExternalAudioPlayer::onViewerDestroyed( QObject * destroyedViewer )
emit error( errorMessage );
}
}
else if ( viewer.data() == destroyedViewer )
viewer.take(); // viewer finished and died -> release ownership.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

take() by nothing is reset to null.

Copy link

sonarcloud bot commented Mar 22, 2024

@xiaoyifang xiaoyifang merged commit 2ed43fe into xiaoyifang:staged Mar 22, 2024
13 checks passed
@shenlebantongying shenlebantongying deleted the clean/dep-qt5 branch March 25, 2024 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants