[scide][qtcollider] Fix Qt deprecations #4649
Merged
Conversation
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
jrsurge
added
comp: Qt GUI
mossheim
suggested changes
Nov 28, 2019
There was a problem hiding this comment.
Thanks! Can you please use https://doc.qt.io/qt-5/qtglobal.html#QT_VERSION instead of comments?
mossheim
reviewed
Nov 28, 2019
| @@ -950,8 +948,7 @@ int MultiEditor::insertTab(Document* doc, int insertIndex) { | |||
| tabIdx = mTabs->insertTab(insertIndex, icon, doc->title()); | |||
| mTabs->setTabData(tabIdx, QVariant::fromValue<Document*>(doc)); | |||
|
|
|||
| mDocModifiedSigMap.setMapping(tdoc, doc); | |||
| connect(tdoc, SIGNAL(modificationChanged(bool)), &mDocModifiedSigMap, SLOT(map())); | |||
| connect(tdoc, &QTextDocument::modificationChanged, [=](const bool status) { onDocModified(doc); }); | |||
There was a problem hiding this comment.
strongly prefer explicit captures for lambdas, and you can simplify the parameter list since you don't use status -- [this, doc](bool) { onDocModified(doc); }
There was a problem hiding this comment.
thanks for this - I've brushed up on new(er) Meyers advice and now understand the reasons for this, thanks for the catch!
mossheim
reviewed
Nov 28, 2019
| @@ -163,8 +163,7 @@ MainWindow::MainWindow(Main* main): mMain(main), mClockLabel(0), mDocDialog(0) { | |||
| connect(main->sessionManager(), SIGNAL(saveSessionRequest(Session*)), this, SLOT(saveSession(Session*))); | |||
| connect(main->sessionManager(), SIGNAL(switchSessionRequest(Session*)), this, SLOT(switchSession(Session*))); | |||
| connect(main->sessionManager(), SIGNAL(currentSessionNameChanged()), this, SLOT(updateWindowTitle())); | |||
| // A system for easy evaluation of pre-defined code: | |||
| connect(&mCodeEvalMapper, SIGNAL(mapped(QString)), this, SIGNAL(evaluateCode(QString))); | |||
| // A system for easy evaluation of pre-defined code:; | |||
qSort deprecated in Qt 5.2
jrsurge
force-pushed
the
topic/remove-qt-deprecations
branch
from
2ff6c99 to
0a867b9
Compare
QSignalMapper deprecated. Lambda-based connections introduced in 5.0
QSignalMapper deprecated. No call to mCodeEvalMapper.map() ever made, safe to remove
setTabStop replaced with setTabStopDistance in 5.10
QFontMetrics::width replaced by QFontMetrics::horizontalAdvance in 5.11
screenGeometry deprecated. QGuiApplication::primaryScreen()->geometry available since Qt 5.0
QPixmap::grabWidget deprecated - QWidget::grab available since Qt 5.0
jrsurge
force-pushed
the
topic/remove-qt-deprecations
branch
from
0a867b9 to
09bc2dd
Compare
|
thanks for the review @brianlheim! Hopefully should all be implemented now. One question about the compile-time check - do we need to worry about people using different Qt runtime libs than the ones we compile against? |
|
no, we bundle qt libraries for the windows and mac artefacts. |
mossheim
approved these changes
Dec 7, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Purpose and Motivation
Qt has started issuing deprecation warnings - this PR addresses as many of them as possible while maintaining compatibility.
These aren't particularly high priority, but just to get ahead of it where possible.
Everything here uses 5.0 compatible fixes.For those that need a more recent Qt version, I've added TODO notes with the code to uncomment when the time comes - some things need 5.10, etc. and I wasn't sure we were ready to enforce that.EDIT: Compile-time checks of Qt versions switch in newer code where required.
Commit history outlines the details - most of them relate the use of QSignalMapper, which hasn't been necessary since 5.0 with C++11.
Features affected/to test:
Types of changes
To-do list