Rename #includes to C++ style

Find/replace of: with C++ counterparts. Changed only vtk*.cxx files. Didn’t touch .h or .c or any 3rd party.
Kitware · Jan 29, 2016 · 849ef99 · 849ef99
1 parent 4f43463
commit 849ef99
Show file tree

Hide file tree

Showing 288 changed files with 339 additions and 339 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -34,7 +34,7 @@
 #include "vtkUnsignedLongArray.h"
 #include "vtkUnsignedShortArray.h"
 
-#include <math.h>
+#include <cmath>
 
 vtkStandardNewMacro(vtkSynchronizedTemplates2D);