From 5f5b7e41fa3b78b08d4c4d06da114b1cfb713213 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 11 Dec 2018 22:27:55 +0200
Subject: [PATCH] Enable alternative operator representations for support old
 or nonconforming compilers by default.

--HG--
branch : develop
---
 src/app/valentina/dialogs/dialogdatetimeformats.cpp | 5 +----
 src/app/valentina/dialogs/dialogknownmaterials.cpp  | 5 +----
 src/libs/qmuparser/qmudef.h                         | 4 +---
 src/libs/qmuparser/qmuparserdef.h                   | 5 +----
 src/libs/vdxf/dxfdef.h                              | 5 +----
 src/libs/vdxf/libdxfrw/drw_base.h                   | 5 +----
 src/libs/vdxf/libdxfrw/libdxfrw.h                   | 5 +----
 src/libs/vlayout/vlayoutdef.h                       | 4 +---
 src/libs/vmisc/def.h                                | 4 +---
 src/libs/vobj/vobjengine.cpp                        | 4 +---
 src/libs/vtest/abstracttest.h                       | 2 --
 src/test/TranslationsTest/tst_abstracttranslation.h | 3 ---
 src/test/ValentinaTest/tst_vcommandline.cpp         | 4 +---
 src/test/ValentinaTest/tst_vlockguard.cpp           | 5 +----
 14 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/src/app/valentina/dialogs/dialogdatetimeformats.cpp b/src/app/valentina/dialogs/dialogdatetimeformats.cpp
