From 36e839ed5d7a9af36385217a3e28cff21e6ca658 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 15 Nov 2019 09:51:31 +0200
Subject: [PATCH] Move to top and include qt_windows.h.

--HG--
branch : develop
---
 src/app/valentina/options.h | 15 +++++----------
 src/libs/ifc/ifcdef.h       | 12 ++++++------
 src/libs/vmisc/def.h        |  9 +++++----
 src/libs/vmisc/vlockguard.h |  8 +++++---
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/app/valentina/options.h b/src/app/valentina/options.h
index 65f4a680b..0867b0279 100644
--- a/src/app/valentina/options.h
+++ b/src/app/valentina/options.h
@@ -29,21 +29,16 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include <QtGlobal>
+#ifdef Q_OS_WIN
+#  include <qt_windows.h>
+#endif /*Q_OS_WIN*/
+
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vgeometrydef.h"
 #include "../qmuparser/qmudef.h"
 #include "../vmisc/def.h"
 
-#ifdef Q_OS_WIN32
-#   if defined( Q_CC_MSVC )        // MSVC USED
-#       ifndef NOMINMAX
-#           define NOMINMAX        // DISABLE min/max MACROS
-#       endif
-#   endif /*Q_CC_MSVC*/
-#   include <windows.h>
-
-#endif /*Q_OS_WIN32*/
-
 enum class Contour : char { OpenContour, CloseContour };
 
 #endif // OPTIONS_H
diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h
index 11f02a127..b4c7542ec 100644
--- a/src/libs/ifc/ifcdef.h
+++ b/src/libs/ifc/ifcdef.h
@@ -29,9 +29,14 @@
 #ifndef IFCDEF_H
 #define IFCDEF_H
 
+#include <QtGlobal>
+#ifdef Q_OS_WIN
+   extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
+#  include <qt_windows.h>
+#endif /*Q_OS_WIN*/
+
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 #include "../vmisc/typedef.h"
 #include "../vmisc/def.h"
@@ -40,11 +45,6 @@
 extern const QString CustomMSign;
 extern const QString CustomIncrSign;
 
-#ifdef Q_OS_WIN32
-    extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
-    #include <windows.h>
-#endif /*Q_OS_WIN32*/
-
 // Detect whether the compiler supports C++11 noexcept exception specifications.
 #  if   defined(__clang__)
 #    if __has_feature(cxx_noexcept)
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 99e460409..44400d76e 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -29,18 +29,19 @@
 #ifndef DEF_H
 #define DEF_H
 
+#include <QtGlobal>
+#ifdef Q_OS_WIN
+#  include <qt_windows.h>
+#endif /*Q_OS_WIN*/
+
 #include <qcompilerdetection.h>
 #include <QPrinter>
 #include <QString>
 #include <QStringList>
 #include <Qt>
-#include <QtGlobal>
 #include <csignal>
 #include <QMargins>
 #include <QLineF>
-#ifdef Q_OS_WIN
-    #include <windows.h>
-#endif /* Q_OS_WIN */
 
 #include "literals.h"
 #include "debugbreak.h"
diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h
index 717d938f5..a02c08e83 100644
--- a/src/libs/vmisc/vlockguard.h
+++ b/src/libs/vmisc/vlockguard.h
@@ -30,6 +30,11 @@
 #ifndef VLOCKGUARD_H
 #define VLOCKGUARD_H
 
+#include <QtGlobal>
+#ifdef Q_OS_WIN
+#  include <qt_windows.h>
+#endif /*Q_OS_WIN*/
+
 #include <QString>
 #include <stdint.h>
 
@@ -38,9 +43,6 @@
 #include <QFileInfo>
 #include <QLockFile>
 #include <QSharedPointer>
-#if defined(Q_OS_WIN)
-#include <windows.h>
-#endif
 
 /*@brief
  * This class creates Guarded object if and only if lock file taken. It keeps shared_ptr to object and lock-file.