From c1c14a6817625e5bde485ff4a3ba6cf4f1e97cb1 Mon Sep 17 00:00:00 2001
From: Benjamin Nauck <benjamin@nauck.se>
Date: Thu, 27 Mar 2025 19:00:50 +0100
Subject: [PATCH] Import: Use std::numeric_limits and std::numbers instead of
 defines

---
 src/Mod/Import/App/AppImportPy.cpp        | 1 -
 src/Mod/Import/App/ExportOCAF.cpp         | 1 -
 src/Mod/Import/App/ExportOCAF.h           | 1 -
 src/Mod/Import/App/ImportOCAF.cpp         | 1 -
 src/Mod/Import/App/ImportOCAF.h           | 1 -
 src/Mod/Import/App/ImportOCAF2.h          | 1 -
 src/Mod/Import/App/ImportOCAFAssembly.cpp | 1 -
 src/Mod/Import/App/ImportOCAFAssembly.h   | 1 -
 src/Mod/Import/App/Tools.h                | 4 ++--
 src/Mod/Import/App/dxf/ImpExpDxf.cpp      | 8 ++++----
 src/Mod/Import/App/dxf/dxf.cpp            | 8 +++-----
 src/Mod/Import/Gui/AppImportGuiPy.cpp     | 1 -
 12 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index 31fd806866..7aa936f1c2 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -27,7 +27,6 @@
 #ifndef _PreComp_
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/range/adaptor/indexed.hpp>
-#include <climits>
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wextra-semi"
diff --git a/src/Mod/Import/App/ExportOCAF.cpp b/src/Mod/Import/App/ExportOCAF.cpp
index b4b7ad3a14..814140ce64 100644
--- a/src/Mod/Import/App/ExportOCAF.cpp
+++ b/src/Mod/Import/App/ExportOCAF.cpp
@@ -36,7 +36,6 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XCAFDoc_Location.hxx>
-#include <climits>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>  // for Precision::Confusion()
diff --git a/src/Mod/Import/App/ExportOCAF.h b/src/Mod/Import/App/ExportOCAF.h
index 847b437cda..d74ab481d9 100644
--- a/src/Mod/Import/App/ExportOCAF.h
+++ b/src/Mod/Import/App/ExportOCAF.h
@@ -23,7 +23,6 @@
 #ifndef IMPORT_EXPORTOCAF_H
 #define IMPORT_EXPORTOCAF_H
 
-#include <climits>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp
index 0d155d5201..89d40ec7d7 100644
--- a/src/Mod/Import/App/ImportOCAF.cpp
+++ b/src/Mod/Import/App/ImportOCAF.cpp
@@ -42,7 +42,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XCAFDoc_Location.hxx>
-#include <climits>
 #include <gp_Pln.hxx>  // for Precision::Confusion()
 #include <gp_Trsf.hxx>
 #endif
diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h
index 18ae55312a..239cdc9787 100644
--- a/src/Mod/Import/App/ImportOCAF.h
+++ b/src/Mod/Import/App/ImportOCAF.h
@@ -23,7 +23,6 @@
 #ifndef IMPORT_IMPORTOCAF_H
 #define IMPORT_IMPORTOCAF_H
 
-#include <climits>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h
index a850e3d583..fd264eb6d5 100644
--- a/src/Mod/Import/App/ImportOCAF2.h
+++ b/src/Mod/Import/App/ImportOCAF2.h
@@ -23,7 +23,6 @@
 #ifndef IMPORT_IMPORTOCAF2_H
 #define IMPORT_IMPORTOCAF2_H
 
-#include <climits>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/Mod/Import/App/ImportOCAFAssembly.cpp b/src/Mod/Import/App/ImportOCAFAssembly.cpp
index 4d60e779aa..3a904ce589 100644
--- a/src/Mod/Import/App/ImportOCAFAssembly.cpp
+++ b/src/Mod/Import/App/ImportOCAFAssembly.cpp
@@ -37,7 +37,6 @@
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XCAFDoc_Location.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
-#include <climits>
 #include <sstream>
 #endif
 
diff --git a/src/Mod/Import/App/ImportOCAFAssembly.h b/src/Mod/Import/App/ImportOCAFAssembly.h
index ee18ab30a2..dad46e8cba 100644
--- a/src/Mod/Import/App/ImportOCAFAssembly.h
+++ b/src/Mod/Import/App/ImportOCAFAssembly.h
@@ -23,7 +23,6 @@
 #ifndef IMPORT_ImportOCAFAssembly_H
 #define IMPORT_ImportOCAFAssembly_H
 
-#include <climits>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/Mod/Import/App/Tools.h b/src/Mod/Import/App/Tools.h
index 9d99cf5dae..56b704e010 100644
--- a/src/Mod/Import/App/Tools.h
+++ b/src/Mod/Import/App/Tools.h
@@ -41,7 +41,7 @@ struct ShapeHasher
 #if OCC_VERSION_HEX >= 0x070800
         return std::hash<TopoDS_Shape> {}(shape);
 #else
