Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit e89fdcff authored by Sean McBride's avatar Sean McBride

Remove double underscore in header guards (.h & __vtk*_h form)

Used the following command:

find . \( -iname *.h -and -type f \) -exec perl -pi -w -e 's/__vtk(.*)_h/vtk$1_h/g;' {} \;

Fixes many, but not all, clang -Wreserved-id-macro warnings.

Change-Id: I694ff053cb204c70e37b261296f496064d91fc07
parent 5a668f9e

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxContour_h
#define __vtkDaxContour_h
#ifndef vtkDaxContour_h
#define vtkDaxContour_h
#include "vtkContourFilter.h"
#include "vtkAcceleratorsDaxModule.h" //required for correct implementation
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxContourImpl_h
#define __vtkDaxContourImpl_h
#ifndef vtkDaxContourImpl_h
#define vtkDaxContourImpl_h
// Common code
#include "vtkDaxConfig.h"
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxDetailCommon_h
#define __vtkDaxDetailCommon_h
#ifndef vtkDaxDetailCommon_h
#define vtkDaxDetailCommon_h
#include "vtkCellTypes.h"
#include "vtkDataSet.h"
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxThreshold_h
#define __vtkDaxThreshold_h
#ifndef vtkDaxThreshold_h
#define vtkDaxThreshold_h
#include "vtkThreshold.h"
#include "vtkAcceleratorsDaxModule.h" //required for correct implementation
......@@ -41,4 +41,4 @@ private:
void operator=(const vtkDaxThreshold&); // Not implemented
};
#endif // __vtkDaxThreshold_h
#endif // vtkDaxThreshold_h
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxThresholdImpl_h
#define __vtkDaxThresholdImpl_h
#ifndef vtkDaxThresholdImpl_h
#define vtkDaxThresholdImpl_h
// Common code
#include "vtkDaxConfig.h"
......
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkPistonToDataSet
#ifndef __vtkDataSetToPiston_h
#define __vtkDataSetToPiston_h
#ifndef vtkDataSetToPiston_h
#define vtkDataSetToPiston_h
#include "vtkPistonAlgorithm.h"
......
......@@ -30,8 +30,8 @@
// class breaks out the downstream requests into separate functions such as
// ExecuteData and ExecuteInformation.
#ifndef __vtkPistonAlgorithm_h
#define __vtkPistonAlgorithm_h
#ifndef vtkPistonAlgorithm_h
#define vtkPistonAlgorithm_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkAlgorithm.h"
......
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to isocontour on the GPU.
#ifndef __vtkPistonContour_h
#define __vtkPistonContour_h
#ifndef vtkPistonContour_h
#define vtkPistonContour_h
#include "vtkPistonAlgorithm.h"
......
......@@ -25,8 +25,8 @@
// .SECTION See Also
// vtkPistonReference
#ifndef __vtkPistonDataObject_h
#define __vtkPistonDataObject_h
#ifndef vtkPistonDataObject_h
#define vtkPistonDataObject_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkDataObject.h"
......
......@@ -18,8 +18,8 @@
// The vtk_polydata struct is important as that is how piston's polygonal
// results get brought back to the CPU.
#ifndef __vtkPistonDataWrangling_h
#define __vtkPistonDataWrangling_h
#ifndef vtkPistonDataWrangling_h
#define vtkPistonDataWrangling_h
#include <thrust/version.h>
#if THRUST_VERSION >= 100600
......@@ -67,5 +67,5 @@ struct float4tofloat3 : thrust::unary_function<float4, float3>
} //namespace
#endif //__vtkPistonDataWrangling_h
#endif //vtkPistonDataWrangling_h
// VTK-HeaderTest-Exclude: vtkPistonDataWrangling.h
......@@ -18,8 +18,8 @@
// The important capability it has is to produce images without bringing
// data back to the CPU.
#ifndef __vtkPistonMapper_h
#define __vtkPistonMapper_h
#ifndef vtkPistonMapper_h
#define vtkPistonMapper_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkMapper.h"
......
......@@ -17,8 +17,8 @@
// Used in vtkPistonMapper to determine data range as part of color mapping
// process.
#ifndef __vtkPistonMinMax_h
#define __vtkPistonMinMax_h
#ifndef vtkPistonMinMax_h
#define vtkPistonMinMax_h
#include <thrust/device_vector.h>
#include <thrust/host_vector.h>
......@@ -93,5 +93,5 @@ namespace vtkPiston
}
}
#endif // __vtkPistonMinMax_h
#endif // vtkPistonMinMax_h
// VTK-HeaderTest-Exclude: vtkPistonMinMax.h
......@@ -18,8 +18,8 @@
// vtkPistonMapper uses this class to interface vtkScalarsToColors to GPU
// side code that implements color mapping.
#ifndef __vtkPistonScalarsColors_h
#define __vtkPistonScalarsColors_h
#ifndef vtkPistonScalarsColors_h
#define vtkPistonScalarsColors_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkObject.h"
......@@ -101,4 +101,4 @@ private:
void operator=(const vtkPistonScalarsColors&); // Not implemented.
};
#endif // __vtkPistonScalarsColors_h
#endif // vtkPistonScalarsColors_h
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to slice on the GPU.
#ifndef __vtkPistonSlice_h
#define __vtkPistonSlice_h
#ifndef vtkPistonSlice_h
#define vtkPistonSlice_h
#include "vtkPistonAlgorithm.h"
......
......@@ -20,8 +20,8 @@
// keeps the same data type while producing a result which is verifiably
// correct.
#ifndef __vtkPistonSort_h
#define __vtkPistonSort_h
#ifndef vtkPistonSort_h
#define vtkPistonSort_h
#include "vtkPistonAlgorithm.h"
......
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to isocontour on the GPU.
#ifndef __vtkPistonThreshold_h
#define __vtkPistonThreshold_h
#ifndef vtkPistonThreshold_h
#define vtkPistonThreshold_h
#include "vtkPistonAlgorithm.h"
......
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkDataSetToPiston
#ifndef __vtkPistonToDataSet_h
#define __vtkPistonToDataSet_h
#ifndef vtkPistonToDataSet_h
#define vtkPistonToDataSet_h
#include "vtkPistonAlgorithm.h"
......
......@@ -45,8 +45,8 @@
// old Limit values in NonLogUnscaled{Min,Max}Limit so that behavior is
// consistent when LogScale is changed from false to true and back again.
#ifndef __vtkAxis_h
#define __vtkAxis_h
#ifndef vtkAxis_h
#define vtkAxis_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -581,4 +581,4 @@ private:
//ETX
};
#endif //__vtkAxis_h
#endif //vtkAxis_h
......@@ -22,8 +22,8 @@
// .SECTION See Also
// vtkAxis
#ifndef __vtkAxisExtended_h
#define __vtkAxisExtended_h
#ifndef vtkAxisExtended_h
#define vtkAxisExtended_h
#endif
#include "vtkChartsCoreModule.h" // For export macro
......
......@@ -22,8 +22,8 @@
// annotated values from the vtkScalarsToColors that you wish to include
// within the legend.
#ifndef __vtkCategoryLegend_h
#define __vtkCategoryLegend_h
#ifndef vtkCategoryLegend_h
#define vtkCategoryLegend_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChartLegend.h"
......
......@@ -18,8 +18,8 @@
// .SECTION Description
// This defines the interface for a chart.
#ifndef __vtkChart_h
#define __vtkChart_h
#ifndef vtkChart_h
#define vtkChart_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -391,4 +391,4 @@ private:
void operator=(const vtkChart &); // Not implemented.
};
#endif //__vtkChart_h
#endif //vtkChart_h
......@@ -18,8 +18,8 @@
// .SECTION Description
// This defines the interface for a box plot chart.
#ifndef __vtkChartBox_h
#define __vtkChartBox_h
#ifndef vtkChartBox_h
#define vtkChartBox_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChart.h"
......@@ -202,4 +202,4 @@ struct vtkChartBoxData
int Index;
};
#endif //__vtkChartBox_h
#endif //vtkChartBox_h
......@@ -18,8 +18,8 @@
// .SECTION Description
// This defines the interface for a 2D histogram chart.
#ifndef __vtkChart2DHistogram_h
#define __vtkChart2DHistogram_h
#ifndef vtkChart2DHistogram_h
#define vtkChart2DHistogram_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChartXY.h"
......@@ -77,4 +77,4 @@ private:
void operator=(const vtkChartHistogram2D &); // Not implemented.
};
#endif //__vtkChart2DHistogram_h
#endif //vtkChart2DHistogram_h
......@@ -20,8 +20,8 @@
// last elements of a chart to be drawn. It renders the the mark/line for each
// plot, and the plot labels.
#ifndef __vtkChartLegend_h
#define __vtkChartLegend_h
#ifndef vtkChartLegend_h
#define vtkChartLegend_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -247,4 +247,4 @@ private:
void operator=(const vtkChartLegend &); // Not implemented.
};
#endif //__vtkChartLegend_h
#endif //vtkChartLegend_h
......@@ -20,8 +20,8 @@
// vtkChartXY by default, but this can be overridden. The class will manage
// their layout and object lifetime.
#ifndef __vtkChartMatrix_h
#define __vtkChartMatrix_h
#ifndef vtkChartMatrix_h
#define vtkChartMatrix_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkAbstractContextItem.h"
......@@ -135,4 +135,4 @@ private:
void operator=(const vtkChartMatrix &); // Not implemented.
};
#endif //__vtkChartMatrix_h
#endif //vtkChartMatrix_h
......@@ -18,8 +18,8 @@
// .SECTION Description
// This defines the interface for a parallel coordinates chart.
#ifndef __vtkChartParallelCoordinates_h
#define __vtkChartParallelCoordinates_h
#ifndef vtkChartParallelCoordinates_h
#define vtkChartParallelCoordinates_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChart.h"
......@@ -157,4 +157,4 @@ private:
//ETX
};
#endif //__vtkChartParallelCoordinates_h
#endif //vtkChartParallelCoordinates_h
......@@ -18,8 +18,8 @@
// .SECTION Description
// This class implements an pie chart.
#ifndef __vtkChartPie_h
#define __vtkChartPie_h
#ifndef vtkChartPie_h
#define vtkChartPie_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChart.h"
......@@ -144,4 +144,4 @@ private:
//ETX
};
#endif //__vtkChartPie_h
#endif //vtkChartPie_h
......@@ -21,8 +21,8 @@
// implementations to make chart selections easier. This is intended for
// internal use and the API should not be considered stable.
#ifndef __vtkChartSelectionHelper_h
#define __vtkChartSelectionHelper_h
#ifndef vtkChartSelectionHelper_h
#define vtkChartSelectionHelper_h
#include "vtkNew.h"
#include "vtkSmartPointer.h"
......@@ -269,5 +269,5 @@ static int GetMouseSelectionMode(const vtkContextMouseEvent &mouse, int selectio
} // End vtkChartSelectionHelper namespace
#endif // __vtkChartSelectionHelper_h
#endif // vtkChartSelectionHelper_h
// VTK-HeaderTest-Exclude: vtkChartSelectionHelper.h
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkBarChartActor
#ifndef __vtkChartXY_h
#define __vtkChartXY_h
#ifndef vtkChartXY_h
#define vtkChartXY_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChart.h"
......@@ -348,4 +348,4 @@ struct vtkChartPlotData
int Index;
};
#endif //__vtkChartXY_h
#endif //vtkChartXY_h
......@@ -17,8 +17,8 @@
//
// .SECTION Description
#ifndef __vtkChartXYZ_h
#define __vtkChartXYZ_h
#ifndef vtkChartXYZ_h
#define vtkChartXYZ_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......
......@@ -18,8 +18,8 @@
// vtkColorLegend is an item that will display the vtkScalarsToColors
// using a 1D texture, and a vtkAxis to show both the color and numerical range.
#ifndef __vtkColorLegend_h
#define __vtkColorLegend_h
#ifndef vtkColorLegend_h
#define vtkColorLegend_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkChartLegend.h"
......
......@@ -22,8 +22,8 @@
// vtkColorTransferFunctionItem
// vtkCompositeTransferFunctionItem
#ifndef __vtkColorTransferControlPointsItem_h
#define __vtkColorTransferControlPointsItem_h
#ifndef vtkColorTransferControlPointsItem_h
#define vtkColorTransferControlPointsItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkControlPointsItem.h"
......
......@@ -13,8 +13,8 @@
=========================================================================*/
#ifndef __vtkColorTransferFunctionItem_h
#define __vtkColorTransferFunctionItem_h
#ifndef vtkColorTransferFunctionItem_h
#define vtkColorTransferFunctionItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkScalarsToColorsItem.h"
......
......@@ -24,8 +24,8 @@
// vtkCompositeTransferFunctionItem
// vtkPiecewisePointHandleItem
#ifndef __vtkCompositeControlPointsItem_h
#define __vtkCompositeControlPointsItem_h
#ifndef vtkCompositeControlPointsItem_h
#define vtkCompositeControlPointsItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkColorTransferControlPointsItem.h"
......
......@@ -13,8 +13,8 @@
=========================================================================*/
#ifndef __vtkCompositeTransferFunctionItem_h
#define __vtkCompositeTransferFunctionItem_h
#ifndef vtkCompositeTransferFunctionItem_h
#define vtkCompositeTransferFunctionItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkColorTransferFunctionItem.h"
......
......@@ -22,8 +22,8 @@
// vtkScalarsToColorsItem
// vtkPiecewiseControlPointsItem
#ifndef __vtkControlPointsItem_h
#define __vtkControlPointsItem_h
#ifndef vtkControlPointsItem_h
#define vtkControlPointsItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkCommand.h" // For vtkCommand enum
......
......@@ -13,8 +13,8 @@
=========================================================================*/
#ifndef __vtkLookupTableItem_h
#define __vtkLookupTableItem_h
#ifndef vtkLookupTableItem_h
#define vtkLookupTableItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkScalarsToColorsItem.h"
......
......@@ -22,8 +22,8 @@
// vtkPiecewiseFunctionItem
// vtkCompositeTransferFunctionItem
#ifndef __vtkPiecewiseControlPointsItem_h
#define __vtkPiecewiseControlPointsItem_h
#ifndef vtkPiecewiseControlPointsItem_h
#define vtkPiecewiseControlPointsItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkControlPointsItem.h"
......
......@@ -13,8 +13,8 @@
=========================================================================*/
#ifndef __vtkPiecewiseFunctionItem_h
#define __vtkPiecewiseFunctionItem_h
#ifndef vtkPiecewiseFunctionItem_h
#define vtkPiecewiseFunctionItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkScalarsToColorsItem.h"
......
......@@ -21,8 +21,8 @@
// handles around a given point of a piecewise function so that the curve can
// be adjusted using these handles.
#ifndef __vtkPiecewisePointHandleItem_h
#define __vtkPiecewisePointHandleItem_h
#ifndef vtkPiecewisePointHandleItem_h
#define vtkPiecewisePointHandleItem_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -106,4 +106,4 @@ private:
//ETX
};
#endif //__vtkPiecewisePointHandleItem_h
#endif //vtkPiecewisePointHandleItem_h
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkPlotPoints vtkPlotLine vtkPlotBar vtkChart vtkChartXY
#ifndef __vtkPlot_h
#define __vtkPlot_h
#ifndef vtkPlot_h
#define vtkPlot_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -339,4 +339,4 @@ private:
//ETX
};
#endif //__vtkPlot_h
#endif //vtkPlot_h
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkPlot3DPoints vtkPlot3DLine vtkPlot3DBar vtkChart vtkChartXY
#ifndef __vtkPlot3D_h
#define __vtkPlot3D_h
#ifndef vtkPlot3D_h
#define vtkPlot3D_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -159,4 +159,4 @@ private:
//ETX
};
#endif //__vtkPlot3D_h
#endif //vtkPlot3D_h
......@@ -27,8 +27,8 @@
// .SECTION See Also
// vtkHighestDensityRegionsStatistics
#ifndef __vtkPlotBag_h
#define __vtkPlotBag_h
#ifndef vtkPlotBag_h
#define vtkPlotBag_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkPlotPoints.h"
......@@ -120,4 +120,4 @@ private:
void operator=(const vtkPlotBag &); // Not implemented.
};
#endif //__vtkPlotBag_h
#endif //vtkPlotBag_h
......@@ -19,8 +19,8 @@
// .SECTION Description