diff options
| author | John Fultz <jfultz@wolfram.com> | 2019-07-19 12:05:36 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2019-07-19 12:05:36 -0500 |
| commit | b6654916b426574a4f576d3511f21a85377746f9 (patch) | |
| tree | a29c5d92541f1e0c6b418445a18d2f917d760ce8 /quacker/letterbox.cpp | |
| parent | 595735c6fa5c9ed837151947e6ba1fbfdcd3190c (diff) | |
Fix deprecation errors for Qt 5.13.
Most are Qt4-isms, except where noted.
* Replaced QFontMetrics::width with QFontMetrics::horizontalAdvance,
conditionally as the latter wasn't even introduced until Qt 5.11.
* QColor::light and dark instead of QColor::light and dark.
* QString() instead of QString::null.
* std::sort instead of qSort
* QTreeWidgetItem::setSelected instead of QTreeWidget::setItemSelected.
* QFileDialog::setOption(QFileDialog::DontConfirmOverwrite) instead
of QFileDialog::setConfirmOverwrite(false).
* QDrag::exec instead of QDrag::start.
Diffstat (limited to 'quacker/letterbox.cpp')
| -rw-r--r-- | quacker/letterbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quacker/letterbox.cpp b/quacker/letterbox.cpp index 78a65e1..faa646d 100644 --- a/quacker/letterbox.cpp +++ b/quacker/letterbox.cpp @@ -657,7 +657,7 @@ QString Letterbox::arrangeLettersForUser(const QString &word) Clue Letterbox::clueFor(const QString &word) { if (word.isNull()) - return Clue(QString::null); + return Clue(QString()); if (LetterboxSettings::self()->mathMode) return mathClue(word); @@ -1259,7 +1259,7 @@ void HTMLRepresentation::setWords(Dict::WordListList::ConstIterator start, Dict: QString HTMLRepresentation::htmlForWordList(const Dict::WordList &wordList) { if (wordList.isEmpty()) - return QString::null; + return QString(); QString html = QString("<center><table border=1 cellspacing=%1 cellpadding=%2>").arg(m_tableSpacing).arg(m_tablePadding); |