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.

10 files changed, 32 insertions, 27 deletions

diff --git a/quacker/bagdisplay.cpp b/quacker/bagdisplay.cpp
index 456ef51..f38854d 100644
--- a/quacker/bagdisplay.cpp
+++ b/quacker/bagdisplay.cpp
@@ -105,7 +105,12 @@ void BagDisplay::showTiles(const Quackle::LongLetterString &tiles)
 			line += sanitizedQString;
 		}
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+		// Kill Qt 5.13 deprecation warning without breaking pre-5.11 builds
+		const int lineWidth = metrics.horizontalAdvance(line);
+#else
 		const int lineWidth = metrics.width(line);
+#endif
 		if (lineWidth > maxLineWidth)
 			maxLineWidth = lineWidth;
 
diff --git a/quacker/graphicalboard.cpp b/quacker/graphicalboard.cpp
index d8aafe1..595e830 100644
--- a/quacker/graphicalboard.cpp
+++ b/quacker/graphicalboard.cpp
@@ -83,9 +83,9 @@ GraphicalBoardFrame::GraphicalBoardFrame(QWidget *parent)
 
     QColor color(PixmapCacher::self()->markColor);
     QPalette customPalette;
-    customPalette.setColor(QPalette::Light, color.light(s_highlightFactor));
+    customPalette.setColor(QPalette::Light, color.lighter(s_highlightFactor));
     customPalette.setColor(QPalette::Mid, color);
-    customPalette.setColor(QPalette::Dark, color.dark(130));
+    customPalette.setColor(QPalette::Dark, color.darker(130));
     setPalette(customPalette);
 
     PixmapCacher::self()->tileFont = font();
@@ -991,7 +991,7 @@ void PixmapCacher::readTheme(const QString& themeFile)
 
     // tiles on rack will be of different sizes and thus are slightly
     // altered to fool the pixmap cacher
-    rackColor = letterColor.light(101);
+    rackColor = letterColor.lighter(101);
 
     DLSColor = QColor(settings.value("DLS", "cornflowerblue").toString());
     TLSColor = QColor(settings.value("TLS", "slateblue").toString());
@@ -1228,7 +1228,7 @@ QString TileWidget::letterText()
                     return QString("%1WS").arg(m_information.bonusMultiplier);
             }
 
-            return QString::null;
+            return QString();
         }
     }
     else
@@ -1294,17 +1294,17 @@ QString TileWidget::miniText()
     if (m_information.letter != QUACKLE_NULL_MARK && QuackerSettings::self()->scoreLabels)
     {   
         if (m_information.isBlank)
-            return QString::null;
+            return QString();
         else
             return QString::number(QUACKLE_ALPHABET_PARAMETERS->score(m_information.letter));
     }
     else
-        return QString::null;
+        return QString();
 }
 
 QColor TileWidget::miniTextColor()
 {
-    return tileColor().light(170);
+    return tileColor().lighter(170);
 }
 
 QFont TileWidget::miniFont()
@@ -1366,8 +1366,8 @@ QPixmap TileWidget::generateTilePixmap()
         //const QColor outerColor(backgroundColor());
 
         QRadialGradient gradient(QPointF(radius, radius), radius * 3, QPointF(radius / 3, radius / 3));
-        gradient.setColorAt(0, color.light(GraphicalBoardFrame::s_highlightFactor));
-        gradient.setColorAt(.95, color.dark(GraphicalBoardFrame::s_highlightFactor));
+        gradient.setColorAt(0, color.lighter(GraphicalBoardFrame::s_highlightFactor));
+        gradient.setColorAt(.95, color.darker(GraphicalBoardFrame::s_highlightFactor));
 
         QPainter painter(&ret);
         painter.setBrush(gradient);
@@ -1375,7 +1375,7 @@ QPixmap TileWidget::generateTilePixmap()
         painter.drawEllipse((int)(midpoint.x() - radius), (int)(midpoint.y() - radius), (int)(radius * 2), (int)(radius * 2));
 
         QPalette customPalette;
-        customPalette.setColor(QPalette::Light, color.light(GraphicalBoardFrame::s_highlightFactor));
+        customPalette.setColor(QPalette::Light, color.lighter(GraphicalBoardFrame::s_highlightFactor));
         customPalette.setColor(QPalette::Dark, color);
         customPalette.setColor(QPalette::Mid, color);
 
@@ -1469,7 +1469,7 @@ void MarkWidget::setCol(int col)
 void MarkWidget::setCapstone()
 {
     m_capstone = true;
-    m_letterText = QString::null;
+    m_letterText = QString();
 }
 
 void MarkWidget::setSideLength(int sideLength)
@@ -1490,11 +1490,11 @@ QColor MarkWidget::tileColor()
 {
     // we slightly alter colors to fool the pixmap cacher!
     if (m_capstone)
-        return PixmapCacher::self()->markColor.light(101);
+        return PixmapCacher::self()->markColor.lighter(101);
     else if (m_horizontal)
         return PixmapCacher::self()->markColor;
     else
-        return PixmapCacher::self()->markColor.dark(101);
+        return PixmapCacher::self()->markColor.darker(101);
 }
 
 QColor MarkWidget::letterTextColor()
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);
 
diff --git a/quacker/letterbox.h b/quacker/letterbox.h
index 47ca699..8aa171d 100644
--- a/quacker/letterbox.h
+++ b/quacker/letterbox.h
@@ -143,7 +143,7 @@ protected slots:
 	void mistakeDetector(const QString &text);
 	void timeout();
 