index 2e44ac1da..a51936d80 100644
--- a/src/app/valentina/dialogs/dialogdatetimeformats.cpp
+++ b/src/app/valentina/dialogs/dialogdatetimeformats.cpp
@@ -28,10 +28,7 @@
 
 #include "dialogdatetimeformats.h"
 #include "ui_dialogdatetimeformats.h"
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogDateTimeFormats::DialogDateTimeFormats(const QDate &date, const QStringList &predefinedFormats,
diff --git a/src/app/valentina/dialogs/dialogknownmaterials.cpp b/src/app/valentina/dialogs/dialogknownmaterials.cpp
index f162363d6..5a29346cc 100644
--- a/src/app/valentina/dialogs/dialogknownmaterials.cpp
+++ b/src/app/valentina/dialogs/dialogknownmaterials.cpp
@@ -28,10 +28,7 @@
 
 #include "dialogknownmaterials.h"
 #include "ui_dialogknownmaterials.h"
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogKnownMaterials::DialogKnownMaterials(QWidget *parent)
diff --git a/src/libs/qmuparser/qmudef.h b/src/libs/qmuparser/qmudef.h
index cbe2ba56c..b4be70e8e 100644
--- a/src/libs/qmuparser/qmudef.h
+++ b/src/libs/qmuparser/qmudef.h
@@ -85,9 +85,7 @@
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Wattributes")
 
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 class QLocale;
 class QChar;
diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h
index 68bef7a74..ed5f29468 100644
--- a/src/libs/qmuparser/qmuparserdef.h
+++ b/src/libs/qmuparser/qmuparserdef.h
@@ -25,10 +25,7 @@
 #include <QMap>
 #include <QString>
 #include <locale>
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 #include "qmuparserfixes.h"
 
diff --git a/src/libs/vdxf/dxfdef.h b/src/libs/vdxf/dxfdef.h
index 506649b0b..6ea5c72eb 100644
--- a/src/libs/vdxf/dxfdef.h
+++ b/src/libs/vdxf/dxfdef.h
@@ -30,10 +30,7 @@
 #define DXFDEF_H
 
 #include <QtGlobal>
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 enum class VarMeasurement : unsigned char { English=0, Metric=1 };
 
diff --git a/src/libs/vdxf/libdxfrw/drw_base.h b/src/libs/vdxf/libdxfrw/drw_base.h
index 870c390b5..5d2a41e06 100644
--- a/src/libs/vdxf/libdxfrw/drw_base.h
+++ b/src/libs/vdxf/libdxfrw/drw_base.h
@@ -19,10 +19,7 @@
 #include <list>
 #include <cmath>
 #include <QtGlobal>
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 #ifdef DRW_ASSERTS
 # define drw_assert(a) assert(a)
diff --git a/src/libs/vdxf/libdxfrw/libdxfrw.h b/src/libs/vdxf/libdxfrw/libdxfrw.h
index 0d0e9ccb8..6e3e17679 100644
--- a/src/libs/vdxf/libdxfrw/libdxfrw.h
+++ b/src/libs/vdxf/libdxfrw/libdxfrw.h
@@ -18,10 +18,7 @@
 #include "drw_objects.h"
 #include "drw_header.h"
 #include "drw_interface.h"
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 class dxfReader;
 class dxfWriter;
diff --git a/src/libs/vlayout/vlayoutdef.h b/src/libs/vlayout/vlayoutdef.h
index 19d1b583e..787452ac7 100644
--- a/src/libs/vlayout/vlayoutdef.h
+++ b/src/libs/vlayout/vlayoutdef.h
@@ -29,9 +29,7 @@
 #ifndef VLAYOUTDEF_H
 #define VLAYOUTDEF_H
 
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 enum class LayoutErrors : char
 {
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 2247993c6..1cfffe0d9 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -46,9 +46,7 @@
 
 template <class T> class QSharedPointer;
 
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 class QComboBox;
 class QMarginsF;
diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp
index 3371ee77c..50f4f0cf2 100644
--- a/src/libs/vobj/vobjengine.cpp
+++ b/src/libs/vobj/vobjengine.cpp
@@ -52,9 +52,7 @@ class QPointF;
 class QPolygonF;
 class QRectF;
 
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 //---------------------------------------------------------------------------------------------------------------------
 static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures()
diff --git a/src/libs/vtest/abstracttest.h b/src/libs/vtest/abstracttest.h
index 751a0ae44..08f43a619 100644
--- a/src/libs/vtest/abstracttest.h
+++ b/src/libs/vtest/abstracttest.h
@@ -35,9 +35,7 @@
 
 template <class T> class QVector;
 
-#ifdef Q_CC_MSVC
 #include <ciso646>
-#endif /* Q_CC_MSVC */
 
 #ifdef __GNUC__
 #define V_UNUSED __attribute__ ((unused))
diff --git a/src/test/TranslationsTest/tst_abstracttranslation.h b/src/test/TranslationsTest/tst_abstracttranslation.h
index 7ca55830c..5f7e206a4 100644
--- a/src/test/TranslationsTest/tst_abstracttranslation.h
+++ b/src/test/TranslationsTest/tst_abstracttranslation.h
@@ -32,10 +32,7 @@
 #include <QFile>
 #include <QSharedPointer>
 #include <QDomDocument>
-
-#ifdef Q_CC_MSVC
 #include <ciso646>
-#endif /* Q_CC_MSVC */
 
 class TST_AbstractTranslation : public QObject
 {
diff --git a/src/test/ValentinaTest/tst_vcommandline.cpp b/src/test/ValentinaTest/tst_vcommandline.cpp
index 3f7a995e3..99022a276 100644
--- a/src/test/ValentinaTest/tst_vcommandline.cpp
+++ b/src/test/ValentinaTest/tst_vcommandline.cpp
@@ -31,10 +31,8 @@
 #include "../vmisc/logging.h"
 
 #include <QtTest>
+#include <ciso646>
 
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
 //---------------------------------------------------------------------------------------------------------------------
 TST_VCommandLine::TST_VCommandLine(QObject *parent)
     :QObject(parent)
diff --git a/src/test/ValentinaTest/tst_vlockguard.cpp b/src/test/ValentinaTest/tst_vlockguard.cpp
index 362f88dba..98efacc5b 100644
--- a/src/test/ValentinaTest/tst_vlockguard.cpp
+++ b/src/test/ValentinaTest/tst_vlockguard.cpp
@@ -30,10 +30,7 @@
 #include "../vmisc/vlockguard.h"
 
 #include <QtTest>
-
-#ifdef Q_CC_MSVC
-    #include <ciso646>
-#endif /* Q_CC_MSVC */
+#include <ciso646>
 
 //---------------------------------------------------------------------------------------------------------------------
 TST_VLockGuard::TST_VLockGuard(QObject *parent)