Mercurial > octave
changeset 29050:ce849f006568 stable
avoid deprecated QFlags<T>::QFlags(QFlags<T>::Zero) constructor
* Vt102Emulation.cpp (Vt102Emulation::getErase): In call to
KeyboardTranslator::findEntry, use Qt::NoModifier instead of passing
nullptr for modifiers and use default instead of passing nullptr for
state argument.
* dialog.cc (MessageDialog::MessageDialog): Use defaults instead of
passing nullptr for QMessageBox buttons and parent arguments.
* documentation.cc (documentation::find): Don't initialize find_flags
with 0 value.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 12 Nov 2020 00:49:59 -0500 |
| parents | 461bd8b9ce91 |
| children | 9893a8771a97 |
| files | libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp libgui/src/dialog.cc libgui/src/documentation.cc |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Wed Nov 11 23:41:06 2020 -0500 +++ b/libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp Thu Nov 12 00:49:59 2020 -0500 @@ -1213,8 +1213,8 @@ { KeyboardTranslator::Entry entry = _keyTranslator->findEntry( Qt::Key_Backspace, - nullptr, - nullptr); + Qt::NoModifier); + if ( entry.text().count() > 0 ) return entry.text()[0]; else
--- a/libgui/src/dialog.cc Wed Nov 11 23:41:06 2020 -0500 +++ b/libgui/src/dialog.cc Thu Nov 12 00:49:59 2020 -0500 @@ -352,7 +352,7 @@ const QString& defbutton, const QStringList& role) : QMessageBox (QMessageBox::NoIcon, title.isEmpty () ? " " : title, - message, nullptr, nullptr) + message) { // Create a NonModal message. setWindowModality (Qt::NonModal);
--- a/libgui/src/documentation.cc Wed Nov 11 23:41:06 2020 -0500 +++ b/libgui/src/documentation.cc Thu Nov 12 00:49:59 2020 -0500 @@ -725,7 +725,7 @@ if (! m_help_engine) return; - QTextDocument::FindFlags find_flags = 0; + QTextDocument::FindFlags find_flags; if (backward) find_flags = QTextDocument::FindBackward;