-        return shape.HashCode(INT_MAX);
+        return shape.HashCode(std::numeric_limits<int>::max());
 #endif
     }
 };
@@ -53,7 +53,7 @@ struct LabelHasher
 #if OCC_VERSION_HEX >= 0x070800
         return std::hash<TDF_Label> {}(label);
 #else
-        return TDF_LabelMapHasher::HashCode(label, INT_MAX);
+        return TDF_LabelMapHasher::HashCode(label, std::numeric_limits<int>::max());
 #endif
     }
 };
diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.cpp b/src/Mod/Import/App/dxf/ImpExpDxf.cpp
index 13f16b3ece..913d53aae6 100644
--- a/src/Mod/Import/App/dxf/ImpExpDxf.cpp
+++ b/src/Mod/Import/App/dxf/ImpExpDxf.cpp
@@ -977,8 +977,8 @@ void ImpExpDxfWrite::exportEllipse(BRepAdaptor_Curve& c)
     // rotation appears to be the clockwise(?) angle between major & +Y??
     double rotation = xaxis.AngleWithRef(gp_Dir(0, 1, 0), gp_Dir(0, 0, 1));
 
-    // 2*M_PI = 6.28319 is invalid(doesn't display in LibreCAD), but 2PI = 6.28318 is valid!
-    // writeEllipse(center, major, minor, rotation, 0.0, 2 * M_PI, true );
+    // 2*pi = 6.28319 is invalid(doesn't display in LibreCAD), but 2PI = 6.28318 is valid!
+    // writeEllipse(center, major, minor, rotation, 0.0, 2 * std::numbers::pi, true );
     writeEllipse(center, major, minor, rotation, 0.0, 6.28318, true);
 }
 
@@ -1036,8 +1036,8 @@ void ImpExpDxfWrite::exportEllipseArc(BRepAdaptor_Curve& c)
                                      // a > 0 ==> v2 is CCW from v1 (righthanded)?
                                      // a < 0 ==> v2 is CW from v1 (lefthanded)?
 
-    double startAngle = fmod(f, 2.0 * M_PI);  // revolutions
-    double endAngle = fmod(l, 2.0 * M_PI);
+    double startAngle = fmod(f, 2.0 * std::numbers::pi);  // revolutions
+    double endAngle = fmod(l, 2.0 * std::numbers::pi);
     bool endIsCW = (a < 0) ? true : false;  // if !endIsCW swap(start,end)
     // not sure if this is a hack or not. seems to make valid arcs.
     if (!endIsCW) {
diff --git a/src/Mod/Import/App/dxf/dxf.cpp b/src/Mod/Import/App/dxf/dxf.cpp
index 54b40ad234..0799e021ba 100644
--- a/src/Mod/Import/App/dxf/dxf.cpp
+++ b/src/Mod/Import/App/dxf/dxf.cpp
@@ -5,8 +5,6 @@
 
 #include "PreCompiled.h"
 
-// required by windows for M_PI definition
-#define _USE_MATH_DEFINES
 #include <cmath>
 #include <fstream>
 #include <iomanip>
@@ -1584,10 +1582,10 @@ void CDxfWrite::writeAngularDimBlock(const double* textMidPoint,
     double span = fabs(endAngle - startAngle);
     double offset = span * 0.10;
     if (startAngle < 0) {
-        startAngle += 2 * M_PI;
+        startAngle += 2 * std::numbers::pi;
     }
     if (endAngle < 0) {
-        endAngle += 2 * M_PI;
+        endAngle += 2 * std::numbers::pi;
     }
     Base::Vector3d startOff(cos(startAngle + offset), sin(startAngle + offset), 0.0);
     Base::Vector3d endOff(cos(endAngle - offset), sin(endAngle - offset), 0.0);
@@ -2130,7 +2128,7 @@ bool CDxfRead::ReadEllipse()
     Base::Vector3d majorAxisEnd;  //  relative to centre
     double eccentricity = 0;
     double startAngleRadians = 0;
-    double endAngleRadians = 2 * M_PI;
+    double endAngleRadians = 2 * std::numbers::pi;
 
     Setup3DVectorAttribute(ePrimaryPoint, centre);
     Setup3DVectorAttribute(ePoint2, majorAxisEnd);
diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp
index 246a1dafb2..2a6143c21e 100644
--- a/src/Mod/Import/Gui/AppImportGuiPy.cpp
+++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp
@@ -25,7 +25,6 @@
 #define WNT  // avoid conflict with GUID
 #endif
 #ifndef _PreComp_
-#include <climits>
 #include <iostream>
 
 #include <QString>