From cfadea4c65f5b6e78e1ba8205d9525880271f4e5 Mon Sep 17 00:00:00 2001
From: Martin Piatka <piatka@cesnet.cz>
Date: Mon, 15 Feb 2021 13:15:06 +0100
Subject: [PATCH] GUI: Replace deprecated Qt calls + fix warnings

Since QTextEdit::setTabStopDistance() is available starting 5.10 and we
still support Qt 5.5 (Ubuntu 16), it's moved to log_window.cpp and
ifdefed according to version
---
 gui/QT/option/settings.cpp         | 1 +
 gui/QT/option/spinbox_ui.cpp       | 2 +-
 gui/QT/ui/log_window.ui            | 3 ---
 gui/QT/window/log_window.cpp       | 7 +++++++
 gui/QT/window/ultragrid_window.cpp | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gui/QT/option/settings.cpp b/gui/QT/option/settings.cpp
index f73e8f90f..c48405bb8 100644
--- a/gui/QT/option/settings.cpp
+++ b/gui/QT/option/settings.cpp
@@ -247,6 +247,7 @@ Settings::Settings() : dummy(this){
 		if(!i.parent[0])
 			opt.addOnChangeCallback(test_callback);
 #endif
+		(void) opt; //suppress unused warning
 	}
 
 	for(const auto &i : optionCallbacks){
diff --git a/gui/QT/option/spinbox_ui.cpp b/gui/QT/option/spinbox_ui.cpp
index 6b2be467b..a9538cc6e 100644
--- a/gui/QT/option/spinbox_ui.cpp
+++ b/gui/QT/option/spinbox_ui.cpp
@@ -10,7 +10,7 @@ SpinBoxUi::SpinBoxUi(QSpinBox *spinbox, Settings *settings, const std::string &o
 }
 
 void SpinBoxUi::connectSignals(){
-	connect(spinbox, Overload<const QString &>::of(&QSpinBox::valueChanged),
+	connect(spinbox, &QSpinBox::textChanged,
             this, &SpinBoxUi::textEdited);
 }
 
diff --git a/gui/QT/ui/log_window.ui b/gui/QT/ui/log_window.ui
index 8770a26b4..c565591da 100644
--- a/gui/QT/ui/log_window.ui
+++ b/gui/QT/ui/log_window.ui
@@ -91,9 +91,6 @@
        <family>Monospace</family>
       </font>
      </property>
-     <property name="tabStopWidth">
-      <number>40</number>
-     </property>
      <property name="placeholderText">
       <string/>
      </property>
diff --git a/gui/QT/window/log_window.cpp b/gui/QT/window/log_window.cpp
index 7f64907b5..8511fce91 100644
--- a/gui/QT/window/log_window.cpp
+++ b/gui/QT/window/log_window.cpp
@@ -2,6 +2,7 @@
 #include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
+#include <QtGlobal>
 #include "log_window.hpp"
 
 LogWindow::LogWindow(QWidget *parent): QDialog(parent){
@@ -11,6 +12,12 @@ LogWindow::LogWindow(QWidget *parent): QDialog(parent){
 			| Qt::WindowMinimizeButtonHint
 			| Qt::WindowCloseButtonHint);
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+	ui.terminal->setTabStopWidth(40);
+#else
+	ui.terminal->setTabStopDistance(40);
+#endif
+
 	connect(ui.copyBtn, SIGNAL(clicked()), this, SLOT(copyToClipboard()));
 	connect(ui.saveBtn, SIGNAL(clicked()), this, SLOT(saveToFile()));
 }
diff --git a/gui/QT/window/ultragrid_window.cpp b/gui/QT/window/ultragrid_window.cpp
index 7aff4b6b3..a849bd768 100644
--- a/gui/QT/window/ultragrid_window.cpp
+++ b/gui/QT/window/ultragrid_window.cpp
@@ -380,7 +380,7 @@ void UltragridWindow::processFinished(int code, QProcess::ExitStatus status){
 		msgBox.setText("Ultragrid has exited with an error! If you need help, please send an email "
 				"to ultragrid-dev@cesnet.cz with log attached.");
 		QPushButton *showLogBtn = msgBox.addButton(tr("Show log"), QMessageBox::ActionRole);
-		QPushButton *dissmissBtn = msgBox.addButton(tr("Dismiss"), QMessageBox::RejectRole);
+		msgBox.addButton(tr("Dismiss"), QMessageBox::RejectRole);
 		msgBox.exec();
 
 		if(msgBox.clickedButton() == showLogBtn){