From be6a71b29c2d6837f5efbabbada459d1b1abbae9 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 30 Jun 2020 15:52:51 +0200
Subject: fix warnings

---
 filter-hamilton/hamilton-tools.cpp        | 2 --
 gui/correlation-calibrator.ui             | 2 +-
 gui/process_detector.cpp                  | 4 ++++
 qxt-mini/qxtglobalshortcut.cpp            | 4 ++++
 tracker-hatire/ftnoir_hatcontrols.ui      | 2 +-
 tracker-linux-joystick/linux_joystick.cpp | 2 +-
 tracker-s2bot/ftnoir_tracker_s2bot.cpp    | 4 ++++
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/filter-hamilton/hamilton-tools.cpp b/filter-hamilton/hamilton-tools.cpp
index 4f9ad046..e18082a8 100644
--- a/filter-hamilton/hamilton-tools.cpp
+++ b/filter-hamilton/hamilton-tools.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "hamilton-tools.h"
 #include <cmath>
 
diff --git a/gui/correlation-calibrator.ui b/gui/correlation-calibrator.ui
index d351d5da..02fdf1d2 100644
--- a/gui/correlation-calibrator.ui
+++ b/gui/correlation-calibrator.ui
@@ -40,7 +40,7 @@ Press &quot;clear calibration&quot; to remove any calibration data pertaining to
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+      <enum>QAbstractScrollArea::AdjustToContents</enum>
      </property>
      <property name="autoScroll">
       <bool>true</bool>
diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp
index 40737114..58ea4ca9 100644
--- a/gui/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -56,6 +56,10 @@ void proc_detector_settings::set_is_enabled(bool enabled)
     });
 }
 
+#ifdef __GNUG__
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 QHash<QString, QString> proc_detector_settings::split_process_names()
 {
     QString str = get_game_list();
diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp
index 3cb0a93e..52758f71 100644
--- a/qxt-mini/qxtglobalshortcut.cpp
+++ b/qxt-mini/qxtglobalshortcut.cpp
@@ -36,6 +36,10 @@
 #include <QtDebug>
 #include <QtGlobal>
 
+#ifdef __GNUG__
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> QxtGlobalShortcutPrivate::shortcuts;
 
 void QxtGlobalShortcutPrivate::event_filter_installer::ensure_event_filter()
diff --git a/tracker-hatire/ftnoir_hatcontrols.ui b/tracker-hatire/ftnoir_hatcontrols.ui
index aa84758b..ca4cefbc 100644
--- a/tracker-hatire/ftnoir_hatcontrols.ui
+++ b/tracker-hatire/ftnoir_hatcontrols.ui
@@ -103,7 +103,7 @@
              <bool>false</bool>
             </property>
             <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+             <enum>QComboBox::AdjustToContents</enum>
             </property>
             <property name="modelColumn">
              <number>0</number>
diff --git a/tracker-linux-joystick/linux_joystick.cpp b/tracker-linux-joystick/linux_joystick.cpp
index 3369a29e..49718b52 100644
--- a/tracker-linux-joystick/linux_joystick.cpp
+++ b/tracker-linux-joystick/linux_joystick.cpp
@@ -61,5 +61,5 @@ QString getJoystickDevice(QString guid) {
         if (device_id == guid) return js_dev;
     }
 
-    return NULL;
+    return {};
 }
diff --git a/tracker-s2bot/ftnoir_tracker_s2bot.cpp b/tracker-s2bot/ftnoir_tracker_s2bot.cpp
index c1cb7d9b..c9d684aa 100644
--- a/tracker-s2bot/ftnoir_tracker_s2bot.cpp
+++ b/tracker-s2bot/ftnoir_tracker_s2bot.cpp
@@ -27,6 +27,10 @@ static constexpr int add_cbx[] =
     -180,
 };
 
+#ifdef __GNUG__
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 void tracker_s2bot::run() {
     int freq = s.freq;
     if (freq <= 0)
-- 
cgit v1.2.3