-
Notifications
You must be signed in to change notification settings - Fork 87
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
xiaoyifang
merged 2 commits into
xiaoyifang:staged
from
shenlebantongying:clean/dep-qt5
Mar 22, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,7 +41,7 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg ): | |
// anyone? | ||
QItemEditorCreatorBase * programTypeEditorCreator = new QStandardItemEditorCreator< ProgramTypeEditor >(); | ||
|
||
itemEditorFactory->registerEditor( QVariant::Int, programTypeEditorCreator ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
itemEditorFactory->registerEditor( QMetaType::Int, programTypeEditorCreator ); | ||
|
||
itemDelegate->setItemEditorFactory( itemEditorFactory.get() ); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ ExternalAudioPlayer::~ExternalAudioPlayer() | |
|
||
// Set viewer to null first and foremost to make sure that onViewerDestroyed() | ||
// doesn't attempt to start viewer or mess the smart pointer up. | ||
stopAndDestroySynchronously( viewer.take() ); | ||
stopAndDestroySynchronously( viewer.release() ); | ||
|
||
stopAndDestroySynchronously( exitingViewer ); | ||
} | ||
|
@@ -56,7 +56,7 @@ void ExternalAudioPlayer::stop() | |
// 1) the process gets a chance to clean up and save its state; | ||
// 2) there is no event loop blocking and consequently no (short) UI freeze | ||
// while synchronously waiting for the external process to exit. | ||
exitingViewer = viewer.take(); | ||
exitingViewer = viewer.release(); | ||
} | ||
else // viewer is either not started or already stopped -> simply destroy it. | ||
viewer.reset(); | ||
|
@@ -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. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. take() by nothing is reset to null. |
||
else if ( viewer.get() == destroyedViewer ) | ||
viewer.reset( nullptr ); // viewer finished and died -> reset | ||
} | ||
|
||
QString ExternalAudioPlayer::startViewer() | ||
{ | ||
Q_ASSERT( !exitingViewer && viewer ); | ||
connect( viewer.data(), &QObject::destroyed, this, &ExternalAudioPlayer::onViewerDestroyed ); | ||
connect( viewer.get(), &QObject::destroyed, this, &ExternalAudioPlayer::onViewerDestroyed ); | ||
try { | ||
viewer->start(); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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