From 789dec822fabdc2ca3ce27ce03844b1c8e5519df Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 11 Jan 2022 17:58:23 +0100
Subject: boring crap

---
 .clang-tidy               | 1 +
 cmake/msvc.cmake          | 1 +
 compat/macros1.h          | 5 +++++
 gui/init.cpp              | 1 -
 opentrack/main-window.cpp | 1 +
 opentrack/main-window.hpp | 5 -----
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index ff78331a..d0de3abe 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: '
 -bugprone-easily-swappable-parameters,
 -bugprone-narrowing-conversions,
 -cert-dcl54-cpp,
+-cert-dcl58-cpp,
 -cert-err34-c,
 -cert-err58-cpp,
 -cert-flp30-c,
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 47bbbe49..0ad0ab23 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -72,6 +72,7 @@ set(_CFLAGS_DEBUG "-guard:cf -MTd -Gs0 -RTCs")
 set(_CXXFLAGS_RELEASE "${_CFLAGS_RELEASE}")
 set(_CXXFLAGS_DEBUG "${_CFLAGS_DEBUG}")
 
+set(_LDFLAGS "")
 set(_LDFLAGS_RELEASE "-OPT:REF -OPT:ICF=10 -LTCG:INCREMENTAL -DEBUG:FULL")
 set(_LDFLAGS_DEBUG "-DEBUG:FULL")
 
diff --git a/compat/macros1.h b/compat/macros1.h
index 8c3916d0..5325d055 100644
--- a/compat/macros1.h
+++ b/compat/macros1.h
@@ -46,3 +46,8 @@
     type& operator=(const type&) = delete;  \
     type& operator=(type&&) = delete
 #endif
+
+#ifdef _MSC_VER
+#   define strncasecmp _strnicmp
+#   define strcasecmp _stricmp
+#endif
diff --git a/gui/init.cpp b/gui/init.cpp
index a67bb75a..b54a085e 100644
--- a/gui/init.cpp
+++ b/gui/init.cpp
@@ -21,7 +21,6 @@ using namespace options;
 #include <QStyleFactory>
 #include <QLocale>
 #include <QTranslator>
-#include <QApplication>
 #include <QDir>
 #include <QFile>
 #include <QFileDialog>
diff --git a/opentrack/main-window.cpp b/opentrack/main-window.cpp
index a4db3430..f1aba019 100644
--- a/opentrack/main-window.cpp
+++ b/opentrack/main-window.cpp
@@ -24,6 +24,7 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QDir>
+#include <QApplication>
 
 extern "C" const char* const opentrack_version;
 
diff --git a/opentrack/main-window.hpp b/opentrack/main-window.hpp
index 0314c582..c33d8241 100644
--- a/opentrack/main-window.hpp
+++ b/opentrack/main-window.hpp
@@ -20,21 +20,16 @@
 #include "options/options.hpp"
 #include "compat/qt-signal.hpp"
 
-#include <QApplication>
 #include <QMainWindow>
 #include <QKeySequence>
 #include <QShortcut>
-#include <QPixmap>
 #include <QTimer>
 #include <QSystemTrayIcon>
 #include <QString>
 #include <QMenu>
 #include <QAction>
-#include <QEvent>
-#include <QCloseEvent>
 #include <QList>
 
-#include <tuple>
 #include <memory>
 
 #include "ui_main-window.h"
-- 
cgit v1.2.3