From 958df2ed1b6037b98eb73bb8e063732ba851854f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 4 Dec 2020 11:28:09 +0100
Subject: Cleanup: Clang-Tidy, modernize-deprecated-headers

No functional changes.
---
 source/blender/freestyle/intern/application/Controller.cpp        | 2 +-
 .../freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp  | 2 +-
 source/blender/freestyle/intern/geometry/FitCurve.cpp             | 4 ++--
 source/blender/freestyle/intern/geometry/GeomCleaner.cpp          | 2 +-
 source/blender/freestyle/intern/geometry/Noise.cpp                | 8 ++++----
 source/blender/freestyle/intern/image/GaussianFilter.cpp          | 2 +-
 source/blender/freestyle/intern/scene_graph/NodeCamera.cpp        | 4 ++--
 source/blender/freestyle/intern/stroke/Curve.cpp                  | 2 +-
 source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp       | 2 +-
 source/blender/freestyle/intern/view_map/ViewMap.cpp              | 2 +-
 source/blender/freestyle/intern/view_map/ViewMapIO.cpp            | 2 +-
 source/blender/freestyle/intern/winged_edge/Curvature.cpp         | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'source/blender/freestyle')

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 63612694e65..e24700a57d8 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -22,7 +22,7 @@ extern "C" {
 #include <Python.h>
 }
 
-#include <float.h>
+#include <cfloat>
 #include <fstream>
 #include <string>
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 8aaffd4dde8..f761b1f6243 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -64,7 +64,7 @@
 
 #include "render_types.h"
 
-#include <limits.h>
+#include <climits>
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index 5682ccc9298..66914929960 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -20,9 +20,9 @@
  * \brief from "Graphics Gems", Academic Press, 1990
  */
 
+#include <cmath>
+#include <cstdio>
 #include <cstdlib>  // for malloc and free
-#include <math.h>
-#include <stdio.h>
 
 #include "FitCurve.h"
 
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
index b1d0a6c7e2a..6a499c07061 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
@@ -29,9 +29,9 @@
 #  endif
 #endif
 
+#include <cstdio>
 #include <list>
 #include <map>
-#include <stdio.h>
 
 #include "GeomCleaner.h"
 
diff --git a/source/blender/freestyle/intern/geometry/Noise.cpp b/source/blender/freestyle/intern/geometry/Noise.cpp
index 7c42c332370..e3ea2ac154f 100644
--- a/source/blender/freestyle/intern/geometry/Noise.cpp
+++ b/source/blender/freestyle/intern/geometry/Noise.cpp
@@ -19,10 +19,10 @@
  * \brief Class to define Perlin noise
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 
 #include "BLI_compiler_attrs.h"
 #include "BLI_rand.h"
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp
index 3bbe86ee986..3c8bf5bd3a1 100644
--- a/source/blender/freestyle/intern/image/GaussianFilter.cpp
+++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp
@@ -19,7 +19,7 @@
  * \brief Class to perform gaussian filtering operations on an image
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "GaussianFilter.h"
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index 052ae73da43..4fc1f227172 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
@@ -19,8 +19,8 @@
  * \brief Class to represent a light node
  */
 
-#include <math.h>
-#include <string.h>  // for memcpy
+#include <cmath>
+#include <cstring>  // for memcpy
 
 #include "NodeCamera.h"
 
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index c3dac81477d..768e9efa15d 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -19,7 +19,7 @@
  * \brief Class to define a container for curves
  */
 
-#include <stdio.h> /* printf */
+#include <cstdio> /* printf */
 
 #include "Curve.h"
 #include "CurveAdvancedIterators.h"
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 7e8937bfe80..9bf00ed7092 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -19,7 +19,7 @@
  * \brief Detects/flags/builds extended features edges on the WXEdge structure
  */
 
-#include <float.h>
+#include <cfloat>
 
 #include "FEdgeXDetector.h"
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 60d0e45b9fb..d304c3616d7 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -19,7 +19,7 @@
  * \brief Classes to define a View Map (ViewVertex, ViewEdge, etc.)
  */
 
-#include <float.h>
+#include <cfloat>
 
 #include "ViewMap.h"
 #include "ViewMapAdvancedIterators.h"
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index aed5d6b5adc..774751a2589 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -19,7 +19,7 @@
  * \brief Functions to manage I/O for the view map
  */
 
-#include <limits.h>
+#include <climits>
 
 #include "ViewMapIO.h"
 
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index 1702a22c678..0ee491a071c 100644
--- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
@@ -33,7 +33,7 @@
  * \brief OGF/Graphite: Geometry and Graphics Programming Library + Utilities
  */
 
-#include <assert.h>
+#include <cassert>
 #include <cstdlib>  // for malloc and free
 #include <set>
 #include <stack>
-- 
cgit v1.2.3