From 849ef9927ce6464eb4782f8bc78a35e511a2c2a9 Mon Sep 17 00:00:00 2001
From: Sean McBride <sean@rogue-research.com>
Date: Tue, 26 Jan 2016 08:27:09 -0500
Subject: [PATCH] Rename #includes to C++ style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Find/replace of:
with C++ counterparts. Changed only vtk*.cxx files.
Didn’t touch .h or .c or any 3rd party.
---
CMake/vtkRequireLargeFilesSupport.cxx | 2 +-
CMake/vtkTestSocklenT.cxx | 2 +-
CMake/vtkTestSyncBuiltins.cxx | 2 +-
Charts/Core/vtkColorTransferFunctionItem.cxx | 2 +-
.../ComputationalGeometry/vtkParametricEllipsoid.cxx | 2 +-
.../vtkParametricSuperEllipsoid.cxx | 2 +-
.../ComputationalGeometry/vtkParametricSuperToroid.cxx | 2 +-
Common/Core/vtkCollection.cxx | 4 ++--
Common/Core/vtkObjectFactory.cxx | 2 +-
Common/Core/vtkOldStyleCallbackCommand.cxx | 4 ++--
Common/Core/vtkScalarsToColors.cxx | 2 +-
Common/DataModel/vtkBoundingBox.cxx | 2 +-
Common/DataModel/vtkCellLocator.cxx | 2 +-
Common/DataModel/vtkDataSet.cxx | 2 +-
Common/DataModel/vtkImplicitBoolean.cxx | 2 +-
Common/DataModel/vtkImplicitSum.cxx | 2 +-
Common/DataModel/vtkPerlinNoise.cxx | 2 +-
Common/DataModel/vtkPlanes.cxx | 2 +-
Common/DataModel/vtkStructuredPoints.cxx | 2 +-
Common/DataModel/vtkSuperquadric.cxx | 2 +-
Common/DataModel/vtkXMLDataElement.cxx | 2 +-
Common/ExecutionModel/vtkImageToStructuredPoints.cxx | 2 +-
Common/Math/vtkMatrix3x3.cxx | 2 +-
Common/Math/vtkMatrix4x4.cxx | 2 +-
Common/Misc/vtkErrorCode.cxx | 4 ++--
Common/Misc/vtkFunctionParser.cxx | 2 +-
Common/System/vtkDirectory.cxx | 6 +++---
Common/System/vtkSocket.cxx | 4 ++--
Filters/Core/vtkAssignAttribute.cxx | 2 +-
Filters/Core/vtkClipPolyData.cxx | 2 +-
Filters/Core/vtkCompositeCutter.cxx | 2 +-
Filters/Core/vtkContourFilter.cxx | 2 +-
Filters/Core/vtkContourGrid.cxx | 2 +-
Filters/Core/vtkCutter.cxx | 2 +-
Filters/Core/vtkFlyingEdges2D.cxx | 2 +-
Filters/Core/vtkFlyingEdges3D.cxx | 2 +-
Filters/Core/vtkFlyingEdgesPlaneCutter.cxx | 2 +-
Filters/Core/vtkGridSynchronizedTemplates3D.cxx | 2 +-
Filters/Core/vtkMarchingSquares.cxx | 2 +-
Filters/Core/vtkMaskFields.cxx | 2 +-
Filters/Core/vtkRearrangeFields.cxx | 2 +-
Filters/Core/vtkRectilinearSynchronizedTemplates.cxx | 2 +-
Filters/Core/vtkSynchronizedTemplates2D.cxx | 2 +-
Filters/Core/vtkSynchronizedTemplates3D.cxx | 2 +-
Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx | 2 +-
Filters/Core/vtkVectorNorm.cxx | 2 +-
Filters/General/vtkBoxClipDataSet.cxx | 2 +-
Filters/General/vtkCellDerivatives.cxx | 2 +-
Filters/General/vtkClipDataSet.cxx | 2 +-
Filters/General/vtkCursor2D.cxx | 2 +-
Filters/General/vtkCursor3D.cxx | 2 +-
Filters/General/vtkImageMarchingCubes.cxx | 2 +-
Filters/General/vtkMarchingContourFilter.cxx | 2 +-
Filters/General/vtkMultiThreshold.cxx | 2 +-
Filters/General/vtkSplitField.cxx | 2 +-
Filters/General/vtkYoungsMaterialInterface.cxx | 2 +-
Filters/Generic/vtkGenericClip.cxx | 2 +-
Filters/Generic/vtkGenericCutter.cxx | 2 +-
Filters/Hybrid/vtkBSplineTransform.cxx | 2 +-
Filters/Hybrid/vtkDSPFilterGroup.cxx | 2 +-
Filters/Hybrid/vtkEarthSource.cxx | 2 +-
Filters/Hybrid/vtkGridTransform.cxx | 2 +-
Filters/Hybrid/vtkImplicitModeller.cxx | 2 +-
Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx | 2 +-
Filters/HyperTree/vtkClipHyperOctree.cxx | 2 +-
Filters/HyperTree/vtkHyperOctreeContourFilter.cxx | 2 +-
Filters/HyperTree/vtkHyperOctreeCutter.cxx | 2 +-
.../HyperTree/vtkHyperOctreeDualGridContourFilter.cxx | 2 +-
Filters/Modeling/vtkBandedPolyDataContourFilter.cxx | 2 +-
Filters/Modeling/vtkSpherePuzzle.cxx | 2 +-
Filters/Modeling/vtkSpherePuzzleArrows.cxx | 2 +-
Filters/Parallel/vtkExtractCTHPart.cxx | 2 +-
Filters/Parallel/vtkPSphereSource.cxx | 2 +-
Filters/SMP/vtkSMPContourGrid.cxx | 2 +-
Filters/SMP/vtkSMPContourGridManyPieces.cxx | 2 +-
Filters/SMP/vtkSMPTransform.cxx | 2 +-
Filters/SMP/vtkThreadedSynchronizedTemplates3D.cxx | 2 +-
.../SMP/vtkThreadedSynchronizedTemplatesCutter3D.cxx | 2 +-
Filters/Sources/vtkArcSource.cxx | 2 +-
Filters/Sources/vtkConeSource.cxx | 2 +-
Filters/Sources/vtkCubeSource.cxx | 2 +-
Filters/Sources/vtkCylinderSource.cxx | 2 +-
Filters/Sources/vtkLineSource.cxx | 2 +-
Filters/Sources/vtkParametricFunctionSource.cxx | 2 +-
Filters/Sources/vtkPointSource.cxx | 4 ++--
Filters/Sources/vtkSphereSource.cxx | 2 +-
Filters/Sources/vtkSuperquadricSource.cxx | 2 +-
Filters/StatisticsGnuR/vtkRAdapter.cxx | 2 +-
Filters/Texture/vtkTriangularTCoords.cxx | 2 +-
Geovis/Core/vtkGeoCamera.cxx | 2 +-
Geovis/Core/vtkGeoInteractorStyle.cxx | 2 +-
Geovis/Core/vtkGlobeSource.cxx | 2 +-
IO/AMR/vtkAMRFlashReader.cxx | 2 +-
IO/Core/vtkSortFileNames.cxx | 2 +-
IO/EnSight/vtkEnSight6BinaryReader.cxx | 2 +-
IO/EnSight/vtkEnSight6Reader.cxx | 2 +-
IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 2 +-
IO/EnSight/vtkEnSightGoldReader.cxx | 2 +-
IO/EnSight/vtkGenericEnSightReader.cxx | 2 +-
IO/Exodus/vtkExodusIIReader.cxx | 8 ++++----
IO/Exodus/vtkExodusIIReaderVariableCheck.cxx | 2 +-
IO/Exodus/vtkExodusIIWriter.cxx | 2 +-
IO/Geometry/vtkChacoReader.cxx | 4 ++--
IO/Geometry/vtkFLUENTReader.cxx | 2 +-
IO/Geometry/vtkGaussianCubeReader.cxx | 2 +-
IO/Geometry/vtkMoleculeReaderBase.cxx | 2 +-
IO/Geometry/vtkOBJReader.cxx | 2 +-
IO/Geometry/vtkOpenFOAMReader.cxx | 4 ++--
IO/Geometry/vtkProStarReader.cxx | 4 ++--
IO/Geometry/vtkSTLReader.cxx | 2 +-
IO/Geometry/vtkTecplotReader.cxx | 2 +-
IO/Image/vtkImageExport.cxx | 4 ++--
IO/Image/vtkImageImport.cxx | 2 +-
IO/Image/vtkMedicalImageProperties.cxx | 2 +-
IO/Image/vtkNIFTIImageHeader.cxx | 8 ++++----
IO/Image/vtkNIFTIImageReader.cxx | 4 ++--
IO/Image/vtkNIFTIImageWriter.cxx | 8 ++++----
IO/Image/vtkNrrdReader.cxx | 6 +++---
IO/Image/vtkSLCReader.cxx | 2 +-
IO/Import/vtkOBJImporter.cxx | 2 +-
IO/Import/vtkOBJImporterInternals.cxx | 6 +++---
IO/Infovis/vtkDelimitedTextReader.cxx | 2 +-
IO/Infovis/vtkFixedWidthTextReader.cxx | 2 +-
IO/Infovis/vtkTulipReader.cxx | 2 +-
IO/Infovis/vtkXGMLReader.cxx | 2 +-
IO/Legacy/vtkDataReader.cxx | 2 +-
IO/MINC/vtkMINCImageAttributes.cxx | 4 ++--
IO/MINC/vtkMINCImageReader.cxx | 4 ++--
IO/MINC/vtkMINCImageWriter.cxx | 2 +-
IO/MINC/vtkMNIObjectReader.cxx | 2 +-
IO/MINC/vtkMNIObjectWriter.cxx | 4 ++--
IO/MINC/vtkMNITagPointReader.cxx | 2 +-
IO/MINC/vtkMNITagPointWriter.cxx | 4 ++--
IO/MINC/vtkMNITransformReader.cxx | 2 +-
IO/MINC/vtkMNITransformWriter.cxx | 4 ++--
IO/MPIImage/vtkPNrrdReader.cxx | 6 +++---
IO/NetCDF/vtkNetCDFCFReader.cxx | 4 ++--
IO/NetCDF/vtkNetCDFReader.cxx | 2 +-
IO/NetCDF/vtkSLACReader.cxx | 2 +-
IO/ODBC/vtkODBCDatabase.cxx | 2 +-
IO/PLY/vtkPLY.cxx | 2 +-
IO/PLY/vtkPLYReader.cxx | 2 +-
IO/Parallel/vtkEnSightWriter.cxx | 4 ++--
IO/ParallelExodus/vtkPExodusIIReader.cxx | 2 +-
IO/ParallelExodus/vtkPExodusIIWriter.cxx | 2 +-
IO/SQL/vtkRowQuery.cxx | 2 +-
IO/Video/vtkMILVideoSource.cxx | 4 ++--
IO/Video/vtkWin32VideoSource.cxx | 2 +-
IO/XML/vtkXMLWriter.cxx | 2 +-
IO/XMLParser/vtkXMLParser.cxx | 2 +-
IO/Xdmf2/vtkXdmfWriter.cxx | 2 +-
Imaging/Color/vtkImageHSIToRGB.cxx | 2 +-
Imaging/Color/vtkImageLuminance.cxx | 2 +-
Imaging/Color/vtkImageQuantizeRGBToIndex.cxx | 2 +-
Imaging/Color/vtkImageRGBToHSI.cxx | 2 +-
Imaging/Core/vtkImageBSplineInternals.cxx | 2 +-
Imaging/Core/vtkImageDecomposeFilter.cxx | 2 +-
Imaging/Core/vtkImageExtractComponents.cxx | 2 +-
Imaging/Core/vtkImageResize.cxx | 2 +-
Imaging/Core/vtkImageReslice.cxx | 4 ++--
Imaging/Core/vtkImageResliceToColors.cxx | 4 ++--
Imaging/Core/vtkImageShrink3D.cxx | 2 +-
Imaging/Core/vtkImageStencilData.cxx | 2 +-
Imaging/Core/vtkRTAnalyticSource.cxx | 2 +-
Imaging/Fourier/vtkImageButterworthHighPass.cxx | 2 +-
Imaging/Fourier/vtkImageButterworthLowPass.cxx | 2 +-
Imaging/Fourier/vtkImageFFT.cxx | 2 +-
Imaging/Fourier/vtkImageFourierCenter.cxx | 2 +-
Imaging/Fourier/vtkImageFourierFilter.cxx | 2 +-
Imaging/Fourier/vtkImageIdealHighPass.cxx | 2 +-
Imaging/Fourier/vtkImageIdealLowPass.cxx | 2 +-
Imaging/Fourier/vtkImageRFFT.cxx | 2 +-
Imaging/Fourier/vtkTableFFT.cxx | 2 +-
Imaging/General/vtkImageAnisotropicDiffusion2D.cxx | 2 +-
Imaging/General/vtkImageAnisotropicDiffusion3D.cxx | 2 +-
Imaging/General/vtkImageEuclideanDistance.cxx | 2 +-
Imaging/General/vtkImageEuclideanToPolar.cxx | 2 +-
Imaging/General/vtkImageGaussianSmooth.cxx | 2 +-
Imaging/General/vtkImageGradient.cxx | 2 +-
Imaging/General/vtkImageGradientMagnitude.cxx | 2 +-
Imaging/General/vtkImageLaplacian.cxx | 2 +-
Imaging/General/vtkImageNormalize.cxx | 2 +-
Imaging/General/vtkImageSlab.cxx | 2 +-
Imaging/General/vtkImageSobel2D.cxx | 2 +-
Imaging/General/vtkImageSobel3D.cxx | 2 +-
Imaging/General/vtkImageSpatialAlgorithm.cxx | 2 +-
Imaging/Hybrid/vtkCheckerboardSplatter.cxx | 2 +-
Imaging/Hybrid/vtkGaussianSplatter.cxx | 2 +-
Imaging/Hybrid/vtkVoxelModeller.cxx | 2 +-
Imaging/Math/vtkImageDivergence.cxx | 2 +-
Imaging/Math/vtkImageLogarithmicScale.cxx | 2 +-
Imaging/Math/vtkImageLogic.cxx | 2 +-
Imaging/Math/vtkImageMagnitude.cxx | 2 +-
Imaging/Math/vtkImageMaskBits.cxx | 2 +-
Imaging/Math/vtkImageMathematics.cxx | 2 +-
.../Morphological/vtkImageNonMaximumSuppression.cxx | 2 +-
Imaging/Morphological/vtkImageOpenClose3D.cxx | 2 +-
Imaging/Sources/vtkImageCanvasSource2D.cxx | 2 +-
Imaging/Sources/vtkImageGaussianSource.cxx | 2 +-
Imaging/Sources/vtkImageGridSource.cxx | 2 +-
Imaging/Sources/vtkImageSinusoidSource.cxx | 2 +-
Imaging/Statistics/vtkImageAccumulate.cxx | 2 +-
Imaging/Statistics/vtkImageHistogram.cxx | 2 +-
Imaging/Statistics/vtkImageHistogramStatistics.cxx | 2 +-
Imaging/Stencil/vtkImageStencil.cxx | 2 +-
Imaging/Stencil/vtkImageToImageStencil.cxx | 2 +-
Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx | 2 +-
Imaging/Stencil/vtkLassoStencilSource.cxx | 2 +-
Imaging/Stencil/vtkPolyDataToImageStencil.cxx | 2 +-
Imaging/Stencil/vtkROIStencilSource.cxx | 2 +-
Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx | 2 +-
Infovis/Core/vtkTreeFieldAggregator.cxx | 2 +-
.../Layout/vtkCirclePackFrontChainLayoutStrategy.cxx | 2 +-
Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx | 2 +-
Interaction/Widgets/vtkImageOrthoPlanes.cxx | 2 +-
.../Widgets/vtkImplicitCylinderRepresentation.cxx | 2 +-
Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx | 2 +-
Interaction/Widgets/vtkResliceCursor.cxx | 2 +-
.../Widgets/vtkResliceCursorPolyDataAlgorithm.cxx | 2 +-
Rendering/Annotation/vtkAxisFollower.cxx | 2 +-
Rendering/Annotation/vtkProp3DAxisFollower.cxx | 2 +-
Rendering/Annotation/vtkScalarBarActor.cxx | 2 +-
Rendering/Core/vtkActor.cxx | 2 +-
Rendering/Core/vtkCamera.cxx | 2 +-
Rendering/Core/vtkColorTransferFunction.cxx | 2 +-
Rendering/Core/vtkFollower.cxx | 2 +-
Rendering/Core/vtkImageSlice.cxx | 2 +-
Rendering/Core/vtkLODProp3D.cxx | 2 +-
Rendering/Core/vtkLightCollection.cxx | 2 +-
Rendering/Core/vtkLogLookupTable.cxx | 2 +-
Rendering/Core/vtkMapArrayValues.cxx | 2 +-
Rendering/Core/vtkProp3D.cxx | 2 +-
Rendering/Core/vtkProp3DFollower.cxx | 2 +-
Rendering/Core/vtkVolume.cxx | 2 +-
Rendering/Core/vtkWindowLevelLookupTable.cxx | 2 +-
Rendering/External/vtkExternalOpenGLCamera.cxx | 2 +-
Rendering/LOD/vtkLODActor.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLActor.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLCamera.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLExtensionManager.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLLight.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLPolyDataMapper.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLRenderer.cxx | 2 +-
Rendering/OpenGL/vtkOpenGLTexture.cxx | 2 +-
Rendering/OpenGL/vtkWin32OpenGLRenderWindow.cxx | 2 +-
Rendering/OpenGL/vtkWin32RenderWindowInteractor.cxx | 6 +++---
Rendering/OpenGL/vtkXRenderWindowInteractor.cxx | 6 +++---
Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.cxx | 10 +++++-----
Rendering/OpenGL2/vtkDepthImageProcessingPass.cxx | 2 +-
Rendering/OpenGL2/vtkEDLShading.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLActor.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLCamera.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLImageSliceMapper.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLRenderer.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLShaderCache.cxx | 2 +-
Rendering/OpenGL2/vtkOpenGLTexture.cxx | 2 +-
Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx | 2 +-
Rendering/OpenGL2/vtkWin32RenderWindowInteractor.cxx | 8 ++++----
Rendering/OpenGL2/vtkXRenderWindowInteractor.cxx | 8 ++++----
Rendering/Qt/vtkQImageToImageSource.cxx | 2 +-
Rendering/Volume/vtkEncodedGradientEstimator.cxx | 2 +-
Rendering/Volume/vtkEncodedGradientShader.cxx | 2 +-
.../Volume/vtkFiniteDifferenceGradientEstimator.cxx | 2 +-
.../vtkFixedPointVolumeRayCastCompositeGOHelper.cxx | 2 +-
...tkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx | 2 +-
.../vtkFixedPointVolumeRayCastCompositeHelper.cxx | 2 +-
.../vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx | 2 +-
Rendering/Volume/vtkFixedPointVolumeRayCastHelper.cxx | 2 +-
.../Volume/vtkFixedPointVolumeRayCastMIPHelper.cxx | 2 +-
Rendering/Volume/vtkFixedPointVolumeRayCastMapper.cxx | 2 +-
Rendering/Volume/vtkHAVSVolumeMapper.cxx | 2 +-
Rendering/Volume/vtkProjectedTetrahedraMapper.cxx | 2 +-
.../Volume/vtkRecursiveSphereDirectionEncoder.cxx | 2 +-
.../vtkUnstructuredGridHomogeneousRayIntegrator.cxx | 2 +-
.../Volume/vtkUnstructuredGridLinearRayIntegrator.cxx | 2 +-
Rendering/Volume/vtkUnstructuredGridPreIntegration.cxx | 2 +-
.../Volume/vtkUnstructuredGridVolumeRayCastMapper.cxx | 2 +-
.../Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx | 2 +-
Rendering/Volume/vtkVolumeRayCastMapper.cxx | 2 +-
.../Volume/vtkVolumeRayCastSpaceLeapingImageFilter.cxx | 2 +-
.../VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx | 2 +-
.../vtkOpenGLProjectedAAHexahedraMapper.cxx | 2 +-
.../vtkOpenGLRayCastImageDisplayHelper.cxx | 2 +-
.../vtkOpenGLRayCastImageDisplayHelper.cxx | 2 +-
Utilities/EncodeString/vtkEncodeString.cxx | 2 +-
Views/Infovis/vtkRenderedGraphRepresentation.cxx | 2 +-
288 files changed, 339 insertions(+), 339 deletions(-)
diff --git a/CMake/vtkRequireLargeFilesSupport.cxx b/CMake/vtkRequireLargeFilesSupport.cxx
index 3d7c863989..aa32c50735 100644
--- a/CMake/vtkRequireLargeFilesSupport.cxx
+++ b/CMake/vtkRequireLargeFilesSupport.cxx
@@ -4,7 +4,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <cassert>
-#include <stdio.h>
+#include <cstdio>
int main( int, char **argv )
{
diff --git a/CMake/vtkTestSocklenT.cxx b/CMake/vtkTestSocklenT.cxx
index c3ed8faa36..26d0c94113 100644
--- a/CMake/vtkTestSocklenT.cxx
+++ b/CMake/vtkTestSocklenT.cxx
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib>
#if !defined(_WIN32) || defined(__CYGWIN__)
# include <sys/types.h>
diff --git a/CMake/vtkTestSyncBuiltins.cxx b/CMake/vtkTestSyncBuiltins.cxx
index ed6cb2a568..cf16f4e9b7 100644
--- a/CMake/vtkTestSyncBuiltins.cxx
+++ b/CMake/vtkTestSyncBuiltins.cxx
@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib>
int main()
diff --git a/Charts/Core/vtkColorTransferFunctionItem.cxx b/Charts/Core/vtkColorTransferFunctionItem.cxx
index 1b2d427993..b6036a23b1 100644
--- a/Charts/Core/vtkColorTransferFunctionItem.cxx
+++ b/Charts/Core/vtkColorTransferFunctionItem.cxx
@@ -24,7 +24,7 @@
#include "vtkPoints2D.h"
#include <cassert>
-#include <math.h>
+#include <cmath>
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkColorTransferFunctionItem);
diff --git a/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx
index b21e665f5d..560a3b955c 100644
--- a/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx
+++ b/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx
@@ -15,7 +15,7 @@
#include "vtkParametricEllipsoid.h"
#include "vtkObjectFactory.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkParametricEllipsoid);
diff --git a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx
index d2d5a0d462..67060efd69 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx
+++ b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx
@@ -15,7 +15,7 @@
#include "vtkParametricSuperEllipsoid.h"
#include "vtkObjectFactory.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkParametricSuperEllipsoid);
diff --git a/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx b/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx
index f673af5f34..4ff8e13ee3 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx
+++ b/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx
@@ -15,7 +15,7 @@
#include "vtkParametricSuperToroid.h"
#include "vtkObjectFactory.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkParametricSuperToroid);
diff --git a/Common/Core/vtkCollection.cxx b/Common/Core/vtkCollection.cxx
index 7ef7c21ed5..8c56390a8b 100644
--- a/Common/Core/vtkCollection.cxx
+++ b/Common/Core/vtkCollection.cxx
@@ -19,8 +19,8 @@
#include "vtkObjectFactory.h"
#include <cassert>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
vtkStandardNewMacro(vtkCollection);
diff --git a/Common/Core/vtkObjectFactory.cxx b/Common/Core/vtkObjectFactory.cxx
index bf30e5ef2e..36a313e634 100644
--- a/Common/Core/vtkObjectFactory.cxx
+++ b/Common/Core/vtkObjectFactory.cxx
@@ -23,7 +23,7 @@
#include "vtksys/Directory.hxx"
-#include <ctype.h>
+#include <cctype>
vtkObjectFactoryCollection* vtkObjectFactory::RegisteredFactories = 0;
diff --git a/Common/Core/vtkOldStyleCallbackCommand.cxx b/Common/Core/vtkOldStyleCallbackCommand.cxx
index 5904bf8610..8d3544d48b 100644
--- a/Common/Core/vtkOldStyleCallbackCommand.cxx
+++ b/Common/Core/vtkOldStyleCallbackCommand.cxx
@@ -17,8 +17,8 @@
#include "vtkSetGet.h"
#include "vtkObject.h"
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
//----------------------------------------------------------------
vtkOldStyleCallbackCommand::vtkOldStyleCallbackCommand()
diff --git a/Common/Core/vtkScalarsToColors.cxx b/Common/Core/vtkScalarsToColors.cxx
index 54b5e8309f..02a09e66ea 100644
--- a/Common/Core/vtkScalarsToColors.cxx
+++ b/Common/Core/vtkScalarsToColors.cxx
@@ -24,7 +24,7 @@
#include <map>
-#include <math.h>
+#include <cmath>
// A helper map for quick lookups of annotated values.
class vtkScalarsToColors::vtkInternalAnnotatedValueMap :
diff --git a/Common/DataModel/vtkBoundingBox.cxx b/Common/DataModel/vtkBoundingBox.cxx
index 6bd3d8d392..c4653fdf5b 100644
--- a/Common/DataModel/vtkBoundingBox.cxx
+++ b/Common/DataModel/vtkBoundingBox.cxx
@@ -16,7 +16,7 @@
#include "vtkMath.h"
#include "vtkPlane.h"
#include <cassert>
-#include <math.h>
+#include <cmath>
// ---------------------------------------------------------------------------
namespace
diff --git a/Common/DataModel/vtkCellLocator.cxx b/Common/DataModel/vtkCellLocator.cxx
index 3bbcbd27ea..320d436d8a 100644
--- a/Common/DataModel/vtkCellLocator.cxx
+++ b/Common/DataModel/vtkCellLocator.cxx
@@ -21,7 +21,7 @@
#include "vtkPolyData.h"
#include "vtkBox.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCellLocator);
diff --git a/Common/DataModel/vtkDataSet.cxx b/Common/DataModel/vtkDataSet.cxx
index a13181fc66..b19618df6c 100644
--- a/Common/DataModel/vtkDataSet.cxx
+++ b/Common/DataModel/vtkDataSet.cxx
@@ -28,7 +28,7 @@
#include "vtkSmartPointer.h"
#include "vtkStructuredData.h"
-#include <math.h>
+#include <cmath>
//----------------------------------------------------------------------------
diff --git a/Common/DataModel/vtkImplicitBoolean.cxx b/Common/DataModel/vtkImplicitBoolean.cxx
index 1e8c73fc0d..01c50b9015 100644
--- a/Common/DataModel/vtkImplicitBoolean.cxx
+++ b/Common/DataModel/vtkImplicitBoolean.cxx
@@ -17,7 +17,7 @@
#include "vtkImplicitFunctionCollection.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImplicitBoolean);
diff --git a/Common/DataModel/vtkImplicitSum.cxx b/Common/DataModel/vtkImplicitSum.cxx
index fdacb76a9d..6f8ee453b7 100644
--- a/Common/DataModel/vtkImplicitSum.cxx
+++ b/Common/DataModel/vtkImplicitSum.cxx
@@ -18,7 +18,7 @@
#include "vtkImplicitFunctionCollection.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImplicitSum);
diff --git a/Common/DataModel/vtkPerlinNoise.cxx b/Common/DataModel/vtkPerlinNoise.cxx
index 692e5a931c..2891c73d9b 100644
--- a/Common/DataModel/vtkPerlinNoise.cxx
+++ b/Common/DataModel/vtkPerlinNoise.cxx
@@ -14,7 +14,7 @@
=========================================================================*/
#include "vtkPerlinNoise.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
vtkStandardNewMacro(vtkPerlinNoise);
diff --git a/Common/DataModel/vtkPlanes.cxx b/Common/DataModel/vtkPlanes.cxx
index 501d911701..27ed09caf9 100644
--- a/Common/DataModel/vtkPlanes.cxx
+++ b/Common/DataModel/vtkPlanes.cxx
@@ -19,7 +19,7 @@
#include "vtkPlane.h"
#include "vtkPoints.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkPlanes);
vtkCxxSetObjectMacro(vtkPlanes,Points,vtkPoints);
diff --git a/Common/DataModel/vtkStructuredPoints.cxx b/Common/DataModel/vtkStructuredPoints.cxx
index d302afd52f..29cad30d5d 100644
--- a/Common/DataModel/vtkStructuredPoints.cxx
+++ b/Common/DataModel/vtkStructuredPoints.cxx
@@ -15,7 +15,7 @@
#include "vtkStructuredPoints.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkStructuredPoints);
diff --git a/Common/DataModel/vtkSuperquadric.cxx b/Common/DataModel/vtkSuperquadric.cxx
index 663fc88b5b..a7c2ff2f07 100644
--- a/Common/DataModel/vtkSuperquadric.cxx
+++ b/Common/DataModel/vtkSuperquadric.cxx
@@ -22,7 +22,7 @@
#include "vtkSuperquadric.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSuperquadric);
diff --git a/Common/DataModel/vtkXMLDataElement.cxx b/Common/DataModel/vtkXMLDataElement.cxx
index 63a2f4a0a6..f8f27b0dee 100644
--- a/Common/DataModel/vtkXMLDataElement.cxx
+++ b/Common/DataModel/vtkXMLDataElement.cxx
@@ -16,7 +16,7 @@
#include "vtkObjectFactory.h"
-#include <ctype.h>
+#include <cctype>
#include <sstream>
using std::ostringstream;
using std::istringstream;
diff --git a/Common/ExecutionModel/vtkImageToStructuredPoints.cxx b/Common/ExecutionModel/vtkImageToStructuredPoints.cxx
index b41caea931..09770356b9 100644
--- a/Common/ExecutionModel/vtkImageToStructuredPoints.cxx
+++ b/Common/ExecutionModel/vtkImageToStructuredPoints.cxx
@@ -24,7 +24,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkStructuredPoints.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageToStructuredPoints);
diff --git a/Common/Math/vtkMatrix3x3.cxx b/Common/Math/vtkMatrix3x3.cxx
index 72917459af..e4cc4fbe83 100644
--- a/Common/Math/vtkMatrix3x3.cxx
+++ b/Common/Math/vtkMatrix3x3.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include <cstdlib>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkMatrix3x3);
diff --git a/Common/Math/vtkMatrix4x4.cxx b/Common/Math/vtkMatrix4x4.cxx
index c5ac47b2fe..8fd8ab88cc 100644
--- a/Common/Math/vtkMatrix4x4.cxx
+++ b/Common/Math/vtkMatrix4x4.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include <cstdlib>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkMatrix4x4);
diff --git a/Common/Misc/vtkErrorCode.cxx b/Common/Misc/vtkErrorCode.cxx
index a5d000bfd2..c9e7aa61ea 100644
--- a/Common/Misc/vtkErrorCode.cxx
+++ b/Common/Misc/vtkErrorCode.cxx
@@ -14,8 +14,8 @@
=========================================================================*/
#include "vtkErrorCode.h"
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
#include <errno.h>
// this list should only contain the initial, contiguous
diff --git a/Common/Misc/vtkFunctionParser.cxx b/Common/Misc/vtkFunctionParser.cxx
index 9513120a50..48222b1db4 100644
--- a/Common/Misc/vtkFunctionParser.cxx
+++ b/Common/Misc/vtkFunctionParser.cxx
@@ -15,7 +15,7 @@
#include "vtkFunctionParser.h"
#include "vtkObjectFactory.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkFunctionParser);
diff --git a/Common/System/vtkDirectory.cxx b/Common/System/vtkDirectory.cxx
index 9cb0aa86f3..23dfe239a8 100644
--- a/Common/System/vtkDirectory.cxx
+++ b/Common/System/vtkDirectory.cxx
@@ -77,12 +77,12 @@ void vtkDirectory::PrintSelf(ostream& os, vtkIndent indent)
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
#include "vtkWindows.h"
#include <io.h>
-#include <ctype.h>
+#include <cctype>
#include <direct.h>
#include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib>
-#include <string.h>
+#include <cstring>
#include <sys/types.h>
int vtkDirectory::Open(const char* name)
diff --git a/Common/System/vtkSocket.cxx b/Common/System/vtkSocket.cxx
index 2c528757b8..8f67f73fa9 100644
--- a/Common/System/vtkSocket.cxx
+++ b/Common/System/vtkSocket.cxx
@@ -42,8 +42,8 @@
#include <unistd.h>
#include <sys/time.h>
#include <errno.h>
- #include <string.h>
- #include <stdio.h>
+ #include <cstring>
+ #include <cstdio>
#endif
#endif
diff --git a/Filters/Core/vtkAssignAttribute.cxx b/Filters/Core/vtkAssignAttribute.cxx
index 1a496222d6..b8125b1b63 100644
--- a/Filters/Core/vtkAssignAttribute.cxx
+++ b/Filters/Core/vtkAssignAttribute.cxx
@@ -23,7 +23,7 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
-#include <ctype.h>
+#include <cctype>
#include <cassert>
diff --git a/Filters/Core/vtkClipPolyData.cxx b/Filters/Core/vtkClipPolyData.cxx
index 2fb2af4387..f363a33abd 100644
--- a/Filters/Core/vtkClipPolyData.cxx
+++ b/Filters/Core/vtkClipPolyData.cxx
@@ -30,7 +30,7 @@
#include "vtkTriangle.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkClipPolyData);
vtkCxxSetObjectMacro(vtkClipPolyData,ClipFunction,vtkImplicitFunction);
diff --git a/Filters/Core/vtkCompositeCutter.cxx b/Filters/Core/vtkCompositeCutter.cxx
index 643208d146..b2dacb50e6 100644
--- a/Filters/Core/vtkCompositeCutter.cxx
+++ b/Filters/Core/vtkCompositeCutter.cxx
@@ -31,7 +31,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkAppendPolyData.h"
-#include <math.h>
+#include <cmath>
#include "vtkObjectFactory.h"
#include "vtkCompositeDataIterator.h"
#include "vtkSmartPointer.h"
diff --git a/Filters/Core/vtkContourFilter.cxx b/Filters/Core/vtkContourFilter.cxx
index 9b0bc165cd..9a643279b9 100644
--- a/Filters/Core/vtkContourFilter.cxx
+++ b/Filters/Core/vtkContourFilter.cxx
@@ -45,7 +45,7 @@
#include "vtkIncrementalPointLocator.h"
#include "vtkContourHelper.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkContourFilter);
vtkCxxSetObjectMacro(vtkContourFilter,ScalarTree,vtkScalarTree);
diff --git a/Filters/Core/vtkContourGrid.cxx b/Filters/Core/vtkContourGrid.cxx
index 7ba580df41..c6fc92e68c 100644
--- a/Filters/Core/vtkContourGrid.cxx
+++ b/Filters/Core/vtkContourGrid.cxx
@@ -37,7 +37,7 @@
#include "vtkPointLocator.h"
#include "vtkIncrementalPointLocator.h"
#include "vtkContourHelper.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkContourGrid);
diff --git a/Filters/Core/vtkCutter.cxx b/Filters/Core/vtkCutter.cxx
index b83b2804a0..0945b47305 100644
--- a/Filters/Core/vtkCutter.cxx
+++ b/Filters/Core/vtkCutter.cxx
@@ -49,7 +49,7 @@
#include "vtkContourHelper.h"
#include <algorithm>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCutter);
vtkCxxSetObjectMacro(vtkCutter,CutFunction,vtkImplicitFunction);
diff --git a/Filters/Core/vtkFlyingEdges2D.cxx b/Filters/Core/vtkFlyingEdges2D.cxx
index 9744a17440..dd7794f177 100644
--- a/Filters/Core/vtkFlyingEdges2D.cxx
+++ b/Filters/Core/vtkFlyingEdges2D.cxx
@@ -25,7 +25,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkSMPTools.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFlyingEdges2D);
diff --git a/Filters/Core/vtkFlyingEdges3D.cxx b/Filters/Core/vtkFlyingEdges3D.cxx
index 0a3c414185..3ad4df0a3e 100644
--- a/Filters/Core/vtkFlyingEdges3D.cxx
+++ b/Filters/Core/vtkFlyingEdges3D.cxx
@@ -28,7 +28,7 @@
#include "vtkMarchingCubesTriangleCases.h"
#include "vtkSMPTools.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFlyingEdges3D);
diff --git a/Filters/Core/vtkFlyingEdgesPlaneCutter.cxx b/Filters/Core/vtkFlyingEdgesPlaneCutter.cxx
index 4953ff0965..2751cbd2cd 100644
--- a/Filters/Core/vtkFlyingEdgesPlaneCutter.cxx
+++ b/Filters/Core/vtkFlyingEdgesPlaneCutter.cxx
@@ -29,7 +29,7 @@
#include "vtkPlane.h"
#include "vtkSMPTools.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFlyingEdgesPlaneCutter);
vtkCxxSetObjectMacro(vtkFlyingEdgesPlaneCutter,Plane,vtkPlane);
diff --git a/Filters/Core/vtkGridSynchronizedTemplates3D.cxx b/Filters/Core/vtkGridSynchronizedTemplates3D.cxx
index 857f04f62e..6c6e881a7a 100644
--- a/Filters/Core/vtkGridSynchronizedTemplates3D.cxx
+++ b/Filters/Core/vtkGridSynchronizedTemplates3D.cxx
@@ -39,7 +39,7 @@
#include "vtkUnsignedShortArray.h"
#include "vtkPolygonBuilder.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGridSynchronizedTemplates3D);
diff --git a/Filters/Core/vtkMarchingSquares.cxx b/Filters/Core/vtkMarchingSquares.cxx
index 392d000b99..3d1e333b51 100644
--- a/Filters/Core/vtkMarchingSquares.cxx
+++ b/Filters/Core/vtkMarchingSquares.cxx
@@ -35,7 +35,7 @@
#include "vtkUnsignedShortArray.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkMarchingSquares);
diff --git a/Filters/Core/vtkMaskFields.cxx b/Filters/Core/vtkMaskFields.cxx
index ba05064a76..d26686aa1f 100644
--- a/Filters/Core/vtkMaskFields.cxx
+++ b/Filters/Core/vtkMaskFields.cxx
@@ -21,7 +21,7 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkMaskFields);
diff --git a/Filters/Core/vtkRearrangeFields.cxx b/Filters/Core/vtkRearrangeFields.cxx
index cd1e8ea0c7..b4f7ad4293 100644
--- a/Filters/Core/vtkRearrangeFields.cxx
+++ b/Filters/Core/vtkRearrangeFields.cxx
@@ -24,7 +24,7 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkRearrangeFields);
diff --git a/Filters/Core/vtkRectilinearSynchronizedTemplates.cxx b/Filters/Core/vtkRectilinearSynchronizedTemplates.cxx
index 69f5e1bba2..7020c9f4b5 100644
--- a/Filters/Core/vtkRectilinearSynchronizedTemplates.cxx
+++ b/Filters/Core/vtkRectilinearSynchronizedTemplates.cxx
@@ -40,7 +40,7 @@
#include "vtkPolygonBuilder.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkRectilinearSynchronizedTemplates);
diff --git a/Filters/Core/vtkSynchronizedTemplates2D.cxx b/Filters/Core/vtkSynchronizedTemplates2D.cxx
index b4080bb86a..1beb1b24f2 100644
--- a/Filters/Core/vtkSynchronizedTemplates2D.cxx
+++ b/Filters/Core/vtkSynchronizedTemplates2D.cxx
@@ -34,7 +34,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSynchronizedTemplates2D);
diff --git a/Filters/Core/vtkSynchronizedTemplates3D.cxx b/Filters/Core/vtkSynchronizedTemplates3D.cxx
index 1c003c41c5..3f5d4ba2d0 100644
--- a/Filters/Core/vtkSynchronizedTemplates3D.cxx
+++ b/Filters/Core/vtkSynchronizedTemplates3D.cxx
@@ -39,7 +39,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSynchronizedTemplates3D);
diff --git a/Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx b/Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx
index 8291111c1d..9afde2f2a1 100644
--- a/Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx
+++ b/Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx
@@ -40,7 +40,7 @@
#include "vtkIdListCollection.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSynchronizedTemplatesCutter3D);
vtkCxxSetObjectMacro(vtkSynchronizedTemplatesCutter3D,CutFunction,vtkImplicitFunction);
diff --git a/Filters/Core/vtkVectorNorm.cxx b/Filters/Core/vtkVectorNorm.cxx
index bc564e6eb6..ef624390e0 100644
--- a/Filters/Core/vtkVectorNorm.cxx
+++ b/Filters/Core/vtkVectorNorm.cxx
@@ -23,7 +23,7 @@
#include "vtkPointData.h"
#include "vtkSMPTools.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkVectorNorm);
diff --git a/Filters/General/vtkBoxClipDataSet.cxx b/Filters/General/vtkBoxClipDataSet.cxx
index fbd6ef55a7..f6d88d2dc0 100644
--- a/Filters/General/vtkBoxClipDataSet.cxx
+++ b/Filters/General/vtkBoxClipDataSet.cxx
@@ -35,7 +35,7 @@
#include "vtkIdList.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
#include <vector>
vtkStandardNewMacro(vtkBoxClipDataSet);
diff --git a/Filters/General/vtkCellDerivatives.cxx b/Filters/General/vtkCellDerivatives.cxx
index 5aac77b405..a63b179ae0 100644
--- a/Filters/General/vtkCellDerivatives.cxx
+++ b/Filters/General/vtkCellDerivatives.cxx
@@ -25,7 +25,7 @@
#include "vtkPointData.h"
#include "vtkTensor.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCellDerivatives);
diff --git a/Filters/General/vtkClipDataSet.cxx b/Filters/General/vtkClipDataSet.cxx
index 8d658ea3f5..5c9d55acfc 100644
--- a/Filters/General/vtkClipDataSet.cxx
+++ b/Filters/General/vtkClipDataSet.cxx
@@ -38,7 +38,7 @@
#include "vtkIncrementalPointLocator.h"
#include "vtkPolyhedron.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkClipDataSet);
vtkCxxSetObjectMacro(vtkClipDataSet,ClipFunction,vtkImplicitFunction);
diff --git a/Filters/General/vtkCursor2D.cxx b/Filters/General/vtkCursor2D.cxx
index ae118a976c..78653df009 100644
--- a/Filters/General/vtkCursor2D.cxx
+++ b/Filters/General/vtkCursor2D.cxx
@@ -18,7 +18,7 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCursor2D);
diff --git a/Filters/General/vtkCursor3D.cxx b/Filters/General/vtkCursor3D.cxx
index ec050f9aa6..153236a511 100644
--- a/Filters/General/vtkCursor3D.cxx
+++ b/Filters/General/vtkCursor3D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCursor3D);
diff --git a/Filters/General/vtkImageMarchingCubes.cxx b/Filters/General/vtkImageMarchingCubes.cxx
index a8a1ac1609..f3c4d830e5 100644
--- a/Filters/General/vtkImageMarchingCubes.cxx
+++ b/Filters/General/vtkImageMarchingCubes.cxx
@@ -26,7 +26,7 @@
#include "vtkPointData.h"
#include "vtkPolyData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageMarchingCubes);
diff --git a/Filters/General/vtkMarchingContourFilter.cxx b/Filters/General/vtkMarchingContourFilter.cxx
index e146361c85..6f25112515 100644
--- a/Filters/General/vtkMarchingContourFilter.cxx
+++ b/Filters/General/vtkMarchingContourFilter.cxx
@@ -31,7 +31,7 @@
#include "vtkStructuredPoints.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkMarchingContourFilter);
diff --git a/Filters/General/vtkMultiThreshold.cxx b/Filters/General/vtkMultiThreshold.cxx
index cbc66a0e83..899a6c4e85 100644
--- a/Filters/General/vtkMultiThreshold.cxx
+++ b/Filters/General/vtkMultiThreshold.cxx
@@ -19,7 +19,7 @@
#include "vtkMultiThreshold.h"
-#include <math.h>
+#include <cmath>
#include "vtkCellData.h"
#include "vtkDataArray.h"
diff --git a/Filters/General/vtkSplitField.cxx b/Filters/General/vtkSplitField.cxx
index b7466606da..ce47b961f6 100644
--- a/Filters/General/vtkSplitField.cxx
+++ b/Filters/General/vtkSplitField.cxx
@@ -22,7 +22,7 @@
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkSplitField);
diff --git a/Filters/General/vtkYoungsMaterialInterface.cxx b/Filters/General/vtkYoungsMaterialInterface.cxx
index be5040bd71..aff59f62d5 100644
--- a/Filters/General/vtkYoungsMaterialInterface.cxx
+++ b/Filters/General/vtkYoungsMaterialInterface.cxx
@@ -54,7 +54,7 @@ PURPOSE. See the above copyright notice for more information.
#include <map>
#include <algorithm>
-#include <math.h>
+#include <cmath>
#include <cassert>
class vtkYoungsMaterialInterfaceCellCut
diff --git a/Filters/Generic/vtkGenericClip.cxx b/Filters/Generic/vtkGenericClip.cxx
index 5462992f97..069523e52e 100644
--- a/Filters/Generic/vtkGenericClip.cxx
+++ b/Filters/Generic/vtkGenericClip.cxx
@@ -38,7 +38,7 @@
#include "vtkExecutive.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGenericClip);
vtkCxxSetObjectMacro(vtkGenericClip,ClipFunction,vtkImplicitFunction);
diff --git a/Filters/Generic/vtkGenericCutter.cxx b/Filters/Generic/vtkGenericCutter.cxx
index b9ad4023d1..c6d206c340 100644
--- a/Filters/Generic/vtkGenericCutter.cxx
+++ b/Filters/Generic/vtkGenericCutter.cxx
@@ -38,7 +38,7 @@
#include "vtkGenericCellTessellator.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGenericCutter);
vtkCxxSetObjectMacro(vtkGenericCutter,CutFunction,vtkImplicitFunction);
diff --git a/Filters/Hybrid/vtkBSplineTransform.cxx b/Filters/Hybrid/vtkBSplineTransform.cxx
index 3b69c0b4e5..f713662a40 100644
--- a/Filters/Hybrid/vtkBSplineTransform.cxx
+++ b/Filters/Hybrid/vtkBSplineTransform.cxx
@@ -20,7 +20,7 @@
#include "vtkTrivialProducer.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkBSplineTransform);
diff --git a/Filters/Hybrid/vtkDSPFilterGroup.cxx b/Filters/Hybrid/vtkDSPFilterGroup.cxx
index aa30945adb..2566d6a128 100644
--- a/Filters/Hybrid/vtkDSPFilterGroup.cxx
+++ b/Filters/Hybrid/vtkDSPFilterGroup.cxx
@@ -32,7 +32,7 @@
#include "vtkObjectFactory.h"
#include "vtkDSPFilterDefinition.h"
-#include <ctype.h>
+#include <cctype>
#include <vector>
#include <string>
diff --git a/Filters/Hybrid/vtkEarthSource.cxx b/Filters/Hybrid/vtkEarthSource.cxx
index 09fe8f40fa..8d8323dab9 100644
--- a/Filters/Hybrid/vtkEarthSource.cxx
+++ b/Filters/Hybrid/vtkEarthSource.cxx
@@ -25,7 +25,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkEarthSource);
diff --git a/Filters/Hybrid/vtkGridTransform.cxx b/Filters/Hybrid/vtkGridTransform.cxx
index cf4ac13df6..bed37984b5 100644
--- a/Filters/Hybrid/vtkGridTransform.cxx
+++ b/Filters/Hybrid/vtkGridTransform.cxx
@@ -23,7 +23,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTrivialProducer.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGridTransform);
diff --git a/Filters/Hybrid/vtkImplicitModeller.cxx b/Filters/Hybrid/vtkImplicitModeller.cxx
index 7975062019..62c7a76f7b 100644
--- a/Filters/Hybrid/vtkImplicitModeller.cxx
+++ b/Filters/Hybrid/vtkImplicitModeller.cxx
@@ -37,7 +37,7 @@
#include "vtkImageIterator.h"
#include "vtkImageProgressIterator.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImplicitModeller);
diff --git a/Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx b/Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx
index 2959172368..84abb05a25 100644
--- a/Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx
+++ b/Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx
@@ -21,7 +21,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkCompositeDataPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkTemporalSnapToTimeStep);
diff --git a/Filters/HyperTree/vtkClipHyperOctree.cxx b/Filters/HyperTree/vtkClipHyperOctree.cxx
index 2693b105b2..137006e978 100644
--- a/Filters/HyperTree/vtkClipHyperOctree.cxx
+++ b/Filters/HyperTree/vtkClipHyperOctree.cxx
@@ -41,7 +41,7 @@
#include "vtkHyperOctreeClipCutPointsGrabber.h"
#include "vtkIncrementalPointLocator.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
vtkStandardNewMacro(vtkClipHyperOctree);
diff --git a/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx b/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
index 712bda36e1..56d103de01 100644
--- a/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
+++ b/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
@@ -39,7 +39,7 @@
#include "vtkPolygon.h"
#include "vtkOrderedTriangulator.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
#include <set>
#include "vtkBitArray.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeCutter.cxx b/Filters/HyperTree/vtkHyperOctreeCutter.cxx
index f167674775..ecdba23de1 100644
--- a/Filters/HyperTree/vtkHyperOctreeCutter.cxx
+++ b/Filters/HyperTree/vtkHyperOctreeCutter.cxx
@@ -39,7 +39,7 @@
#include "vtkPolygon.h"
#include "vtkOrderedTriangulator.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
#include "vtkHyperOctreeClipCutPointsGrabber.h"
#include "vtkIncrementalPointLocator.h"
diff --git a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.cxx b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.cxx
index 5c5036c82b..ad2e128113 100644
--- a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.cxx
+++ b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.cxx
@@ -39,7 +39,7 @@
#include "vtkTetra.h"
#include "vtkPolygon.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
#include <set>
#include "vtkBitArray.h"
diff --git a/Filters/Modeling/vtkBandedPolyDataContourFilter.cxx b/Filters/Modeling/vtkBandedPolyDataContourFilter.cxx
index fe79c07fda..ba6a2d0331 100644
--- a/Filters/Modeling/vtkBandedPolyDataContourFilter.cxx
+++ b/Filters/Modeling/vtkBandedPolyDataContourFilter.cxx
@@ -27,7 +27,7 @@
#include "vtkTriangleStrip.h"
#include "vtkDoubleArray.h"
-#include <float.h>
+#include <cfloat>
vtkStandardNewMacro(vtkBandedPolyDataContourFilter);
diff --git a/Filters/Modeling/vtkSpherePuzzle.cxx b/Filters/Modeling/vtkSpherePuzzle.cxx
index 045f462c63..1883380235 100644
--- a/Filters/Modeling/vtkSpherePuzzle.cxx
+++ b/Filters/Modeling/vtkSpherePuzzle.cxx
@@ -27,7 +27,7 @@
#include "vtkTransform.h"
#include "vtkTransformFilter.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSpherePuzzle);
diff --git a/Filters/Modeling/vtkSpherePuzzleArrows.cxx b/Filters/Modeling/vtkSpherePuzzleArrows.cxx
index 70d313017b..7c00566f8b 100644
--- a/Filters/Modeling/vtkSpherePuzzleArrows.cxx
+++ b/Filters/Modeling/vtkSpherePuzzleArrows.cxx
@@ -22,7 +22,7 @@
#include "vtkPolyData.h"
#include "vtkSpherePuzzle.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSpherePuzzleArrows);
diff --git a/Filters/Parallel/vtkExtractCTHPart.cxx b/Filters/Parallel/vtkExtractCTHPart.cxx
index 29db92fcf9..e7f04e2e7b 100644
--- a/Filters/Parallel/vtkExtractCTHPart.cxx
+++ b/Filters/Parallel/vtkExtractCTHPart.cxx
@@ -49,7 +49,7 @@
#include <algorithm>
#include <cassert>
-#include <math.h>
+#include <cmath>
#include <string>
#include <vector>
diff --git a/Filters/Parallel/vtkPSphereSource.cxx b/Filters/Parallel/vtkPSphereSource.cxx
index 6e460234e6..ef1f2ac1b8 100644
--- a/Filters/Parallel/vtkPSphereSource.cxx
+++ b/Filters/Parallel/vtkPSphereSource.cxx
@@ -26,7 +26,7 @@
#include "vtkPolyData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkPSphereSource);
diff --git a/Filters/SMP/vtkSMPContourGrid.cxx b/Filters/SMP/vtkSMPContourGrid.cxx
index 750b916a5e..c08a0d1d02 100644
--- a/Filters/SMP/vtkSMPContourGrid.cxx
+++ b/Filters/SMP/vtkSMPContourGrid.cxx
@@ -40,7 +40,7 @@
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSMPContourGrid);
diff --git a/Filters/SMP/vtkSMPContourGridManyPieces.cxx b/Filters/SMP/vtkSMPContourGridManyPieces.cxx
index 3db8e8d2a1..e205bcf280 100644
--- a/Filters/SMP/vtkSMPContourGridManyPieces.cxx
+++ b/Filters/SMP/vtkSMPContourGridManyPieces.cxx
@@ -37,7 +37,7 @@
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSMPContourGridManyPieces);
diff --git a/Filters/SMP/vtkSMPTransform.cxx b/Filters/SMP/vtkSMPTransform.cxx
index 13e8fd00c7..ce00d81393 100644
--- a/Filters/SMP/vtkSMPTransform.cxx
+++ b/Filters/SMP/vtkSMPTransform.cxx
@@ -22,7 +22,7 @@
#include "vtkSMPTools.h"
-#include <stdlib.h>
+#include <cstdlib>
vtkStandardNewMacro(vtkSMPTransform);
diff --git a/Filters/SMP/vtkThreadedSynchronizedTemplates3D.cxx b/Filters/SMP/vtkThreadedSynchronizedTemplates3D.cxx
index 228a02f35f..b060749749 100644
--- a/Filters/SMP/vtkThreadedSynchronizedTemplates3D.cxx
+++ b/Filters/SMP/vtkThreadedSynchronizedTemplates3D.cxx
@@ -40,7 +40,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
-#include <math.h>
+#include <cmath>
#include "vtkSMPTools.h"
#include "vtkNew.h"
diff --git a/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.cxx b/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.cxx
index 9d2d3f9420..d11c4fb164 100644
--- a/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.cxx
+++ b/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.cxx
@@ -40,7 +40,7 @@
#include "vtkIdListCollection.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
#include "vtkSMPTools.h"
#include "vtkSMPThreadLocalObject.h"
diff --git a/Filters/Sources/vtkArcSource.cxx b/Filters/Sources/vtkArcSource.cxx
index 4edbedc84f..2a5912c400 100644
--- a/Filters/Sources/vtkArcSource.cxx
+++ b/Filters/Sources/vtkArcSource.cxx
@@ -25,7 +25,7 @@
#include "vtkPolyData.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkArcSource);
diff --git a/Filters/Sources/vtkConeSource.cxx b/Filters/Sources/vtkConeSource.cxx
index 1763f9f9be..db72002ab4 100644
--- a/Filters/Sources/vtkConeSource.cxx
+++ b/Filters/Sources/vtkConeSource.cxx
@@ -24,7 +24,7 @@
#include "vtkTransform.h"
#include "vtkCellArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkConeSource);
diff --git a/Filters/Sources/vtkCubeSource.cxx b/Filters/Sources/vtkCubeSource.cxx
index bbfc3b7e73..099a34df1f 100644
--- a/Filters/Sources/vtkCubeSource.cxx
+++ b/Filters/Sources/vtkCubeSource.cxx
@@ -24,7 +24,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCubeSource);
diff --git a/Filters/Sources/vtkCylinderSource.cxx b/Filters/Sources/vtkCylinderSource.cxx
index 50c56212d5..417aa28694 100644
--- a/Filters/Sources/vtkCylinderSource.cxx
+++ b/Filters/Sources/vtkCylinderSource.cxx
@@ -24,7 +24,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCylinderSource);
diff --git a/Filters/Sources/vtkLineSource.cxx b/Filters/Sources/vtkLineSource.cxx
index 06af4a1c8e..3b82469a1a 100644
--- a/Filters/Sources/vtkLineSource.cxx
+++ b/Filters/Sources/vtkLineSource.cxx
@@ -24,7 +24,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkLineSource);
vtkCxxSetObjectMacro(vtkLineSource,Points,vtkPoints);
diff --git a/Filters/Sources/vtkParametricFunctionSource.cxx b/Filters/Sources/vtkParametricFunctionSource.cxx
index e875524276..351a8531f1 100644
--- a/Filters/Sources/vtkParametricFunctionSource.cxx
+++ b/Filters/Sources/vtkParametricFunctionSource.cxx
@@ -27,7 +27,7 @@
#include "vtkInformationVector.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
#include <string>
vtkStandardNewMacro(vtkParametricFunctionSource);
diff --git a/Filters/Sources/vtkPointSource.cxx b/Filters/Sources/vtkPointSource.cxx
index 6b1502e4dd..895d39c7cb 100644
--- a/Filters/Sources/vtkPointSource.cxx
+++ b/Filters/Sources/vtkPointSource.cxx
@@ -22,8 +22,8 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
vtkStandardNewMacro(vtkPointSource);
diff --git a/Filters/Sources/vtkSphereSource.cxx b/Filters/Sources/vtkSphereSource.cxx
index 5e6830ac85..cde3f67b8c 100644
--- a/Filters/Sources/vtkSphereSource.cxx
+++ b/Filters/Sources/vtkSphereSource.cxx
@@ -25,7 +25,7 @@
#include "vtkPolyData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSphereSource);
diff --git a/Filters/Sources/vtkSuperquadricSource.cxx b/Filters/Sources/vtkSuperquadricSource.cxx
index 78115154c4..1010f35434 100644
--- a/Filters/Sources/vtkSuperquadricSource.cxx
+++ b/Filters/Sources/vtkSuperquadricSource.cxx
@@ -30,7 +30,7 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkSuperquadricSource);
diff --git a/Filters/StatisticsGnuR/vtkRAdapter.cxx b/Filters/StatisticsGnuR/vtkRAdapter.cxx
index aff0c4d820..b2e05ffeee 100644
--- a/Filters/StatisticsGnuR/vtkRAdapter.cxx
+++ b/Filters/StatisticsGnuR/vtkRAdapter.cxx
@@ -45,7 +45,7 @@
#include <map>
-#include <stdio.h>
+#include <cstdio>
#include <cassert>
#define R_NO_REMAP /* AVOID SOME SERIOUS STUPIDITY. DO NOT REMOVE. */
diff --git a/Filters/Texture/vtkTriangularTCoords.cxx b/Filters/Texture/vtkTriangularTCoords.cxx
index 60c09a9297..9ff7bf3557 100644
--- a/Filters/Texture/vtkTriangularTCoords.cxx
+++ b/Filters/Texture/vtkTriangularTCoords.cxx
@@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkPolyData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkTriangularTCoords);
diff --git a/Geovis/Core/vtkGeoCamera.cxx b/Geovis/Core/vtkGeoCamera.cxx
index e2e621983d..4c0de6b6d4 100644
--- a/Geovis/Core/vtkGeoCamera.cxx
+++ b/Geovis/Core/vtkGeoCamera.cxx
@@ -25,7 +25,7 @@
#include "vtkMath.h"
#include "vtkCamera.h"
#include "vtkTransform.h"
-#include <float.h>
+#include <cfloat>
vtkStandardNewMacro(vtkGeoCamera);
diff --git a/Geovis/Core/vtkGeoInteractorStyle.cxx b/Geovis/Core/vtkGeoInteractorStyle.cxx
index e29cb49a69..70f0f48fb1 100644
--- a/Geovis/Core/vtkGeoInteractorStyle.cxx
+++ b/Geovis/Core/vtkGeoInteractorStyle.cxx
@@ -43,7 +43,7 @@
#include "vtkGeoMath.h"
#include "vtkCoordinate.h"
-#include <float.h>
+#include <cfloat>
vtkStandardNewMacro(vtkGeoInteractorStyle);
diff --git a/Geovis/Core/vtkGlobeSource.cxx b/Geovis/Core/vtkGlobeSource.cxx
index 644ca2ce76..cb5cab2a3a 100644
--- a/Geovis/Core/vtkGlobeSource.cxx
+++ b/Geovis/Core/vtkGlobeSource.cxx
@@ -35,7 +35,7 @@
#include "vtkGeoMath.h"
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGlobeSource);
diff --git a/IO/AMR/vtkAMRFlashReader.cxx b/IO/AMR/vtkAMRFlashReader.cxx
index e7456bfe12..40c9a87723 100644
--- a/IO/AMR/vtkAMRFlashReader.cxx
+++ b/IO/AMR/vtkAMRFlashReader.cxx
@@ -35,7 +35,7 @@
#include <cassert>
#include <vector>
#include <map>
-#include <float.h>
+#include <cfloat>
#define H5_USE_16_API
#include "vtk_hdf5.h"
diff --git a/IO/Core/vtkSortFileNames.cxx b/IO/Core/vtkSortFileNames.cxx
index afecd899eb..68ba5ff05a 100644
--- a/IO/Core/vtkSortFileNames.cxx
+++ b/IO/Core/vtkSortFileNames.cxx
@@ -25,7 +25,7 @@
#include <algorithm>
#include <vtksys/SystemTools.hxx>
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkSortFileNames);
diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
index 51eaf3c005..df39200529 100644
--- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
@@ -30,7 +30,7 @@
#include "vtkUnstructuredGrid.h"
#include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
#include <string>
vtkStandardNewMacro(vtkEnSight6BinaryReader);
diff --git a/IO/EnSight/vtkEnSight6Reader.cxx b/IO/EnSight/vtkEnSight6Reader.cxx
index 950b443d6a..9b465b1b60 100644
--- a/IO/EnSight/vtkEnSight6Reader.cxx
+++ b/IO/EnSight/vtkEnSight6Reader.cxx
@@ -30,7 +30,7 @@
#include <cassert>
-#include <ctype.h>
+#include <cctype>
#include <string>
vtkStandardNewMacro(vtkEnSight6Reader);
diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
index 8253f806dd..fe7bd3a9b6 100644
--- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
@@ -29,7 +29,7 @@
#include "vtkUnstructuredGrid.h"
#include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
#include <string>
#include <vector>
#include <map>
diff --git a/IO/EnSight/vtkEnSightGoldReader.cxx b/IO/EnSight/vtkEnSightGoldReader.cxx
index 3e9b640f29..c304676958 100644
--- a/IO/EnSight/vtkEnSightGoldReader.cxx
+++ b/IO/EnSight/vtkEnSightGoldReader.cxx
@@ -27,7 +27,7 @@
#include "vtkStructuredGrid.h"
#include "vtkUnstructuredGrid.h"
-#include <ctype.h>
+#include <cctype>
#include <sstream>
#include <string>
#include <vector>
diff --git a/IO/EnSight/vtkGenericEnSightReader.cxx b/IO/EnSight/vtkGenericEnSightReader.cxx
index a507d3cae5..a3f34d43ab 100644
--- a/IO/EnSight/vtkGenericEnSightReader.cxx
+++ b/IO/EnSight/vtkGenericEnSightReader.cxx
@@ -31,7 +31,7 @@
#include <string>
#include <map>
#include <cassert>
-#include <ctype.h> /* isspace */
+#include <cctype> /* isspace */
vtkStandardNewMacro(vtkGenericEnSightReader);
diff --git a/IO/Exodus/vtkExodusIIReader.cxx b/IO/Exodus/vtkExodusIIReader.cxx
index b0cec3f818..bae2f4cd4f 100644
--- a/IO/Exodus/vtkExodusIIReader.cxx
+++ b/IO/Exodus/vtkExodusIIReader.cxx
@@ -59,11 +59,11 @@
#include "vtksys/RegularExpression.hxx"
#include "vtk_exodusII.h"
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib> /* for free() */
-#include <string.h> /* for memset() */
-#include <ctype.h> /* for toupper(), isgraph() */
-#include <math.h> /* for cos() */
+#include <cstring> /* for memset() */
+#include <cctype> /* for toupper(), isgraph() */
+#include <cmath> /* for cos() */
#ifdef EXODUSII_HAVE_MALLOC_H
# include <malloc.h>
diff --git a/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx b/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
index 9db4b64c8a..9d149c2bd7 100644
--- a/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
+++ b/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx
@@ -12,7 +12,7 @@
#include <vector>
#include <set>
-#include <ctype.h>
+#include <cctype>
bool vtkExodusIIReaderVariableCheck::Start( std::string name, const int* truth, int numTruth )
{
diff --git a/IO/Exodus/vtkExodusIIWriter.cxx b/IO/Exodus/vtkExodusIIWriter.cxx
index a94867f08f..df90c04cda 100644
--- a/IO/Exodus/vtkExodusIIWriter.cxx
+++ b/IO/Exodus/vtkExodusIIWriter.cxx
@@ -43,7 +43,7 @@
#include "vtkToolkits.h" // for VTK_USE_PARALLEL
#include "vtk_exodusII.h"
-#include <ctype.h>
+#include <cctype>
#include <map>
#include <ctime>
diff --git a/IO/Geometry/vtkChacoReader.cxx b/IO/Geometry/vtkChacoReader.cxx
index 1df9f49f50..a4cbadff83 100644
--- a/IO/Geometry/vtkChacoReader.cxx
+++ b/IO/Geometry/vtkChacoReader.cxx
@@ -18,8 +18,8 @@
See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
----------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
#include "vtkChacoReader.h"
#include "vtkCellArray.h"
#include "vtkCellData.h"
diff --git a/IO/Geometry/vtkFLUENTReader.cxx b/IO/Geometry/vtkFLUENTReader.cxx
index 3c710da943..2fecbd1593 100644
--- a/IO/Geometry/vtkFLUENTReader.cxx
+++ b/IO/Geometry/vtkFLUENTReader.cxx
@@ -55,7 +55,7 @@
#include <sstream>
#include <algorithm>
-#include <ctype.h>
+#include <cctype>
#include <sys/stat.h>
vtkStandardNewMacro(vtkFLUENTReader);
diff --git a/IO/Geometry/vtkGaussianCubeReader.cxx b/IO/Geometry/vtkGaussianCubeReader.cxx
index cf76bbaec0..6fe567c47e 100644
--- a/IO/Geometry/vtkGaussianCubeReader.cxx
+++ b/IO/Geometry/vtkGaussianCubeReader.cxx
@@ -26,7 +26,7 @@
#include "vtkStringArray.h"
#include "vtkTransform.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkGaussianCubeReader);
diff --git a/IO/Geometry/vtkMoleculeReaderBase.cxx b/IO/Geometry/vtkMoleculeReaderBase.cxx
index 817ea4a37f..733ae60614 100644
--- a/IO/Geometry/vtkMoleculeReaderBase.cxx
+++ b/IO/Geometry/vtkMoleculeReaderBase.cxx
@@ -30,7 +30,7 @@
#include "vtkNew.h"
#include <algorithm>
-#include <ctype.h>
+#include <cctype>
static double vtkMoleculeReaderBaseCovRadius[103] = {
diff --git a/IO/Geometry/vtkOBJReader.cxx b/IO/Geometry/vtkOBJReader.cxx
index 80d5886536..9db16a0e35 100644
--- a/IO/Geometry/vtkOBJReader.cxx
+++ b/IO/Geometry/vtkOBJReader.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
#include "vtkPolyData.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkOBJReader);
diff --git a/IO/Geometry/vtkOpenFOAMReader.cxx b/IO/Geometry/vtkOpenFOAMReader.cxx
index 596045eec6..fd692efa0a 100644
--- a/IO/Geometry/vtkOpenFOAMReader.cxx
+++ b/IO/Geometry/vtkOpenFOAMReader.cxx
@@ -98,9 +98,9 @@
#include <unistd.h>
#endif
// for fabs()
-#include <math.h>
+#include <cmath>
// for isalnum() / isspace() / isdigit()
-#include <ctype.h>
+#include <cctype>
#if VTK_FOAMFILE_OMIT_CRCCHECK
uLong ZEXPORT crc32(uLong, const Bytef *, uInt)
diff --git a/IO/Geometry/vtkProStarReader.cxx b/IO/Geometry/vtkProStarReader.cxx
index 62f60fc908..c997371d0e 100644
--- a/IO/Geometry/vtkProStarReader.cxx
+++ b/IO/Geometry/vtkProStarReader.cxx
@@ -25,8 +25,8 @@
#include "vtkCellData.h"
#include "vtkIntArray.h"
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
#include <sstream>
#include <string>
#include <map>
diff --git a/IO/Geometry/vtkSTLReader.cxx b/IO/Geometry/vtkSTLReader.cxx
index 4016e574a1..c1ec1c8596 100644
--- a/IO/Geometry/vtkSTLReader.cxx
+++ b/IO/Geometry/vtkSTLReader.cxx
@@ -29,7 +29,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include <algorithm>
-#include <ctype.h>
+#include <cctype>
#include <stdexcept>
#include <string>
#include <vtksys/SystemTools.hxx>
diff --git a/IO/Geometry/vtkTecplotReader.cxx b/IO/Geometry/vtkTecplotReader.cxx
index d96942f90b..7c27517185 100644
--- a/IO/Geometry/vtkTecplotReader.cxx
+++ b/IO/Geometry/vtkTecplotReader.cxx
@@ -52,7 +52,7 @@
#include <fstream>
-#include <ctype.h> // for isspace(), isalnum()
+#include <cctype> // for isspace(), isalnum()
vtkStandardNewMacro( vtkTecplotReader );
diff --git a/IO/Image/vtkImageExport.cxx b/IO/Image/vtkImageExport.cxx
index 443c7b1569..b3ffe184bd 100644
--- a/IO/Image/vtkImageExport.cxx
+++ b/IO/Image/vtkImageExport.cxx
@@ -21,8 +21,8 @@
#include "vtkInformation.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
vtkStandardNewMacro(vtkImageExport);
diff --git a/IO/Image/vtkImageImport.cxx b/IO/Image/vtkImageImport.cxx
index c4b4834166..01135f8b8c 100644
--- a/IO/Image/vtkImageImport.cxx
+++ b/IO/Image/vtkImageImport.cxx
@@ -24,7 +24,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
-#include <ctype.h>
+#include <cctype>
#include <exception>
vtkStandardNewMacro(vtkImageImport);
diff --git a/IO/Image/vtkMedicalImageProperties.cxx b/IO/Image/vtkMedicalImageProperties.cxx
index 92fd3a1a53..d859721a07 100644
--- a/IO/Image/vtkMedicalImageProperties.cxx
+++ b/IO/Image/vtkMedicalImageProperties.cxx
@@ -21,7 +21,7 @@
#include <set>
#include <ctime> // for strftime
-#include <ctype.h> // for isdigit
+#include <cctype> // for isdigit
#include <cassert>
//----------------------------------------------------------------------------
diff --git a/IO/Image/vtkNIFTIImageHeader.cxx b/IO/Image/vtkNIFTIImageHeader.cxx
index d4a40033a1..82767cf0ec 100644
--- a/IO/Image/vtkNIFTIImageHeader.cxx
+++ b/IO/Image/vtkNIFTIImageHeader.cxx
@@ -18,10 +18,10 @@ See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
#include "vtkObjectFactory.h"
-#include <string.h>
-#include <float.h>
-#include <math.h>
-#include <ctype.h>
+#include <cstring>
+#include <cfloat>
+#include <cmath>
+#include <cctype>
vtkStandardNewMacro(vtkNIFTIImageHeader);
diff --git a/IO/Image/vtkNIFTIImageReader.cxx b/IO/Image/vtkNIFTIImageReader.cxx
index 5d7af91ed2..184274ae87 100644
--- a/IO/Image/vtkNIFTIImageReader.cxx
+++ b/IO/Image/vtkNIFTIImageReader.cxx
@@ -39,8 +39,8 @@
// Header for zlib
#include "vtk_zlib.h"
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
#include <string>
vtkStandardNewMacro(vtkNIFTIImageReader);
diff --git a/IO/Image/vtkNIFTIImageWriter.cxx b/IO/Image/vtkNIFTIImageWriter.cxx
index d53e90905b..1353027164 100644
--- a/IO/Image/vtkNIFTIImageWriter.cxx
+++ b/IO/Image/vtkNIFTIImageWriter.cxx
@@ -38,10 +38,10 @@
// Header for zlib
#include "vtk_zlib.h"
-#include <stdio.h>
-#include <string.h>
-#include <float.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cfloat>
+#include <cmath>
vtkStandardNewMacro(vtkNIFTIImageWriter);
vtkCxxSetObjectMacro(vtkNIFTIImageWriter,QFormMatrix,vtkMatrix4x4);
diff --git a/IO/Image/vtkNrrdReader.cxx b/IO/Image/vtkNrrdReader.cxx
index f9281bf831..5429fef4c5 100644
--- a/IO/Image/vtkNrrdReader.cxx
+++ b/IO/Image/vtkNrrdReader.cxx
@@ -33,9 +33,9 @@
#include <istream>
#include <sstream>
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
#include "vtkSmartPointer.h"
diff --git a/IO/Image/vtkSLCReader.cxx b/IO/Image/vtkSLCReader.cxx
index 7d1e37a9da..9e7cba43ff 100644
--- a/IO/Image/vtkSLCReader.cxx
+++ b/IO/Image/vtkSLCReader.cxx
@@ -20,7 +20,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkSLCReader);
diff --git a/IO/Import/vtkOBJImporter.cxx b/IO/Import/vtkOBJImporter.cxx
index 04472f5344..b0ddbf091c 100644
--- a/IO/Import/vtkOBJImporter.cxx
+++ b/IO/Import/vtkOBJImporter.cxx
@@ -28,7 +28,7 @@
#include "vtkSmartPointer.h"
#include "vtksys/SystemTools.hxx"
-#include <ctype.h>
+#include <cctype>
#include <cstdio>
#include <list>
#include <set>
diff --git a/IO/Import/vtkOBJImporterInternals.cxx b/IO/Import/vtkOBJImporterInternals.cxx
index 8a77f664a1..b0dd01af05 100644
--- a/IO/Import/vtkOBJImporterInternals.cxx
+++ b/IO/Import/vtkOBJImporterInternals.cxx
@@ -22,9 +22,9 @@
#include "vtksys/SystemTools.hxx"
#include <iostream>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
#include <map>
#if defined(_WIN32)
diff --git a/IO/Infovis/vtkDelimitedTextReader.cxx b/IO/Infovis/vtkDelimitedTextReader.cxx
index 727a85281d..c060779161 100644
--- a/IO/Infovis/vtkDelimitedTextReader.cxx
+++ b/IO/Infovis/vtkDelimitedTextReader.cxx
@@ -43,7 +43,7 @@
#include <set>
#include <vector>
-#include <ctype.h>
+#include <cctype>
// #include <utf8.h>
diff --git a/IO/Infovis/vtkFixedWidthTextReader.cxx b/IO/Infovis/vtkFixedWidthTextReader.cxx
index 914a3da063..e9e7966402 100644
--- a/IO/Infovis/vtkFixedWidthTextReader.cxx
+++ b/IO/Infovis/vtkFixedWidthTextReader.cxx
@@ -34,7 +34,7 @@
#include <vector>
#include <fstream>
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro(vtkFixedWidthTextReader);
vtkCxxSetObjectMacro(vtkFixedWidthTextReader,TableErrorObserver,vtkCommand);
diff --git a/IO/Infovis/vtkTulipReader.cxx b/IO/Infovis/vtkTulipReader.cxx
index 934868f3be..4f10b73dbd 100644
--- a/IO/Infovis/vtkTulipReader.cxx
+++ b/IO/Infovis/vtkTulipReader.cxx
@@ -47,7 +47,7 @@
#include <vector>
#if defined (__BORLANDC__)
-#include <ctype.h> // for isspace, isdigit
+#include <cctype> // for isspace, isdigit
#endif
// I need a safe way to read a line of arbitrary length. It exists on
diff --git a/IO/Infovis/vtkXGMLReader.cxx b/IO/Infovis/vtkXGMLReader.cxx
index 71d6114c6c..95db1f06c9 100644
--- a/IO/Infovis/vtkXGMLReader.cxx
+++ b/IO/Infovis/vtkXGMLReader.cxx
@@ -41,7 +41,7 @@ PURPOSE. See the above copyright notice for more information.
#include <map>
#if defined (__BORLANDC__)
-#include <ctype.h> // for isspace, isdigit
+#include <cctype> // for isspace, isdigit
#endif
// Copied from vtkTulipReader.cxx ..
diff --git a/IO/Legacy/vtkDataReader.cxx b/IO/Legacy/vtkDataReader.cxx
index 9b9c40e4dd..d320c54319 100644
--- a/IO/Legacy/vtkDataReader.cxx
+++ b/IO/Legacy/vtkDataReader.cxx
@@ -49,7 +49,7 @@
#include "vtkTypeUInt64Array.h"
-#include <ctype.h>
+#include <cctype>
#include <sys/stat.h>
// I need a safe way to read a line of arbitrary length. It exists on
diff --git a/IO/MINC/vtkMINCImageAttributes.cxx b/IO/MINC/vtkMINCImageAttributes.cxx
index 3acfc67d50..da8e2ba24f 100644
--- a/IO/MINC/vtkMINCImageAttributes.cxx
+++ b/IO/MINC/vtkMINCImageAttributes.cxx
@@ -65,8 +65,8 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtk_netcdf.h"
#include <cstdlib>
-#include <ctype.h>
-#include <float.h>
+#include <cctype>
+#include <cfloat>
#include <string>
#include <map>
#include <sstream>
diff --git a/IO/MINC/vtkMINCImageReader.cxx b/IO/MINC/vtkMINCImageReader.cxx
index 1f1e85bb91..ba81f374e5 100644
--- a/IO/MINC/vtkMINCImageReader.cxx
+++ b/IO/MINC/vtkMINCImageReader.cxx
@@ -71,8 +71,8 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtk_netcdf.h"
#include <cstdlib>
-#include <ctype.h>
-#include <float.h>
+#include <cctype>
+#include <cfloat>
#include <string>
#include <map>
diff --git a/IO/MINC/vtkMINCImageWriter.cxx b/IO/MINC/vtkMINCImageWriter.cxx
index 15e6fa90dd..d09e1f9123 100644
--- a/IO/MINC/vtkMINCImageWriter.cxx
+++ b/IO/MINC/vtkMINCImageWriter.cxx
@@ -81,7 +81,7 @@ POSSIBILITY OF SUCH DAMAGES.
#endif
#include <cstdlib>
-#include <float.h>
+#include <cfloat>
#include <ctime>
#include <string>
#include <vector>
diff --git a/IO/MINC/vtkMNIObjectReader.cxx b/IO/MINC/vtkMNIObjectReader.cxx
index 63b8cb30ca..89f6950ba2 100644
--- a/IO/MINC/vtkMNIObjectReader.cxx
+++ b/IO/MINC/vtkMNIObjectReader.cxx
@@ -65,7 +65,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkProperty.h"
#include "vtkMath.h"
-#include <ctype.h>
+#include <cctype>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/IO/MINC/vtkMNIObjectWriter.cxx b/IO/MINC/vtkMNIObjectWriter.cxx
index fd4b404003..6a2ce476ef 100644
--- a/IO/MINC/vtkMNIObjectWriter.cxx
+++ b/IO/MINC/vtkMNIObjectWriter.cxx
@@ -66,8 +66,8 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkMath.h"
#include "vtkErrorCode.h"
-#include <ctype.h>
-#include <math.h>
+#include <cctype>
+#include <cmath>
#if !defined(_WIN32) || defined(__CYGWIN__)
# include <unistd.h> /* unlink */
diff --git a/IO/MINC/vtkMNITagPointReader.cxx b/IO/MINC/vtkMNITagPointReader.cxx
index 4ee86f8824..f2f6aa7191 100644
--- a/IO/MINC/vtkMNITagPointReader.cxx
+++ b/IO/MINC/vtkMNITagPointReader.cxx
@@ -62,7 +62,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkIntArray.h"
#include "vtkStringArray.h"
-#include <ctype.h>
+#include <cctype>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/IO/MINC/vtkMNITagPointWriter.cxx b/IO/MINC/vtkMNITagPointWriter.cxx
index f61b15a0d5..eb9bbdc8e0 100644
--- a/IO/MINC/vtkMNITagPointWriter.cxx
+++ b/IO/MINC/vtkMNITagPointWriter.cxx
@@ -62,8 +62,8 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkErrorCode.h"
#include "vtkCommand.h"
-#include <ctype.h>
-#include <math.h>
+#include <cctype>
+#include <cmath>
#if !defined(_WIN32) || defined(__CYGWIN__)
# include <unistd.h> /* unlink */
diff --git a/IO/MINC/vtkMNITransformReader.cxx b/IO/MINC/vtkMNITransformReader.cxx
index fd6149b227..283b802a20 100644
--- a/IO/MINC/vtkMNITransformReader.cxx
+++ b/IO/MINC/vtkMNITransformReader.cxx
@@ -63,7 +63,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkInformationVector.h"
#include "vtkPoints.h"
-#include <ctype.h>
+#include <cctype>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/IO/MINC/vtkMNITransformWriter.cxx b/IO/MINC/vtkMNITransformWriter.cxx
index c5156ebd9a..6d721d95b2 100644
--- a/IO/MINC/vtkMNITransformWriter.cxx
+++ b/IO/MINC/vtkMNITransformWriter.cxx
@@ -69,8 +69,8 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkPoints.h"
#include <ctime>
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
#include <stack>
#include <vtksys/SystemTools.hxx>
diff --git a/IO/MPIImage/vtkPNrrdReader.cxx b/IO/MPIImage/vtkPNrrdReader.cxx
index fd6c09981a..f9c4d879ab 100644
--- a/IO/MPIImage/vtkPNrrdReader.cxx
+++ b/IO/MPIImage/vtkPNrrdReader.cxx
@@ -32,9 +32,9 @@
#include <istream>
#include <sstream>
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
#include "vtkSmartPointer.h"
#include "vtkMPI.h"
diff --git a/IO/NetCDF/vtkNetCDFCFReader.cxx b/IO/NetCDF/vtkNetCDFCFReader.cxx
index b6ac639ffe..bed75aa83b 100644
--- a/IO/NetCDF/vtkNetCDFCFReader.cxx
+++ b/IO/NetCDF/vtkNetCDFCFReader.cxx
@@ -50,7 +50,7 @@
#include <vtksys/RegularExpression.hxx>
#include <vtksys/SystemTools.hxx>
-#include <string.h>
+#include <cstring>
#include "vtk_netcdf.h"
@@ -72,7 +72,7 @@
#include <algorithm>
-#include <math.h>
+#include <cmath>
//=============================================================================
// Convenience function for getting the text attribute on a variable. Returns
diff --git a/IO/NetCDF/vtkNetCDFReader.cxx b/IO/NetCDF/vtkNetCDFReader.cxx
index cf3bd6fc44..c3ef96b2f8 100644
--- a/IO/NetCDF/vtkNetCDFReader.cxx
+++ b/IO/NetCDF/vtkNetCDFReader.cxx
@@ -61,7 +61,7 @@
} \
}
-#include <ctype.h>
+#include <cctype>
class vtkNetCDFReaderPrivate {
public:
diff --git a/IO/NetCDF/vtkSLACReader.cxx b/IO/NetCDF/vtkSLACReader.cxx
index 42330bb0ec..70992b9ed4 100644
--- a/IO/NetCDF/vtkSLACReader.cxx
+++ b/IO/NetCDF/vtkSLACReader.cxx
@@ -55,7 +55,7 @@
#include <vtksys/hash_map.hxx>
#include <vtksys/RegularExpression.hxx>
-#include <math.h>
+#include <cmath>
//=============================================================================
#define CALL_NETCDF(call) \
diff --git a/IO/ODBC/vtkODBCDatabase.cxx b/IO/ODBC/vtkODBCDatabase.cxx
index 957c4c50a3..5e3d2db101 100644
--- a/IO/ODBC/vtkODBCDatabase.cxx
+++ b/IO/ODBC/vtkODBCDatabase.cxx
@@ -42,7 +42,7 @@
#include <sstream>
#include <cassert>
-#include <string.h>
+#include <cstring>
#include <sql.h>
#include <sqlext.h>
diff --git a/IO/PLY/vtkPLY.cxx b/IO/PLY/vtkPLY.cxx
index d94af56ea7..09b31f08e9 100644
--- a/IO/PLY/vtkPLY.cxx
+++ b/IO/PLY/vtkPLY.cxx
@@ -51,7 +51,7 @@ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
#include "vtkByteSwap.h"
#include <cstddef>
-#include <string.h>
+#include <cstring>
#include <cassert>
/* memory allocation */
diff --git a/IO/PLY/vtkPLYReader.cxx b/IO/PLY/vtkPLYReader.cxx
index 87297275f4..b75f6c0d26 100644
--- a/IO/PLY/vtkPLYReader.cxx
+++ b/IO/PLY/vtkPLYReader.cxx
@@ -25,7 +25,7 @@
#include "vtkPolyData.h"
#include "vtkSmartPointer.h"
-#include <ctype.h>
+#include <cctype>
#include <cstddef>
vtkStandardNewMacro(vtkPLYReader);
diff --git a/IO/Parallel/vtkEnSightWriter.cxx b/IO/Parallel/vtkEnSightWriter.cxx
index 182cdf880e..b8f38681ae 100644
--- a/IO/Parallel/vtkEnSightWriter.cxx
+++ b/IO/Parallel/vtkEnSightWriter.cxx
@@ -61,8 +61,8 @@
#include "vtkUnstructuredGrid.h"
#include <errno.h>
-#include <math.h>
-#include <ctype.h>
+#include <cmath>
+#include <cctype>
#include <vector>
#include <list>
diff --git a/IO/ParallelExodus/vtkPExodusIIReader.cxx b/IO/ParallelExodus/vtkPExodusIIReader.cxx
index 04f96278b6..288f6fa4e8 100644
--- a/IO/ParallelExodus/vtkPExodusIIReader.cxx
+++ b/IO/ParallelExodus/vtkPExodusIIReader.cxx
@@ -47,7 +47,7 @@
#include <vtksys/RegularExpression.hxx>
#include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
#undef DBG_PEXOIIRDR
#define vtkPExodusIIReaderMAXPATHLEN 2048
diff --git a/IO/ParallelExodus/vtkPExodusIIWriter.cxx b/IO/ParallelExodus/vtkPExodusIIWriter.cxx
index 06ec085050..e52802e549 100644
--- a/IO/ParallelExodus/vtkPExodusIIWriter.cxx
+++ b/IO/ParallelExodus/vtkPExodusIIWriter.cxx
@@ -43,7 +43,7 @@
#include "vtk_exodusII.h"
#include <ctime>
-#include <ctype.h>
+#include <cctype>
vtkStandardNewMacro (vtkPExodusIIWriter);
diff --git a/IO/SQL/vtkRowQuery.cxx b/IO/SQL/vtkRowQuery.cxx
index 86bc0f7f62..6d3666ccc2 100644
--- a/IO/SQL/vtkRowQuery.cxx
+++ b/IO/SQL/vtkRowQuery.cxx
@@ -24,7 +24,7 @@
#include "algorithm"
#include "vtkVariantArray.h"
-#include <ctype.h>
+#include <cctype>
vtkRowQuery::vtkRowQuery()
diff --git a/IO/Video/vtkMILVideoSource.cxx b/IO/Video/vtkMILVideoSource.cxx
index 52e689fdac..a0759d349d 100644
--- a/IO/Video/vtkMILVideoSource.cxx
+++ b/IO/Video/vtkMILVideoSource.cxx
@@ -18,8 +18,8 @@
#include "vtkCriticalSection.h"
#include <mil.h>
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
vtkStandardNewMacro(vtkMILVideoSource);
diff --git a/IO/Video/vtkWin32VideoSource.cxx b/IO/Video/vtkWin32VideoSource.cxx
index 2ebd6ba31d..9b5fff0ab7 100644
--- a/IO/Video/vtkWin32VideoSource.cxx
+++ b/IO/Video/vtkWin32VideoSource.cxx
@@ -19,7 +19,7 @@
#include "vtkTimerLog.h"
#include "vtkUnsignedCharArray.h"
-#include <ctype.h>
+#include <cctype>
// because of warnings in windows header push and pop the warning level
#ifdef _MSC_VER
diff --git a/IO/XML/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx
index 5209ed70a5..c862432bc7 100644
--- a/IO/XML/vtkXMLWriter.cxx
+++ b/IO/XML/vtkXMLWriter.cxx
@@ -56,7 +56,7 @@
#endif
#if defined(__BORLANDC__)
-#include <ctype.h> // isalnum is defined here for some versions of Borland
+#include <cctype> // isalnum is defined here for some versions of Borland
#endif
#include <locale> // C++ locale
diff --git a/IO/XMLParser/vtkXMLParser.cxx b/IO/XMLParser/vtkXMLParser.cxx
index 89098ef986..40c78cb3f8 100644
--- a/IO/XMLParser/vtkXMLParser.cxx
+++ b/IO/XMLParser/vtkXMLParser.cxx
@@ -15,7 +15,7 @@
#include "vtkXMLParser.h"
#include "vtkObjectFactory.h"
#include "vtk_expat.h"
-#include <ctype.h>
+#include <cctype>
#include <sys/stat.h>
vtkStandardNewMacro(vtkXMLParser);
diff --git a/IO/Xdmf2/vtkXdmfWriter.cxx b/IO/Xdmf2/vtkXdmfWriter.cxx
index 3d59fd5195..f90a986cee 100644
--- a/IO/Xdmf2/vtkXdmfWriter.cxx
+++ b/IO/Xdmf2/vtkXdmfWriter.cxx
@@ -56,7 +56,7 @@
#include <algorithm>
#include <map>
-#include <stdio.h>
+#include <cstdio>
#include <sstream>
#include <vector>
diff --git a/Imaging/Color/vtkImageHSIToRGB.cxx b/Imaging/Color/vtkImageHSIToRGB.cxx
index 651ff0b508..382c124493 100644
--- a/Imaging/Color/vtkImageHSIToRGB.cxx
+++ b/Imaging/Color/vtkImageHSIToRGB.cxx
@@ -18,7 +18,7 @@
#include "vtkImageProgressIterator.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageHSIToRGB);
diff --git a/Imaging/Color/vtkImageLuminance.cxx b/Imaging/Color/vtkImageLuminance.cxx
index 8fcad86e58..628df97c8e 100644
--- a/Imaging/Color/vtkImageLuminance.cxx
+++ b/Imaging/Color/vtkImageLuminance.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageLuminance);
diff --git a/Imaging/Color/vtkImageQuantizeRGBToIndex.cxx b/Imaging/Color/vtkImageQuantizeRGBToIndex.cxx
index a1f7448e9c..ca123b2c35 100644
--- a/Imaging/Color/vtkImageQuantizeRGBToIndex.cxx
+++ b/Imaging/Color/vtkImageQuantizeRGBToIndex.cxx
@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageQuantizeRGBToIndex);
diff --git a/Imaging/Color/vtkImageRGBToHSI.cxx b/Imaging/Color/vtkImageRGBToHSI.cxx
index e9fdb29a9b..6e77e3ef21 100644
--- a/Imaging/Color/vtkImageRGBToHSI.cxx
+++ b/Imaging/Color/vtkImageRGBToHSI.cxx
@@ -19,7 +19,7 @@
#include "vtkImageProgressIterator.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageRGBToHSI);
diff --git a/Imaging/Core/vtkImageBSplineInternals.cxx b/Imaging/Core/vtkImageBSplineInternals.cxx
index 6c0ee80773..2e48e2221e 100644
--- a/Imaging/Core/vtkImageBSplineInternals.cxx
+++ b/Imaging/Core/vtkImageBSplineInternals.cxx
@@ -40,7 +40,7 @@
#include "vtkImageBSplineInternals.h"
#include "vtkAbstractImageInterpolator.h"
#include <cstddef>
-#include <math.h>
+#include <cmath>
/*--------------------------------------------------------------------------*/
void vtkImageBSplineInternals::
diff --git a/Imaging/Core/vtkImageDecomposeFilter.cxx b/Imaging/Core/vtkImageDecomposeFilter.cxx
index 42cb3b0784..545f47498c 100644
--- a/Imaging/Core/vtkImageDecomposeFilter.cxx
+++ b/Imaging/Core/vtkImageDecomposeFilter.cxx
@@ -14,7 +14,7 @@
=========================================================================*/
#include "vtkImageDecomposeFilter.h"
-#include <math.h>
+#include <cmath>
//----------------------------------------------------------------------------
diff --git a/Imaging/Core/vtkImageExtractComponents.cxx b/Imaging/Core/vtkImageExtractComponents.cxx
index 04217c4b8e..c399fe5e69 100644
--- a/Imaging/Core/vtkImageExtractComponents.cxx
+++ b/Imaging/Core/vtkImageExtractComponents.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageExtractComponents);
diff --git a/Imaging/Core/vtkImageResize.cxx b/Imaging/Core/vtkImageResize.cxx
index 0d8fa851ad..7c1b4cecc6 100644
--- a/Imaging/Core/vtkImageResize.cxx
+++ b/Imaging/Core/vtkImageResize.cxx
@@ -32,7 +32,7 @@
# undef VTK_USE_UINT64
# define VTK_USE_UINT64 0
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageResize);
vtkCxxSetObjectMacro(vtkImageResize,Interpolator,vtkAbstractImageInterpolator);
diff --git a/Imaging/Core/vtkImageReslice.cxx b/Imaging/Core/vtkImageReslice.cxx
index 1e8fe4e0eb..3ffe070eab 100644
--- a/Imaging/Core/vtkImageReslice.cxx
+++ b/Imaging/Core/vtkImageReslice.cxx
@@ -37,8 +37,8 @@
# define VTK_USE_UINT64 0
#include <climits>
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
// for uintptr_t
#ifdef _MSC_VER
diff --git a/Imaging/Core/vtkImageResliceToColors.cxx b/Imaging/Core/vtkImageResliceToColors.cxx
index 09dc01ba83..ce349085ed 100644
--- a/Imaging/Core/vtkImageResliceToColors.cxx
+++ b/Imaging/Core/vtkImageResliceToColors.cxx
@@ -31,8 +31,8 @@
# define VTK_USE_UINT64 0
#include <climits>
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
vtkStandardNewMacro(vtkImageResliceToColors);
vtkCxxSetObjectMacro(vtkImageResliceToColors,LookupTable,vtkScalarsToColors);
diff --git a/Imaging/Core/vtkImageShrink3D.cxx b/Imaging/Core/vtkImageShrink3D.cxx
index b094c2a872..aa43913677 100644
--- a/Imaging/Core/vtkImageShrink3D.cxx
+++ b/Imaging/Core/vtkImageShrink3D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageShrink3D);
diff --git a/Imaging/Core/vtkImageStencilData.cxx b/Imaging/Core/vtkImageStencilData.cxx
index d51a34a819..d2f94fd9c6 100644
--- a/Imaging/Core/vtkImageStencilData.cxx
+++ b/Imaging/Core/vtkImageStencilData.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
#include <algorithm>
vtkStandardNewMacro(vtkImageStencilData);
diff --git a/Imaging/Core/vtkRTAnalyticSource.cxx b/Imaging/Core/vtkRTAnalyticSource.cxx
index f3bd8d76d0..9cf6d20912 100644
--- a/Imaging/Core/vtkRTAnalyticSource.cxx
+++ b/Imaging/Core/vtkRTAnalyticSource.cxx
@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkRTAnalyticSource);
diff --git a/Imaging/Fourier/vtkImageButterworthHighPass.cxx b/Imaging/Fourier/vtkImageButterworthHighPass.cxx
index d031756efa..9c9f5f42fa 100644
--- a/Imaging/Fourier/vtkImageButterworthHighPass.cxx
+++ b/Imaging/Fourier/vtkImageButterworthHighPass.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageButterworthHighPass);
diff --git a/Imaging/Fourier/vtkImageButterworthLowPass.cxx b/Imaging/Fourier/vtkImageButterworthLowPass.cxx
index 10ad49ac8f..8f5abae181 100644
--- a/Imaging/Fourier/vtkImageButterworthLowPass.cxx
+++ b/Imaging/Fourier/vtkImageButterworthLowPass.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageButterworthLowPass);
diff --git a/Imaging/Fourier/vtkImageFFT.cxx b/Imaging/Fourier/vtkImageFFT.cxx
index 2c411c672e..bf92a49d25 100644
--- a/Imaging/Fourier/vtkImageFFT.cxx
+++ b/Imaging/Fourier/vtkImageFFT.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageFFT);
diff --git a/Imaging/Fourier/vtkImageFourierCenter.cxx b/Imaging/Fourier/vtkImageFourierCenter.cxx
index a367d0be0c..e65d6c270d 100644
--- a/Imaging/Fourier/vtkImageFourierCenter.cxx
+++ b/Imaging/Fourier/vtkImageFourierCenter.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageFourierCenter);
diff --git a/Imaging/Fourier/vtkImageFourierFilter.cxx b/Imaging/Fourier/vtkImageFourierFilter.cxx
index fa65b2a180..8f2efdd15c 100644
--- a/Imaging/Fourier/vtkImageFourierFilter.cxx
+++ b/Imaging/Fourier/vtkImageFourierFilter.cxx
@@ -15,7 +15,7 @@
#include "vtkImageFourierFilter.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
/*=========================================================================
Vectors of complex numbers.
diff --git a/Imaging/Fourier/vtkImageIdealHighPass.cxx b/Imaging/Fourier/vtkImageIdealHighPass.cxx
index 7b55077e69..ffd96579c2 100644
--- a/Imaging/Fourier/vtkImageIdealHighPass.cxx
+++ b/Imaging/Fourier/vtkImageIdealHighPass.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageIdealHighPass);
diff --git a/Imaging/Fourier/vtkImageIdealLowPass.cxx b/Imaging/Fourier/vtkImageIdealLowPass.cxx
index 326322dfd3..a1d959a31e 100644
--- a/Imaging/Fourier/vtkImageIdealLowPass.cxx
+++ b/Imaging/Fourier/vtkImageIdealLowPass.cxx
@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageIdealLowPass);
diff --git a/Imaging/Fourier/vtkImageRFFT.cxx b/Imaging/Fourier/vtkImageRFFT.cxx
index 61bf4775a5..85a2ccdcda 100644
--- a/Imaging/Fourier/vtkImageRFFT.cxx
+++ b/Imaging/Fourier/vtkImageRFFT.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageRFFT);
diff --git a/Imaging/Fourier/vtkTableFFT.cxx b/Imaging/Fourier/vtkTableFFT.cxx
index 8384244055..ae4b65e6c9 100644
--- a/Imaging/Fourier/vtkTableFFT.cxx
+++ b/Imaging/Fourier/vtkTableFFT.cxx
@@ -33,7 +33,7 @@
#define VTK_CREATE(type, name) \
vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
-#include <string.h>
+#include <cstring>
#include <vtksys/SystemTools.hxx>
using namespace vtksys;
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion2D.cxx b/Imaging/General/vtkImageAnisotropicDiffusion2D.cxx
index 8725e99f40..51de703b24 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion2D.cxx
+++ b/Imaging/General/vtkImageAnisotropicDiffusion2D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageAnisotropicDiffusion2D);
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion3D.cxx b/Imaging/General/vtkImageAnisotropicDiffusion3D.cxx
index ef5f94d4b4..75e199e51f 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion3D.cxx
+++ b/Imaging/General/vtkImageAnisotropicDiffusion3D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageAnisotropicDiffusion3D);
diff --git a/Imaging/General/vtkImageEuclideanDistance.cxx b/Imaging/General/vtkImageEuclideanDistance.cxx
index df5134ee59..e29422ec64 100644
--- a/Imaging/General/vtkImageEuclideanDistance.cxx
+++ b/Imaging/General/vtkImageEuclideanDistance.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageEuclideanDistance);
diff --git a/Imaging/General/vtkImageEuclideanToPolar.cxx b/Imaging/General/vtkImageEuclideanToPolar.cxx
index 290a31768c..4fdc6731ae 100644
--- a/Imaging/General/vtkImageEuclideanToPolar.cxx
+++ b/Imaging/General/vtkImageEuclideanToPolar.cxx
@@ -19,7 +19,7 @@
#include "vtkImageProgressIterator.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageEuclideanToPolar);
diff --git a/Imaging/General/vtkImageGaussianSmooth.cxx b/Imaging/General/vtkImageGaussianSmooth.cxx
index b510be2e53..c8c54b4748 100644
--- a/Imaging/General/vtkImageGaussianSmooth.cxx
+++ b/Imaging/General/vtkImageGaussianSmooth.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageGaussianSmooth);
diff --git a/Imaging/General/vtkImageGradient.cxx b/Imaging/General/vtkImageGradient.cxx
index 1e77cb0dac..6bdd99a6c0 100644
--- a/Imaging/General/vtkImageGradient.cxx
+++ b/Imaging/General/vtkImageGradient.cxx
@@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
#include <sstream>
vtkStandardNewMacro(vtkImageGradient);
diff --git a/Imaging/General/vtkImageGradientMagnitude.cxx b/Imaging/General/vtkImageGradientMagnitude.cxx
index 79158a8c42..cfe93d084f 100644
--- a/Imaging/General/vtkImageGradientMagnitude.cxx
+++ b/Imaging/General/vtkImageGradientMagnitude.cxx
@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageGradientMagnitude);
diff --git a/Imaging/General/vtkImageLaplacian.cxx b/Imaging/General/vtkImageLaplacian.cxx
index 1694b0a139..da2074cfcf 100644
--- a/Imaging/General/vtkImageLaplacian.cxx
+++ b/Imaging/General/vtkImageLaplacian.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageLaplacian);
diff --git a/Imaging/General/vtkImageNormalize.cxx b/Imaging/General/vtkImageNormalize.cxx
index 245d17e0ee..8ff7312aa7 100644
--- a/Imaging/General/vtkImageNormalize.cxx
+++ b/Imaging/General/vtkImageNormalize.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageNormalize);
diff --git a/Imaging/General/vtkImageSlab.cxx b/Imaging/General/vtkImageSlab.cxx
index d18e51c50d..302526fe81 100644
--- a/Imaging/General/vtkImageSlab.cxx
+++ b/Imaging/General/vtkImageSlab.cxx
@@ -31,7 +31,7 @@
# undef VTK_USE_UINT64
# define VTK_USE_UINT64 0
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSlab);
diff --git a/Imaging/General/vtkImageSobel2D.cxx b/Imaging/General/vtkImageSobel2D.cxx
index 3178867d98..92ecb4c6ab 100644
--- a/Imaging/General/vtkImageSobel2D.cxx
+++ b/Imaging/General/vtkImageSobel2D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSobel2D);
diff --git a/Imaging/General/vtkImageSobel3D.cxx b/Imaging/General/vtkImageSobel3D.cxx
index eb9855e8c0..2cd69ccb47 100644
--- a/Imaging/General/vtkImageSobel3D.cxx
+++ b/Imaging/General/vtkImageSobel3D.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSobel3D);
diff --git a/Imaging/General/vtkImageSpatialAlgorithm.cxx b/Imaging/General/vtkImageSpatialAlgorithm.cxx
index d1fc0625ed..b541479bf7 100644
--- a/Imaging/General/vtkImageSpatialAlgorithm.cxx
+++ b/Imaging/General/vtkImageSpatialAlgorithm.cxx
@@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSpatialAlgorithm);
diff --git a/Imaging/Hybrid/vtkCheckerboardSplatter.cxx b/Imaging/Hybrid/vtkCheckerboardSplatter.cxx
index a1bbf55559..fcce8d6e41 100644
--- a/Imaging/Hybrid/vtkCheckerboardSplatter.cxx
+++ b/Imaging/Hybrid/vtkCheckerboardSplatter.cxx
@@ -29,7 +29,7 @@
#include "vtkSMPTools.h"
#include <algorithm>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCheckerboardSplatter);
diff --git a/Imaging/Hybrid/vtkGaussianSplatter.cxx b/Imaging/Hybrid/vtkGaussianSplatter.cxx
index 23233119ae..52900c4b1c 100644
--- a/Imaging/Hybrid/vtkGaussianSplatter.cxx
+++ b/Imaging/Hybrid/vtkGaussianSplatter.cxx
@@ -29,7 +29,7 @@
#include "vtkSMPTools.h"
#include <algorithm>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkGaussianSplatter);
diff --git a/Imaging/Hybrid/vtkVoxelModeller.cxx b/Imaging/Hybrid/vtkVoxelModeller.cxx
index c959ba0185..0ce626a2a5 100644
--- a/Imaging/Hybrid/vtkVoxelModeller.cxx
+++ b/Imaging/Hybrid/vtkVoxelModeller.cxx
@@ -23,7 +23,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkVoxelModeller);
diff --git a/Imaging/Math/vtkImageDivergence.cxx b/Imaging/Math/vtkImageDivergence.cxx
index bbff9563a1..c09db38c8d 100644
--- a/Imaging/Math/vtkImageDivergence.cxx
+++ b/Imaging/Math/vtkImageDivergence.cxx
@@ -21,7 +21,7 @@
#include "vtkDataSetAttributes.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageDivergence);
diff --git a/Imaging/Math/vtkImageLogarithmicScale.cxx b/Imaging/Math/vtkImageLogarithmicScale.cxx
index d584325f1c..ed2b3cdc84 100644
--- a/Imaging/Math/vtkImageLogarithmicScale.cxx
+++ b/Imaging/Math/vtkImageLogarithmicScale.cxx
@@ -18,7 +18,7 @@
#include "vtkImageProgressIterator.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageLogarithmicScale);
diff --git a/Imaging/Math/vtkImageLogic.cxx b/Imaging/Math/vtkImageLogic.cxx
index 0954beaa2c..450e0b3419 100644
--- a/Imaging/Math/vtkImageLogic.cxx
+++ b/Imaging/Math/vtkImageLogic.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageLogic);
diff --git a/Imaging/Math/vtkImageMagnitude.cxx b/Imaging/Math/vtkImageMagnitude.cxx
index d899746ae6..1db75266fd 100644
--- a/Imaging/Math/vtkImageMagnitude.cxx
+++ b/Imaging/Math/vtkImageMagnitude.cxx
@@ -23,7 +23,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageMagnitude);
diff --git a/Imaging/Math/vtkImageMaskBits.cxx b/Imaging/Math/vtkImageMaskBits.cxx
index 0511d8a4f7..b2a954fc52 100644
--- a/Imaging/Math/vtkImageMaskBits.cxx
+++ b/Imaging/Math/vtkImageMaskBits.cxx
@@ -18,7 +18,7 @@
#include "vtkImageProgressIterator.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageMaskBits);
diff --git a/Imaging/Math/vtkImageMathematics.cxx b/Imaging/Math/vtkImageMathematics.cxx
index cbe172f10a..fce1cea971 100644
--- a/Imaging/Math/vtkImageMathematics.cxx
+++ b/Imaging/Math/vtkImageMathematics.cxx
@@ -20,7 +20,7 @@
#include "vtkInformationVector.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageMathematics);
diff --git a/Imaging/Morphological/vtkImageNonMaximumSuppression.cxx b/Imaging/Morphological/vtkImageNonMaximumSuppression.cxx
index 3ce0258d3e..7d2f6a2731 100644
--- a/Imaging/Morphological/vtkImageNonMaximumSuppression.cxx
+++ b/Imaging/Morphological/vtkImageNonMaximumSuppression.cxx
@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageNonMaximumSuppression);
diff --git a/Imaging/Morphological/vtkImageOpenClose3D.cxx b/Imaging/Morphological/vtkImageOpenClose3D.cxx
index d606da2549..a6cc0b9a7f 100644
--- a/Imaging/Morphological/vtkImageOpenClose3D.cxx
+++ b/Imaging/Morphological/vtkImageOpenClose3D.cxx
@@ -24,7 +24,7 @@
#include "vtkInformationVector.h"
#include "vtkExecutive.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageOpenClose3D);
diff --git a/Imaging/Sources/vtkImageCanvasSource2D.cxx b/Imaging/Sources/vtkImageCanvasSource2D.cxx
index f6abfca10a..5790e681a4 100644
--- a/Imaging/Sources/vtkImageCanvasSource2D.cxx
+++ b/Imaging/Sources/vtkImageCanvasSource2D.cxx
@@ -24,7 +24,7 @@
#include "vtkImageData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
//
// Special classes for manipulating data
diff --git a/Imaging/Sources/vtkImageGaussianSource.cxx b/Imaging/Sources/vtkImageGaussianSource.cxx
index 8b46531d94..74478f13c9 100644
--- a/Imaging/Sources/vtkImageGaussianSource.cxx
+++ b/Imaging/Sources/vtkImageGaussianSource.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageGaussianSource);
diff --git a/Imaging/Sources/vtkImageGridSource.cxx b/Imaging/Sources/vtkImageGridSource.cxx
index 826fe25dcb..42894559af 100644
--- a/Imaging/Sources/vtkImageGridSource.cxx
+++ b/Imaging/Sources/vtkImageGridSource.cxx
@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageGridSource);
diff --git a/Imaging/Sources/vtkImageSinusoidSource.cxx b/Imaging/Sources/vtkImageSinusoidSource.cxx
index eab5036ec2..3aab75dda3 100644
--- a/Imaging/Sources/vtkImageSinusoidSource.cxx
+++ b/Imaging/Sources/vtkImageSinusoidSource.cxx
@@ -21,7 +21,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSinusoidSource);
diff --git a/Imaging/Statistics/vtkImageAccumulate.cxx b/Imaging/Statistics/vtkImageAccumulate.cxx
index 3cecd03173..6486d18e14 100644
--- a/Imaging/Statistics/vtkImageAccumulate.cxx
+++ b/Imaging/Statistics/vtkImageAccumulate.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageAccumulate);
diff --git a/Imaging/Statistics/vtkImageHistogram.cxx b/Imaging/Statistics/vtkImageHistogram.cxx
index a6e8705e97..00f31111c3 100644
--- a/Imaging/Statistics/vtkImageHistogram.cxx
+++ b/Imaging/Statistics/vtkImageHistogram.cxx
@@ -26,7 +26,7 @@
#include "vtkMultiThreader.h"
#include "vtkTemplateAliasMacro.h"
-#include <math.h>
+#include <cmath>
// turn off 64-bit ints when templating over all types
# undef VTK_USE_INT64
diff --git a/Imaging/Statistics/vtkImageHistogramStatistics.cxx b/Imaging/Statistics/vtkImageHistogramStatistics.cxx
index 293a409ffe..c819aa0fec 100644
--- a/Imaging/Statistics/vtkImageHistogramStatistics.cxx
+++ b/Imaging/Statistics/vtkImageHistogramStatistics.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include "vtkIdTypeArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageHistogramStatistics);
diff --git a/Imaging/Stencil/vtkImageStencil.cxx b/Imaging/Stencil/vtkImageStencil.cxx
index a21155f01b..e8533678cc 100644
--- a/Imaging/Stencil/vtkImageStencil.cxx
+++ b/Imaging/Stencil/vtkImageStencil.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageStencil);
diff --git a/Imaging/Stencil/vtkImageToImageStencil.cxx b/Imaging/Stencil/vtkImageToImageStencil.cxx
index 478c07b30f..cd671e2add 100644
--- a/Imaging/Stencil/vtkImageToImageStencil.cxx
+++ b/Imaging/Stencil/vtkImageToImageStencil.cxx
@@ -23,7 +23,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageToImageStencil);
diff --git a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx
index a3757f56cb..d5a045ea1f 100644
--- a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx
+++ b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx
@@ -22,7 +22,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImplicitFunctionToImageStencil);
vtkCxxSetObjectMacro(vtkImplicitFunctionToImageStencil, Input,
diff --git a/Imaging/Stencil/vtkLassoStencilSource.cxx b/Imaging/Stencil/vtkLassoStencilSource.cxx
index f2d4e367df..2c5920902a 100644
--- a/Imaging/Stencil/vtkLassoStencilSource.cxx
+++ b/Imaging/Stencil/vtkLassoStencilSource.cxx
@@ -26,7 +26,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
#include <map>
vtkStandardNewMacro(vtkLassoStencilSource);
diff --git a/Imaging/Stencil/vtkPolyDataToImageStencil.cxx b/Imaging/Stencil/vtkPolyDataToImageStencil.cxx
index 07f4fc77ae..020f87958e 100644
--- a/Imaging/Stencil/vtkPolyDataToImageStencil.cxx
+++ b/Imaging/Stencil/vtkPolyDataToImageStencil.cxx
@@ -68,7 +68,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include <utility>
#include <algorithm>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkPolyDataToImageStencil);
diff --git a/Imaging/Stencil/vtkROIStencilSource.cxx b/Imaging/Stencil/vtkROIStencilSource.cxx
index 1c2e5f3d8d..99bf438c29 100644
--- a/Imaging/Stencil/vtkROIStencilSource.cxx
+++ b/Imaging/Stencil/vtkROIStencilSource.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkROIStencilSource);
diff --git a/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx
index 15f2aab823..c5f0e53608 100644
--- a/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx
+++ b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx
@@ -34,7 +34,7 @@
#error "vtkBoostLogWeighting requires Boost 1.34.0 or later"
#endif
-#include <math.h>
+#include <cmath>
#include <stdexcept>
///////////////////////////////////////////////////////////////////////////////
diff --git a/Infovis/Core/vtkTreeFieldAggregator.cxx b/Infovis/Core/vtkTreeFieldAggregator.cxx
index 4e1dbd395d..93b1745813 100644
--- a/Infovis/Core/vtkTreeFieldAggregator.cxx
+++ b/Infovis/Core/vtkTreeFieldAggregator.cxx
@@ -37,7 +37,7 @@
#include "vtkTreeDFSIterator.h"
#include "vtkVariantArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkTreeFieldAggregator);
diff --git a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx
index 1702e17efe..4961221fbb 100644
--- a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx
+++ b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx
@@ -33,7 +33,7 @@
#include <vector>
#include <limits>
#include <list>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkCirclePackFrontChainLayoutStrategy);
diff --git a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
index 49f3346219..ca9bcf387a 100644
--- a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
+++ b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx
@@ -13,7 +13,7 @@
#include <vector>
#include <algorithm>
-#include <math.h>
+#include <cmath>
#ifdef VTK_USE_BOOST
# include "vtkBoostBreadthFirstSearchTree.h"
diff --git a/Interaction/Widgets/vtkImageOrthoPlanes.cxx b/Interaction/Widgets/vtkImageOrthoPlanes.cxx
index 3d0580b82d..ccefbc2896 100644
--- a/Interaction/Widgets/vtkImageOrthoPlanes.cxx
+++ b/Interaction/Widgets/vtkImageOrthoPlanes.cxx
@@ -26,7 +26,7 @@
#include "vtkInformation.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
//---------------------------------------------------------------------------
diff --git a/Interaction/Widgets/vtkImplicitCylinderRepresentation.cxx b/Interaction/Widgets/vtkImplicitCylinderRepresentation.cxx
index d0d8614477..056dc9bbe7 100644
--- a/Interaction/Widgets/vtkImplicitCylinderRepresentation.cxx
+++ b/Interaction/Widgets/vtkImplicitCylinderRepresentation.cxx
@@ -50,7 +50,7 @@
#include "vtkCommand.h"
#include "vtkWindow.h"
-#include <float.h> //for FLT_EPSILON
+#include <cfloat> //for FLT_EPSILON
vtkStandardNewMacro(vtkImplicitCylinderRepresentation);
diff --git a/Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx b/Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx
index f2d4397735..f52a6bd0bb 100644
--- a/Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx
+++ b/Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx
@@ -46,7 +46,7 @@
#include "vtkCommand.h"
#include "vtkWindow.h"
-#include <float.h> //for FLT_EPSILON
+#include <cfloat> //for FLT_EPSILON
vtkStandardNewMacro(vtkImplicitPlaneRepresentation);
diff --git a/Interaction/Widgets/vtkResliceCursor.cxx b/Interaction/Widgets/vtkResliceCursor.cxx
index db5a9c0e4e..46f2707766 100644
--- a/Interaction/Widgets/vtkResliceCursor.cxx
+++ b/Interaction/Widgets/vtkResliceCursor.cxx
@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointer.h"
-#include <math.h>
+#include <cmath>
//----------------------------------------------------------------------------
diff --git a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx
index 1c2737076a..40969f683f 100644
--- a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx
+++ b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx
@@ -30,7 +30,7 @@
#include "vtkSmartPointer.h"
#include "vtkLinearExtrusionFilter.h"
#include "vtkMath.h"
-#include <math.h>
+#include <cmath>
#include <algorithm>
vtkStandardNewMacro(vtkResliceCursorPolyDataAlgorithm);
diff --git a/Rendering/Annotation/vtkAxisFollower.cxx b/Rendering/Annotation/vtkAxisFollower.cxx
index 14662e5715..07284e8b6c 100644
--- a/Rendering/Annotation/vtkAxisFollower.cxx
+++ b/Rendering/Annotation/vtkAxisFollower.cxx
@@ -28,7 +28,7 @@
#include "vtkTexture.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkAxisFollower);
diff --git a/Rendering/Annotation/vtkProp3DAxisFollower.cxx b/Rendering/Annotation/vtkProp3DAxisFollower.cxx
index e0cca286d5..729f15bf5c 100644
--- a/Rendering/Annotation/vtkProp3DAxisFollower.cxx
+++ b/Rendering/Annotation/vtkProp3DAxisFollower.cxx
@@ -26,7 +26,7 @@
#include "vtkTexture.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkProp3DAxisFollower);
diff --git a/Rendering/Annotation/vtkScalarBarActor.cxx b/Rendering/Annotation/vtkScalarBarActor.cxx
index 1a7ff9718b..bee2b74645 100644
--- a/Rendering/Annotation/vtkScalarBarActor.cxx
+++ b/Rendering/Annotation/vtkScalarBarActor.cxx
@@ -43,7 +43,7 @@
#include <set>
#include <map>
-#include <stdio.h> // for snprintf
+#include <cstdio> // for snprintf
#if defined(_WIN32) && !defined(__CYGWIN__)
# define SNPRINTF _snprintf
diff --git a/Rendering/Core/vtkActor.cxx b/Rendering/Core/vtkActor.cxx
index b2a96b8922..1c72422506 100644
--- a/Rendering/Core/vtkActor.cxx
+++ b/Rendering/Core/vtkActor.cxx
@@ -31,7 +31,7 @@
#include "vtkTexture.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkCxxSetObjectMacro(vtkActor,Texture,vtkTexture);
vtkCxxSetObjectMacro(vtkActor,Mapper,vtkMapper);
diff --git a/Rendering/Core/vtkCamera.cxx b/Rendering/Core/vtkCamera.cxx
index c86b848387..de7645df58 100644
--- a/Rendering/Core/vtkCamera.cxx
+++ b/Rendering/Core/vtkCamera.cxx
@@ -22,7 +22,7 @@
#include "vtkCallbackCommand.h"
#include "vtkRenderer.h"
-#include <math.h>
+#include <cmath>
//----------------------------------------------------------------------------
// Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx
index 9ef61cfca5..d558fa7665 100644
--- a/Rendering/Core/vtkColorTransferFunction.cxx
+++ b/Rendering/Core/vtkColorTransferFunction.cxx
@@ -19,7 +19,7 @@
#include <algorithm>
#include <iterator>
-#include <math.h>
+#include <cmath>
#include <set>
#include <vector>
diff --git a/Rendering/Core/vtkFollower.cxx b/Rendering/Core/vtkFollower.cxx
index 345c021a1a..596ea909f2 100644
--- a/Rendering/Core/vtkFollower.cxx
+++ b/Rendering/Core/vtkFollower.cxx
@@ -24,7 +24,7 @@
#include "vtkTexture.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFollower);
diff --git a/Rendering/Core/vtkImageSlice.cxx b/Rendering/Core/vtkImageSlice.cxx
index df21da4df6..44e891c563 100644
--- a/Rendering/Core/vtkImageSlice.cxx
+++ b/Rendering/Core/vtkImageSlice.cxx
@@ -26,7 +26,7 @@
#include "vtkRenderer.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkImageSlice);
diff --git a/Rendering/Core/vtkLODProp3D.cxx b/Rendering/Core/vtkLODProp3D.cxx
index a7a17d302b..2da2059e08 100644
--- a/Rendering/Core/vtkLODProp3D.cxx
+++ b/Rendering/Core/vtkLODProp3D.cxx
@@ -26,7 +26,7 @@
#include "vtkImageMapper3D.h"
#include "vtkLinearTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkLODProp3D);
diff --git a/Rendering/Core/vtkLightCollection.cxx b/Rendering/Core/vtkLightCollection.cxx
index cbde68da2f..dca4028afd 100644
--- a/Rendering/Core/vtkLightCollection.cxx
+++ b/Rendering/Core/vtkLightCollection.cxx
@@ -17,7 +17,7 @@
#include "vtkObjectFactory.h"
#include "vtkLight.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkLightCollection);
diff --git a/Rendering/Core/vtkLogLookupTable.cxx b/Rendering/Core/vtkLogLookupTable.cxx
index 604f99a10c..7f85d9755f 100644
--- a/Rendering/Core/vtkLogLookupTable.cxx
+++ b/Rendering/Core/vtkLogLookupTable.cxx
@@ -15,7 +15,7 @@
#include "vtkLogLookupTable.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkLogLookupTable);
diff --git a/Rendering/Core/vtkMapArrayValues.cxx b/Rendering/Core/vtkMapArrayValues.cxx
index 92b3197d1e..e7b9c98556 100644
--- a/Rendering/Core/vtkMapArrayValues.cxx
+++ b/Rendering/Core/vtkMapArrayValues.cxx
@@ -29,7 +29,7 @@
#include "vtkStringArray.h"
#include "vtkTable.h"
#include "vtkVariant.h"
-#include <ctype.h>
+#include <cctype>
#include <map>
#include <utility>
diff --git a/Rendering/Core/vtkProp3D.cxx b/Rendering/Core/vtkProp3D.cxx
index cf5bdce2f4..b4bb186ac5 100644
--- a/Rendering/Core/vtkProp3D.cxx
+++ b/Rendering/Core/vtkProp3D.cxx
@@ -20,7 +20,7 @@
#include "vtkMatrixToLinearTransform.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
//----------------------------------------------------------------------------
diff --git a/Rendering/Core/vtkProp3DFollower.cxx b/Rendering/Core/vtkProp3DFollower.cxx
index 6ec8ddac99..eac19a88fa 100644
--- a/Rendering/Core/vtkProp3DFollower.cxx
+++ b/Rendering/Core/vtkProp3DFollower.cxx
@@ -24,7 +24,7 @@
#include "vtkTransform.h"
#include "vtkAssemblyPaths.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkProp3DFollower);
diff --git a/Rendering/Core/vtkVolume.cxx b/Rendering/Core/vtkVolume.cxx
index ae89809e3d..542800685d 100644
--- a/Rendering/Core/vtkVolume.cxx
+++ b/Rendering/Core/vtkVolume.cxx
@@ -29,7 +29,7 @@
#include "vtkVolumeCollection.h"
#include "vtkVolumeProperty.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkVolume);
diff --git a/Rendering/Core/vtkWindowLevelLookupTable.cxx b/Rendering/Core/vtkWindowLevelLookupTable.cxx
index 6e7b781ad9..b6e60320fb 100644
--- a/Rendering/Core/vtkWindowLevelLookupTable.cxx
+++ b/Rendering/Core/vtkWindowLevelLookupTable.cxx
@@ -15,7 +15,7 @@
#include "vtkWindowLevelLookupTable.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkWindowLevelLookupTable);
diff --git a/Rendering/External/vtkExternalOpenGLCamera.cxx b/Rendering/External/vtkExternalOpenGLCamera.cxx
index 1e0292fbc7..fdbbbd6fd3 100644
--- a/Rendering/External/vtkExternalOpenGLCamera.cxx
+++ b/Rendering/External/vtkExternalOpenGLCamera.cxx
@@ -28,7 +28,7 @@
#include "vtkRenderer.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkExternalOpenGLCamera);
diff --git a/Rendering/LOD/vtkLODActor.cxx b/Rendering/LOD/vtkLODActor.cxx
index efd2d00271..d58b84e77e 100644
--- a/Rendering/LOD/vtkLODActor.cxx
+++ b/Rendering/LOD/vtkLODActor.cxx
@@ -26,7 +26,7 @@
#include "vtkTexture.h"
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkLODActor);
vtkCxxSetObjectMacro(vtkLODActor, LowResFilter, vtkPolyDataAlgorithm);
diff --git a/Rendering/OpenGL/vtkOpenGLActor.cxx b/Rendering/OpenGL/vtkOpenGLActor.cxx
index 0aad7f4d59..cc4eb0d607 100644
--- a/Rendering/OpenGL/vtkOpenGLActor.cxx
+++ b/Rendering/OpenGL/vtkOpenGLActor.cxx
@@ -22,7 +22,7 @@
#include "vtkOpenGLError.h"
#include "vtkOpenGL.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLActor);
diff --git a/Rendering/OpenGL/vtkOpenGLCamera.cxx b/Rendering/OpenGL/vtkOpenGLCamera.cxx
index 09313bdc4c..20f1d8e3a0 100644
--- a/Rendering/OpenGL/vtkOpenGLCamera.cxx
+++ b/Rendering/OpenGL/vtkOpenGLCamera.cxx
@@ -24,7 +24,7 @@
#include "vtkOpenGL.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLCamera);
diff --git a/Rendering/OpenGL/vtkOpenGLExtensionManager.cxx b/Rendering/OpenGL/vtkOpenGLExtensionManager.cxx
index 71508744e9..302ded28a7 100644
--- a/Rendering/OpenGL/vtkOpenGLExtensionManager.cxx
+++ b/Rendering/OpenGL/vtkOpenGLExtensionManager.cxx
@@ -27,7 +27,7 @@
#include "vtkRenderWindow.h"
#include "vtkObjectFactory.h"
-#include <string.h>
+#include <cstring>
#include <string>
#include <cassert>
#include <sstream>
diff --git a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx
index ada98cb25e..736149e27b 100644
--- a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx
+++ b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx
@@ -36,7 +36,7 @@
#include "vtkInformationVector.h"
-#include <math.h>
+#include <cmath>
#include "vtkOpenGL.h"
#include "vtkOpenGLError.h"
diff --git a/Rendering/OpenGL/vtkOpenGLLight.cxx b/Rendering/OpenGL/vtkOpenGLLight.cxx
index 9801f26fca..852933c7ba 100644
--- a/Rendering/OpenGL/vtkOpenGLLight.cxx
+++ b/Rendering/OpenGL/vtkOpenGLLight.cxx
@@ -21,7 +21,7 @@
#include "vtkOpenGL.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLLight);
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.cxx b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.cxx
index 2482524463..b6a9411250 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.cxx
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.cxx
@@ -38,7 +38,7 @@
#include "vtkOpenGL.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLPolyDataMapper);
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.cxx b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.cxx
index fe99a6c9d3..da36b3a807 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.cxx
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.cxx
@@ -30,7 +30,7 @@
#include "vtkWindow.h"
#include "vtkgluPickMatrix.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLPolyDataMapper2D);
diff --git a/Rendering/OpenGL/vtkOpenGLRenderer.cxx b/Rendering/OpenGL/vtkOpenGLRenderer.cxx
index 47463ccbec..ac96d1cd09 100644
--- a/Rendering/OpenGL/vtkOpenGLRenderer.cxx
+++ b/Rendering/OpenGL/vtkOpenGLRenderer.cxx
@@ -36,7 +36,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkShaderProgram2.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
#include <list>
diff --git a/Rendering/OpenGL/vtkOpenGLTexture.cxx b/Rendering/OpenGL/vtkOpenGLTexture.cxx
index b0685786ae..83f7d262cc 100644
--- a/Rendering/OpenGL/vtkOpenGLTexture.cxx
+++ b/Rendering/OpenGL/vtkOpenGLTexture.cxx
@@ -30,7 +30,7 @@
#include "vtkOpenGLError.h"
#include "vtkgl.h" // vtkgl namespace
-#include <math.h>
+#include <cmath>
// ----------------------------------------------------------------------------
diff --git a/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.cxx b/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.cxx
index eef33391e8..cce22663e9 100644
--- a/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL/vtkWin32OpenGLRenderWindow.cxx
@@ -24,7 +24,7 @@
#include "vtkTypeTraits.h"
#include "vtkWin32RenderWindowInteractor.h"
-#include <math.h>
+#include <cmath>
#include <sstream>
#include "vtkOpenGL.h"
diff --git a/Rendering/OpenGL/vtkWin32RenderWindowInteractor.cxx b/Rendering/OpenGL/vtkWin32RenderWindowInteractor.cxx
index c5a8ec5bd7..67f142ed3b 100644
--- a/Rendering/OpenGL/vtkWin32RenderWindowInteractor.cxx
+++ b/Rendering/OpenGL/vtkWin32RenderWindowInteractor.cxx
@@ -12,10 +12,10 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib>
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
#ifndef _WIN32_WINNT
diff --git a/Rendering/OpenGL/vtkXRenderWindowInteractor.cxx b/Rendering/OpenGL/vtkXRenderWindowInteractor.cxx
index 7ea65fdf9e..1cfdc08637 100644
--- a/Rendering/OpenGL/vtkXRenderWindowInteractor.cxx
+++ b/Rendering/OpenGL/vtkXRenderWindowInteractor.cxx
@@ -12,9 +12,9 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
-#include <stdio.h>
+#include <cstdio>
#include <cstdlib>
-#include <string.h>
+#include <cstring>
// We have to define XTSTRINGDEFINES (used in X11/StringDefs.h and X11/Shell.h)
// otherwise the string are define as char * instead of const char which can
@@ -28,7 +28,7 @@
#include "vtkCallbackCommand.h"
#include "vtkActor.h"
#include <X11/Shell.h>
-#include <math.h>
+#include <cmath>
#include "vtkObjectFactory.h"
#include "vtkCommand.h"
diff --git a/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.cxx b/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.cxx
index de3a6c27dc..973814a07d 100644
--- a/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.cxx
+++ b/Rendering/OpenGL2/vtkAndroidRenderWindowInteractor.cxx
@@ -12,11 +12,11 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+#include <cassert>
#include "vtkAndroidRenderWindowInteractor.h"
#include "vtkEGLRenderWindow.h"
diff --git a/Rendering/OpenGL2/vtkDepthImageProcessingPass.cxx b/Rendering/OpenGL2/vtkDepthImageProcessingPass.cxx
index fe611f3f64..f7741ece40 100644
--- a/Rendering/OpenGL2/vtkDepthImageProcessingPass.cxx
+++ b/Rendering/OpenGL2/vtkDepthImageProcessingPass.cxx
@@ -38,7 +38,7 @@ Ph.D. thesis of Christian BOUCHENY.
#include "vtkDepthImageProcessingPass.h"
#include "vtkObjectFactory.h"
-#include <assert.h>
+#include <cassert>
#include "vtkRenderState.h"
#include "vtkRenderer.h"
#include "vtkFrameBufferObject.h"
diff --git a/Rendering/OpenGL2/vtkEDLShading.cxx b/Rendering/OpenGL2/vtkEDLShading.cxx
index 1f1227aa34..64999ebc93 100644
--- a/Rendering/OpenGL2/vtkEDLShading.cxx
+++ b/Rendering/OpenGL2/vtkEDLShading.cxx
@@ -51,7 +51,7 @@ Ph.D. thesis of Christian BOUCHENY.
#include "vtkShaderProgram.h"
#include "vtkTextureObject.h"
#include "vtk_glew.h"
-#include <assert.h>
+#include <cassert>
#include <sstream>
#include <string>
diff --git a/Rendering/OpenGL2/vtkOpenGLActor.cxx b/Rendering/OpenGL2/vtkOpenGLActor.cxx
index 0e150a187e..7becdc5a64 100644
--- a/Rendering/OpenGL2/vtkOpenGLActor.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLActor.cxx
@@ -27,7 +27,7 @@
#include "vtkRenderWindow.h"
#include "vtkTransform.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLActor);
diff --git a/Rendering/OpenGL2/vtkOpenGLCamera.cxx b/Rendering/OpenGL2/vtkOpenGLCamera.cxx
index 1e1825403d..b22f5c1281 100644
--- a/Rendering/OpenGL2/vtkOpenGLCamera.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLCamera.cxx
@@ -21,7 +21,7 @@
#include "vtkOpenGLRenderWindow.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLCamera);
diff --git a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.cxx b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.cxx
index a26f656fba..27c5043466 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.cxx
@@ -47,7 +47,7 @@
#include "vtkActor.h"
#include "vtkProperty.h"
-#include <math.h>
+#include <cmath>
#include "vtkOpenGLError.h"
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderer.cxx b/Rendering/OpenGL2/vtkOpenGLRenderer.cxx
index 44b8772ffb..91e27cc322 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderer.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLRenderer.cxx
@@ -43,7 +43,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkTrivialProducer.h"
#include "vtkUnsignedCharArray.h"
-#include <math.h>
+#include <cmath>
#include <cassert>
#include <list>
diff --git a/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx b/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx
index 263c0aee4c..06b705f4f2 100644
--- a/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLShaderCache.cxx
@@ -22,7 +22,7 @@
#include "vtkShaderProgram.h"
#include "vtkOpenGLHelper.h"
-#include <math.h>
+#include <cmath>
#include <sstream>
diff --git a/Rendering/OpenGL2/vtkOpenGLTexture.cxx b/Rendering/OpenGL2/vtkOpenGLTexture.cxx
index b10e96b6f8..0a6c95dd7c 100644
--- a/Rendering/OpenGL2/vtkOpenGLTexture.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLTexture.cxx
@@ -29,7 +29,7 @@
#include "vtkOpenGLRenderWindow.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
// ---------------------------------------------------------------------------
diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
index d479615787..49e2ba51c2 100644
--- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.cxx
@@ -26,7 +26,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkStringOutputWindow.h"
#include "vtkWin32RenderWindowInteractor.h"
-#include <math.h>
+#include <cmath>
#include <sstream>
#include "vtkOpenGLError.h"
diff --git a/Rendering/OpenGL2/vtkWin32RenderWindowInteractor.cxx b/Rendering/OpenGL2/vtkWin32RenderWindowInteractor.cxx
index 633cbd9766..4c173a0766 100644
--- a/Rendering/OpenGL2/vtkWin32RenderWindowInteractor.cxx
+++ b/Rendering/OpenGL2/vtkWin32RenderWindowInteractor.cxx
@@ -12,10 +12,10 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
#ifndef _WIN32_WINNT
diff --git a/Rendering/OpenGL2/vtkXRenderWindowInteractor.cxx b/Rendering/OpenGL2/vtkXRenderWindowInteractor.cxx
index 855df97efa..a3aa0f52de 100644
--- a/Rendering/OpenGL2/vtkXRenderWindowInteractor.cxx
+++ b/Rendering/OpenGL2/vtkXRenderWindowInteractor.cxx
@@ -12,9 +12,9 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
// We have to define XTSTRINGDEFINES (used in X11/StringDefs.h and X11/Shell.h)
// otherwise the string are define as char * instead of const char which can
@@ -28,7 +28,7 @@
#include "vtkCallbackCommand.h"
#include "vtkActor.h"
#include <X11/Shell.h>
-#include <math.h>
+#include <cmath>
#include "vtkObjectFactory.h"
#include "vtkCommand.h"
diff --git a/Rendering/Qt/vtkQImageToImageSource.cxx b/Rendering/Qt/vtkQImageToImageSource.cxx
index 7fc3124db5..6b361cc8e0 100644
--- a/Rendering/Qt/vtkQImageToImageSource.cxx
+++ b/Rendering/Qt/vtkQImageToImageSource.cxx
@@ -24,7 +24,7 @@
#include <QApplication>
#include <QImage>
-#include <math.h>
+#include <cmath>
#include "vtkSmartPointer.h"
#define VTK_CREATE(type, name) \
diff --git a/Rendering/Volume/vtkEncodedGradientEstimator.cxx b/Rendering/Volume/vtkEncodedGradientEstimator.cxx
index c0a0f50291..b1faf1b763 100644
--- a/Rendering/Volume/vtkEncodedGradientEstimator.cxx
+++ b/Rendering/Volume/vtkEncodedGradientEstimator.cxx
@@ -20,7 +20,7 @@
#include "vtkRecursiveSphereDirectionEncoder.h"
#include "vtkTimerLog.h"
-#include <math.h>
+#include <cmath>
vtkCxxSetObjectMacro(vtkEncodedGradientEstimator, InputData, vtkImageData );
diff --git a/Rendering/Volume/vtkEncodedGradientShader.cxx b/Rendering/Volume/vtkEncodedGradientShader.cxx
index 40e9e3645d..89e6b31090 100644
--- a/Rendering/Volume/vtkEncodedGradientShader.cxx
+++ b/Rendering/Volume/vtkEncodedGradientShader.cxx
@@ -26,7 +26,7 @@
#include "vtkVolume.h"
#include "vtkVolumeProperty.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkEncodedGradientShader);
diff --git a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.cxx b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.cxx
index 95309653ad..b2a1e9c436 100644
--- a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.cxx
+++ b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.cxx
@@ -30,7 +30,7 @@
#include "vtkUnsignedLongArray.h"
#include "vtkUnsignedShortArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFiniteDifferenceGradientEstimator);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
index 30f62af3b1..582fa54dde 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
@@ -25,7 +25,7 @@
#include "vtkFixedPointRayCastImage.h"
#include "vtkDataArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeGOHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
index d5838be7ce..b2e29240c5 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
@@ -25,7 +25,7 @@
#include "vtkFixedPointRayCastImage.h"
#include "vtkDataArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.cxx
index b481d998cc..96589cf5b0 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.cxx
@@ -25,7 +25,7 @@
#include "vtkFixedPointRayCastImage.h"
#include "vtkDataArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
index 0b68bb41d6..98b107e7e2 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
@@ -25,7 +25,7 @@
#include "vtkFixedPointRayCastImage.h"
#include "vtkDataArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.cxx
index 708cffebfd..d243edd5c5 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.cxx
@@ -15,7 +15,7 @@
#include "vtkFixedPointVolumeRayCastHelper.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.cxx
index fb230065f3..ba9ef54a36 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.cxx
@@ -24,7 +24,7 @@
#include "vtkFixedPointRayCastImage.h"
#include "vtkDataArray.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastMIPHelper);
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.cxx b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.cxx
index cd64ce0ca5..ac294b7889 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.cxx
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.cxx
@@ -46,7 +46,7 @@
#include "vtkVolumeRayCastSpaceLeapingImageFilter.h"
#include <exception>
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkFixedPointVolumeRayCastMapper);
vtkCxxSetObjectMacro(vtkFixedPointVolumeRayCastMapper, RayCastImage, vtkFixedPointRayCastImage);
diff --git a/Rendering/Volume/vtkHAVSVolumeMapper.cxx b/Rendering/Volume/vtkHAVSVolumeMapper.cxx
index c34e3fe6b4..526e84cf91 100644
--- a/Rendering/Volume/vtkHAVSVolumeMapper.cxx
+++ b/Rendering/Volume/vtkHAVSVolumeMapper.cxx
@@ -36,7 +36,7 @@ PURPOSE. See the above copyright notice for more information.
#include <set>
#include <vector>
-#include <math.h>
+#include <cmath>
// Return NULL if no override is supplied.
vtkAbstractObjectFactoryNewMacro(vtkHAVSVolumeMapper)
diff --git a/Rendering/Volume/vtkProjectedTetrahedraMapper.cxx b/Rendering/Volume/vtkProjectedTetrahedraMapper.cxx
index 462b91f2d9..b4a3f040ef 100644
--- a/Rendering/Volume/vtkProjectedTetrahedraMapper.cxx
+++ b/Rendering/Volume/vtkProjectedTetrahedraMapper.cxx
@@ -43,7 +43,7 @@
#include "vtkVolume.h"
#include "vtkVolumeProperty.h"
-#include <math.h>
+#include <cmath>
#include <algorithm>
//-----------------------------------------------------------------------------
diff --git a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.cxx b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.cxx
index 4c9b942a39..953795a5aa 100644
--- a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.cxx
+++ b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.cxx
@@ -15,7 +15,7 @@
#include "vtkRecursiveSphereDirectionEncoder.h"
#include "vtkObjectFactory.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkRecursiveSphereDirectionEncoder);
diff --git a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.cxx b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
index 7f5d3b6f14..70deab22d7 100644
--- a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
@@ -33,7 +33,7 @@
#include "vtkColorTransferFunction.h"
#include "vtkPiecewiseFunction.h"
-#include <math.h>
+#include <cmath>
//-----------------------------------------------------------------------------
diff --git a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.cxx b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.cxx
index 42cf44d694..d52a88846a 100644
--- a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.cxx
@@ -36,7 +36,7 @@
#include <set>
#include <algorithm>
-#include <math.h>
+#include <cmath>
#ifndef M_SQRTPI
#define M_SQRTPI 1.77245385090551602792981
diff --git a/Rendering/Volume/vtkUnstructuredGridPreIntegration.cxx b/Rendering/Volume/vtkUnstructuredGridPreIntegration.cxx
index f08041c4d6..8573e6c2c7 100644
--- a/Rendering/Volume/vtkUnstructuredGridPreIntegration.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridPreIntegration.cxx
@@ -33,7 +33,7 @@
#include "vtkUnstructuredGridPartialPreIntegration.h"
#include <algorithm>
-#include <math.h>
+#include <cmath>
//-----------------------------------------------------------------------------
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.cxx b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.cxx
index cc4a95ddef..443fb0906c 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.cxx
@@ -38,7 +38,7 @@
#include "vtkDoubleArray.h"
#include "vtkIdList.h"
-#include <math.h>
+#include <cmath>
VTK_THREAD_RETURN_TYPE UnstructuredGridVolumeRayCastMapper_CastRays( void *arg );
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
index 431eac6427..25c074e3cd 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
@@ -43,7 +43,7 @@
#include "vtkPointData.h"
#include <cassert>
-#include <string.h> // memset()
+#include <cstring> // memset()
#include <vector>
#include <list>
diff --git a/Rendering/Volume/vtkVolumeRayCastMapper.cxx b/Rendering/Volume/vtkVolumeRayCastMapper.cxx
index 7cdca6b068..c269e7ecad 100644
--- a/Rendering/Volume/vtkVolumeRayCastMapper.cxx
+++ b/Rendering/Volume/vtkVolumeRayCastMapper.cxx
@@ -38,7 +38,7 @@
#include "vtkRayCastImageDisplayHelper.h"
#include "vtkStreamingDemandDrivenPipeline.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkVolumeRayCastMapper);
diff --git a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.cxx b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.cxx
index d3add8b26f..4d7c26a127 100644
--- a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.cxx
+++ b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.cxx
@@ -29,7 +29,7 @@
#include "vtkMetaImageWriter.h"
#endif
-#include <math.h>
+#include <cmath>
// Space leaping block size
#define VTK_SL_BLK 4
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
index 051fabe2f3..0468cc7e14 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
@@ -33,7 +33,7 @@
#include "vtkOpenGL.h"
-#include <math.h>
+#include <cmath>
#include <string>
#include <map>
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.cxx
index f9b79b81e3..9247b229d9 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.cxx
@@ -60,7 +60,7 @@
#include "vtkShader2Collection.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
#include <algorithm>
// Shader code
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.cxx
index e94d0db806..24d449e83d 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.cxx
@@ -25,7 +25,7 @@
#include "vtkOpenGL.h"
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
vtkStandardNewMacro(vtkOpenGLRayCastImageDisplayHelper);
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.cxx b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.cxx
index a49422afb5..1a62e1d5de 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.cxx
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.cxx
@@ -32,7 +32,7 @@
#include "vtkOpenGLError.h"
-#include <math.h>
+#include <cmath>
#include "vtkTextureObjectVS.h" // a pass through shader
diff --git a/Utilities/EncodeString/vtkEncodeString.cxx b/Utilities/EncodeString/vtkEncodeString.cxx
index 558ad97027..00a7d23b95 100644
--- a/Utilities/EncodeString/vtkEncodeString.cxx
+++ b/Utilities/EncodeString/vtkEncodeString.cxx
@@ -20,7 +20,7 @@
#include <iostream>
#include <string>
#include <sstream>
-#include <stdio.h>
+#include <cstdio>
using std::cout;
using std::endl;
diff --git a/Views/Infovis/vtkRenderedGraphRepresentation.cxx b/Views/Infovis/vtkRenderedGraphRepresentation.cxx
index 3a08912c6d..fc01c3eefd 100644
--- a/Views/Infovis/vtkRenderedGraphRepresentation.cxx
+++ b/Views/Infovis/vtkRenderedGraphRepresentation.cxx
@@ -80,7 +80,7 @@
#include "vtkVertexDegree.h"
#include "vtkViewTheme.h"
-#include <ctype.h>
+#include <cctype>
#include <algorithm>
--
GitLab