-	void setCaption(const QString &text = QString::null);
+	void setCaption(const QString &text = QString());
 	void setModified(bool modified);
 
 protected:
diff --git a/quacker/lister.cpp b/quacker/lister.cpp
index f4077d2..b0c7451 100644
--- a/quacker/lister.cpp
+++ b/quacker/lister.cpp
@@ -139,7 +139,7 @@ ListerDialog::ListerDialog(QWidget *parent, const QString &settingsGroup, const
 	buttonBox2->addStretch();
 	buttonBox2->addWidget(m_closeButton);
 
-	filenameChanged(QString::null); // disable write button initially
+	filenameChanged(QString()); // disable write button initially
 
 	connect(m_filenameEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filenameChanged(const QString &)));
 	connect(m_writeButton, SIGNAL(clicked()), this, SLOT(writeButtonClicked()));
@@ -324,7 +324,7 @@ QString ListerDialog::run(QWidget *parent, const QString &settingsGroup, const Q
 	if (accepted)
 		return dialog.filename();
 
-	return QString::null;
+	return QString();
 }
 
 void ListerDialog::saveSettings()
@@ -419,13 +419,13 @@ QMap<QString, Dict::WordList> ListerDialog::anagramMap()
 QString ListerDialog::writeList(bool alphagrams)
 {
 	if (m_filename.isEmpty())
-		return QString::null;
+		return QString();
 
 	QFile file(m_filename);
 	if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
 	{
 		QMessageBox::critical(this, windowTitleWithAppName(tr("Error writing file")), tr("Could not open %1 for writing.").arg(m_filename));
-		return QString::null;
+		return QString();
 	}
 
 	QTextStream stream(&file);
@@ -568,7 +568,7 @@ void PlayabilityFilter::apply()
 		intermediateList.setSortBy(Dict::WordList::Probability);
 	else
 		intermediateList.setSortBy(Dict::WordList::Playability);
-	qSort(intermediateList);
+	std::sort(intermediateList.begin(), intermediateList.end());
 
 	Dict::WordList filteredList;
 
diff --git a/quacker/lister.h b/quacker/lister.h
index c970f23..7c24489 100644
--- a/quacker/lister.h
+++ b/quacker/lister.h
@@ -43,11 +43,11 @@ Q_OBJECT
 public:
 	enum ListerFlags { FullLister = 0x0000, IgnoreBritishness = 0x0001, ProbabilityInsteadOfPlayability = 0x0002, NothingToReturn = 0x0004 };
 
-	ListerDialog(QWidget *parent, const QString &settingsGroup, const QString &appName = QString::null, int flags = FullLister);
+	ListerDialog(QWidget *parent, const QString &settingsGroup, const QString &appName = QString(), int flags = FullLister);
 	~ListerDialog();
 
 	// use this for modal running! settingsGroup is like "letterbox"
-	static QString run(QWidget *parent, const QString &settingsGroup, const QString &appName = QString::null, int flags = FullLister);
+	static QString run(QWidget *parent, const QString &settingsGroup, const QString &appName = QString(), int flags = FullLister);
 
 	Dict::WordList &wordList();
 	void setWordList(Dict::WordList list);
diff --git a/quacker/newgame.cpp b/quacker/newgame.cpp
index b8ce0ab..1a0b272 100644
--- a/quacker/newgame.cpp
+++ b/quacker/newgame.cpp
@@ -230,7 +230,7 @@ void PlayerTab::addPlayer(const Quackle::Player &player)
 	setItem(item, player);
 
 	m_playersTreeWidget->clearSelection();
-	m_playersTreeWidget->setItemSelected(item, true);
+	item->setSelected(true);
 }
 
 Quackle::ComputerPlayer *PlayerTab::defaultComputerPlayer() const
diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp
index 6a2a34a..2049f42 100644
--- a/quacker/quacker.cpp
+++ b/quacker/quacker.cpp
@@ -1148,7 +1148,7 @@ void TopLevel::chooseLogfile()
 
 	fileDialog->setDirectory(userSpecifiedLogfile().isEmpty()? QDir::currentPath() : QFileInfo(userSpecifiedLogfile()).absolutePath());
 	fileDialog->setFileMode(QFileDialog::AnyFile);
-	fileDialog->setConfirmOverwrite(false);
+	fileDialog->setOption(QFileDialog::DontConfirmOverwrite);
 
 	if (fileDialog->exec())
 	{
diff --git a/quacker/quacker.h b/quacker/quacker.h
index 646e823..b56b91b 100644
--- a/quacker/quacker.h
+++ b/quacker/quacker.h
@@ -205,7 +205,7 @@ protected slots:
 	// update history views when a new position is added
 	void updateHistoryViews();
 
-	void setCaption(const QString &text = QString::null);
+	void setCaption(const QString &text = QString());
 	void setModified(bool modified);
 
 	// main timer
diff --git a/quacker/rackdisplay.cpp b/quacker/rackdisplay.cpp
index 62084be..732f94d 100644
--- a/quacker/rackdisplay.cpp
+++ b/quacker/rackdisplay.cpp
@@ -266,7 +266,7 @@ GraphicalRack::mousePressEvent (QMouseEvent* event)
 
     child->setPixmap (tempPixmap);
 
-    if (drag->start (Qt::CopyAction | Qt::MoveAction) == Qt::MoveAction) {
+    if (drag->exec(Qt::CopyAction | Qt::MoveAction) == Qt::MoveAction) {
         child->close();
     }
     else {