Commit 1ac2c008 authored by Kitware Robot's avatar Kitware Robot Committed by Robert Maynard

Replace VTK_DELETE_FUNCTION with =delete.

Now that VTK requires a C++11 compiler we can ditch using custom typedefs to
wrap =delete;
parent c94345fc

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -46,8 +46,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmAverageToCells(const vtkmAverageToCells&) VTK_DELETE_FUNCTION;
void operator=(const vtkmAverageToCells&) VTK_DELETE_FUNCTION;
vtkmAverageToCells(const vtkmAverageToCells&) = delete;
void operator=(const vtkmAverageToCells&) = delete;
};
#endif // vtkmAverageToCells_h
......
......@@ -46,8 +46,8 @@ protected:
vtkInformationVector *) override;
private:
vtkmAverageToPoints(const vtkmAverageToPoints&) VTK_DELETE_FUNCTION;
void operator=(const vtkmAverageToPoints&) VTK_DELETE_FUNCTION;
vtkmAverageToPoints(const vtkmAverageToPoints&) = delete;
void operator=(const vtkmAverageToPoints&) = delete;
};
#endif // vtkmAverageToPoints_h
......
......@@ -62,8 +62,8 @@ protected:
bool CompactPoints;
private:
vtkmCleanGrid(const vtkmCleanGrid&) VTK_DELETE_FUNCTION;
void operator=(const vtkmCleanGrid&) VTK_DELETE_FUNCTION;
vtkmCleanGrid(const vtkmCleanGrid&) = delete;
void operator=(const vtkmCleanGrid&) = delete;
};
#endif // vtkmCleanGrid_h
......
......@@ -80,8 +80,8 @@ protected:
tovtkm::ImplicitFunctionConverter ClipFunctionConverter;
private:
vtkmClip(const vtkmClip&) VTK_DELETE_FUNCTION;
void operator=(const vtkmClip&) VTK_DELETE_FUNCTION;
vtkmClip(const vtkmClip&) = delete;
void operator=(const vtkmClip&) = delete;
};
#endif // vtkmClip_h
......
......@@ -51,8 +51,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmContour(const vtkmContour&) VTK_DELETE_FUNCTION;
void operator=(const vtkmContour&) VTK_DELETE_FUNCTION;
vtkmContour(const vtkmContour&) = delete;
void operator=(const vtkmContour&) = delete;
};
#endif // vtkmContour_h
......
......@@ -76,8 +76,8 @@ protected:
bool CompactPoints;
private:
vtkmExternalFaces(const vtkmExternalFaces&) VTK_DELETE_FUNCTION;
void operator=(const vtkmExternalFaces&) VTK_DELETE_FUNCTION;
vtkmExternalFaces(const vtkmExternalFaces&) = delete;
void operator=(const vtkmExternalFaces&) = delete;
};
#endif // vtkmExternalFaces_h
......
......@@ -54,8 +54,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmExtractVOI(const vtkmExtractVOI&) VTK_DELETE_FUNCTION;
void operator=(const vtkmExtractVOI&) VTK_DELETE_FUNCTION;
vtkmExtractVOI(const vtkmExtractVOI&) = delete;
void operator=(const vtkmExtractVOI&) = delete;
};
#endif // vtkmExtractVOI_h
......
......@@ -52,8 +52,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmGradient(const vtkmGradient&) VTK_DELETE_FUNCTION;
void operator=(const vtkmGradient&) VTK_DELETE_FUNCTION;
vtkmGradient(const vtkmGradient&) = delete;
void operator=(const vtkmGradient&) = delete;
};
#endif // vtkmGradient_h
......
......@@ -93,8 +93,8 @@ protected:
private:
int NumberOfDivisions[3];
vtkmLevelOfDetail(const vtkmLevelOfDetail&) VTK_DELETE_FUNCTION;
void operator=(const vtkmLevelOfDetail&) VTK_DELETE_FUNCTION;
vtkmLevelOfDetail(const vtkmLevelOfDetail&) = delete;
void operator=(const vtkmLevelOfDetail&) = delete;
};
#endif // vtkmLevelOfDetail_h
......
......@@ -60,8 +60,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmPolyDataNormals(const vtkmPolyDataNormals&) VTK_DELETE_FUNCTION;
void operator=(const vtkmPolyDataNormals&) VTK_DELETE_FUNCTION;
vtkmPolyDataNormals(const vtkmPolyDataNormals&) = delete;
void operator=(const vtkmPolyDataNormals&) = delete;
};
#endif // vtkmPolyDataNormals_h
......
......@@ -50,8 +50,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmThreshold(const vtkmThreshold&) VTK_DELETE_FUNCTION;
void operator=(const vtkmThreshold&) VTK_DELETE_FUNCTION;
vtkmThreshold(const vtkmThreshold&) = delete;
void operator=(const vtkmThreshold&) = delete;
};
#endif // vtkmThreshold_h
......
......@@ -66,8 +66,8 @@ protected:
vtkInformationVector*) override;
private:
vtkmTriangleMeshPointNormals(const vtkmTriangleMeshPointNormals&) VTK_DELETE_FUNCTION;
void operator=(const vtkmTriangleMeshPointNormals&) VTK_DELETE_FUNCTION;
vtkmTriangleMeshPointNormals(const vtkmTriangleMeshPointNormals&) = delete;
void operator=(const vtkmTriangleMeshPointNormals&) = delete;
};
#endif // vtkmTriangleMeshPointNormals_h
......
......@@ -35,8 +35,8 @@ protected:
@vtk-module@ObjectFactory();
private:
@vtk-module@ObjectFactory(const @vtk-module@ObjectFactory&) VTK_DELETE_FUNCTION;
void operator=(const @vtk-module@ObjectFactory&) VTK_DELETE_FUNCTION;
@vtk-module@ObjectFactory(const @vtk-module@ObjectFactory&) = delete;
void operator=(const @vtk-module@ObjectFactory&) = delete;
};
#endif // __@vtk-module@ObjectFactory_h
......@@ -767,8 +767,8 @@ protected:
vtkTimeStamp BuildTime;
private:
vtkAxis(const vtkAxis &) VTK_DELETE_FUNCTION;
void operator=(const vtkAxis &) VTK_DELETE_FUNCTION;
vtkAxis(const vtkAxis &) = delete;
void operator=(const vtkAxis &) = delete;
/**
* Return true if the value is in range, false otherwise.
......
......@@ -135,6 +135,6 @@ protected:
bool IsAxisVertical;
private:
vtkAxisExtended(const vtkAxisExtended&) VTK_DELETE_FUNCTION;
void operator=(const vtkAxisExtended&) VTK_DELETE_FUNCTION;
vtkAxisExtended(const vtkAxisExtended&) = delete;
void operator=(const vtkAxisExtended&) = delete;
};
......@@ -113,8 +113,8 @@ protected:
vtkVariantArray* Values;
private:
vtkCategoryLegend(const vtkCategoryLegend &) VTK_DELETE_FUNCTION;
void operator=(const vtkCategoryLegend &) VTK_DELETE_FUNCTION;
vtkCategoryLegend(const vtkCategoryLegend &) = delete;
void operator=(const vtkCategoryLegend &) = delete;
};
#endif
......@@ -476,8 +476,8 @@ protected:
MouseClickActions ActionsClick;
private:
vtkChart(const vtkChart &) VTK_DELETE_FUNCTION;
void operator=(const vtkChart &) VTK_DELETE_FUNCTION;
vtkChart(const vtkChart &) = delete;
void operator=(const vtkChart &) = delete;
};
#endif //vtkChart_h
......@@ -223,8 +223,8 @@ protected:
vtkPlot *plot, vtkIdType &segmentIndex);
private:
vtkChartBox(const vtkChartBox &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartBox &) VTK_DELETE_FUNCTION;
vtkChartBox(const vtkChartBox &) = delete;
void operator=(const vtkChartBox &) = delete;
};
......
......@@ -81,8 +81,8 @@ protected:
bool UpdateLayout(vtkContext2D *painter) override;
private:
vtkChartHistogram2D(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;
vtkChartHistogram2D(const vtkChartHistogram2D &) = delete;
void operator=(const vtkChartHistogram2D &) = delete;
};
#endif //vtkChartHistogram2D_h
......@@ -311,8 +311,8 @@ protected:
Private* Storage;
private:
vtkChartLegend(const vtkChartLegend &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartLegend &) VTK_DELETE_FUNCTION;
vtkChartLegend(const vtkChartLegend &) = delete;
void operator=(const vtkChartLegend &) = delete;
};
#endif //vtkChartLegend_h
......@@ -161,8 +161,8 @@ protected:
bool LayoutIsDirty;
private:
vtkChartMatrix(const vtkChartMatrix &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartMatrix &) VTK_DELETE_FUNCTION;
vtkChartMatrix(const vtkChartMatrix &) = delete;
void operator=(const vtkChartMatrix &) = delete;
class PIMPL;
PIMPL *Private;
......
......@@ -186,8 +186,8 @@ protected:
void SwapAxes(int a1, int a2);
private:
vtkChartParallelCoordinates(const vtkChartParallelCoordinates &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartParallelCoordinates &) VTK_DELETE_FUNCTION;
vtkChartParallelCoordinates(const vtkChartParallelCoordinates &) = delete;
void operator=(const vtkChartParallelCoordinates &) = delete;
};
......
......@@ -151,8 +151,8 @@ protected:
bool PlotTransformValid;
private:
vtkChartPie(const vtkChartPie &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartPie &) VTK_DELETE_FUNCTION;
vtkChartPie(const vtkChartPie &) = delete;
void operator=(const vtkChartPie &) = delete;
/**
* Try to locate a point within the plots to display in a tooltip
......
......@@ -458,8 +458,8 @@ protected:
bool DragPointAlongY;
private:
vtkChartXY(const vtkChartXY&) VTK_DELETE_FUNCTION;
void operator=(const vtkChartXY&) VTK_DELETE_FUNCTION;
vtkChartXY(const vtkChartXY&) = delete;
void operator=(const vtkChartXY&) = delete;
vtkChartXYPrivate* ChartPrivate; // Private class where I hide my STL containers
......
......@@ -495,8 +495,8 @@ protected:
double DataBounds[4];
private:
vtkChartXYZ(const vtkChartXYZ &) VTK_DELETE_FUNCTION;
void operator=(const vtkChartXYZ &) VTK_DELETE_FUNCTION;
vtkChartXYZ(const vtkChartXYZ &) = delete;
void operator=(const vtkChartXYZ &) = delete;
};
#endif
......@@ -180,8 +180,8 @@ protected:
int Orientation;
private:
vtkColorLegend(const vtkColorLegend &) VTK_DELETE_FUNCTION;
void operator=(const vtkColorLegend &) VTK_DELETE_FUNCTION;
vtkColorLegend(const vtkColorLegend &) = delete;
void operator=(const vtkColorLegend &) = delete;
};
#endif
......@@ -126,8 +126,8 @@ protected:
bool ColorFill;
private:
vtkColorTransferControlPointsItem(const vtkColorTransferControlPointsItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkColorTransferControlPointsItem &) VTK_DELETE_FUNCTION;
vtkColorTransferControlPointsItem(const vtkColorTransferControlPointsItem &) = delete;
void operator=(const vtkColorTransferControlPointsItem &) = delete;
};
#endif
......@@ -51,8 +51,8 @@ protected:
void ComputeTexture() override;
vtkColorTransferFunction* ColorTransferFunction;
private:
vtkColorTransferFunctionItem(const vtkColorTransferFunctionItem&) VTK_DELETE_FUNCTION;
void operator=(const vtkColorTransferFunctionItem&) VTK_DELETE_FUNCTION;
vtkColorTransferFunctionItem(const vtkColorTransferFunctionItem&) = delete;
void operator=(const vtkColorTransferFunctionItem&) = delete;
};
#endif
......@@ -148,8 +148,8 @@ protected:
bool UseOpacityPointHandles;
private:
vtkCompositeControlPointsItem(const vtkCompositeControlPointsItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkCompositeControlPointsItem &) VTK_DELETE_FUNCTION;
vtkCompositeControlPointsItem(const vtkCompositeControlPointsItem &) = delete;
void operator=(const vtkCompositeControlPointsItem &) = delete;
};
#endif
......@@ -51,8 +51,8 @@ protected:
vtkPiecewiseFunction* OpacityFunction;
private:
vtkCompositeTransferFunctionItem(const vtkCompositeTransferFunctionItem&) VTK_DELETE_FUNCTION;
void operator=(const vtkCompositeTransferFunctionItem&) VTK_DELETE_FUNCTION;
vtkCompositeTransferFunctionItem(const vtkCompositeTransferFunctionItem&) = delete;
void operator=(const vtkCompositeTransferFunctionItem&) = delete;
};
#endif
......@@ -295,8 +295,8 @@ protected:
vtkNew<vtkAxis> RightAxis;
private:
vtkContextArea(const vtkContextArea &) VTK_DELETE_FUNCTION;
void operator=(const vtkContextArea &) VTK_DELETE_FUNCTION;
vtkContextArea(const vtkContextArea &) = delete;
void operator=(const vtkContextArea &) = delete;
};
#endif //vtkContextArea_h
......@@ -498,8 +498,8 @@ protected:
bool ShowLabels;
char* LabelFormat;
private:
vtkControlPointsItem(const vtkControlPointsItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkControlPointsItem &) VTK_DELETE_FUNCTION;
vtkControlPointsItem(const vtkControlPointsItem &) = delete;
void operator=(const vtkControlPointsItem &) = delete;
void ComputeBounds();
......
......@@ -50,8 +50,8 @@ public:
vtkRectf MouseBox;
private:
MouseActions(MouseActions const&) VTK_DELETE_FUNCTION;
void operator=(MouseActions const*) VTK_DELETE_FUNCTION;
MouseActions(MouseActions const&) = delete;
void operator=(MouseActions const*) = delete;
short Data[MaxAction];
};
......
......@@ -77,8 +77,8 @@ private:
class MouseActions;
MouseActions* Actions;
vtkInteractiveArea(const vtkInteractiveArea &) VTK_DELETE_FUNCTION;
void operator=(const vtkInteractiveArea &) VTK_DELETE_FUNCTION;
vtkInteractiveArea(const vtkInteractiveArea &) = delete;
void operator=(const vtkInteractiveArea &) = delete;
};
#endif //vtkInteractiveArea_h
......@@ -47,8 +47,8 @@ protected:
vtkLookupTable* LookupTable;
private:
vtkLookupTableItem(const vtkLookupTableItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkLookupTableItem &) VTK_DELETE_FUNCTION;
vtkLookupTableItem(const vtkLookupTableItem &) = delete;
void operator=(const vtkLookupTableItem &) = delete;
};
#endif
......@@ -94,8 +94,8 @@ protected:
vtkPiecewiseFunction* PiecewiseFunction;
private:
vtkPiecewiseControlPointsItem(const vtkPiecewiseControlPointsItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkPiecewiseControlPointsItem &) VTK_DELETE_FUNCTION;
vtkPiecewiseControlPointsItem(const vtkPiecewiseControlPointsItem &) = delete;
void operator=(const vtkPiecewiseControlPointsItem &) = delete;
};
#endif
......@@ -48,8 +48,8 @@ protected:
vtkPiecewiseFunction* PiecewiseFunction;
private:
vtkPiecewiseFunctionItem(const vtkPiecewiseFunctionItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkPiecewiseFunctionItem &) VTK_DELETE_FUNCTION;
vtkPiecewiseFunctionItem(const vtkPiecewiseFunctionItem &) = delete;
void operator=(const vtkPiecewiseFunctionItem &) = delete;
};
#endif
......@@ -114,8 +114,8 @@ protected:
vtkCallbackCommand* Callback;
private:
vtkPiecewisePointHandleItem(const vtkPiecewisePointHandleItem &) VTK_DELETE_FUNCTION;
void operator=(const vtkPiecewisePointHandleItem &) VTK_DELETE_FUNCTION;
vtkPiecewisePointHandleItem(const vtkPiecewisePointHandleItem &) = delete;
void operator=(const vtkPiecewisePointHandleItem &) = delete;
class InternalPiecewisePointHandleInfo;
InternalPiecewisePointHandleInfo* Internal;
......
......@@ -479,8 +479,8 @@ protected:
bool LegendVisibility;
private:
vtkPlot(const vtkPlot &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlot &) VTK_DELETE_FUNCTION;
vtkPlot(const vtkPlot &) = delete;
void operator=(const vtkPlot &) = delete;
};
......
......@@ -198,8 +198,8 @@ protected:
vtkSmartPointer<vtkIdTypeArray> Selection;
private:
vtkPlot3D(const vtkPlot3D &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlot3D &) VTK_DELETE_FUNCTION;
vtkPlot3D(const vtkPlot3D &) = delete;
void operator=(const vtkPlot3D &) = delete;
};
......
......@@ -252,7 +252,7 @@ private:
UseLog(useLog)
{}
CopyToPoints& operator=(const CopyToPoints &) VTK_DELETE_FUNCTION;
CopyToPoints& operator=(const CopyToPoints &) = delete;
// Use input array:
template <class ArrayT>
......
......@@ -120,8 +120,8 @@ protected:
vtkStdString ValidPointMaskName;
private:
vtkPlotArea(const vtkPlotArea&) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotArea&) VTK_DELETE_FUNCTION;
vtkPlotArea(const vtkPlotArea&) = delete;
void operator=(const vtkPlotArea&) = delete;
class vtkTableCache;
vtkTableCache* TableCache;
......
......@@ -141,8 +141,8 @@ protected:
vtkPen* LinePen;
private:
vtkPlotBag(const vtkPlotBag &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotBag &) VTK_DELETE_FUNCTION;
vtkPlotBag(const vtkPlotBag &) = delete;
void operator=(const vtkPlotBag &) = delete;
};
#endif //vtkPlotBag_h
......@@ -303,8 +303,8 @@ protected:
bool LogY;
private:
vtkPlotBar(const vtkPlotBar &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotBar &) VTK_DELETE_FUNCTION;
vtkPlotBar(const vtkPlotBar &) = delete;
void operator=(const vtkPlotBar &) = delete;
vtkPlotBarPrivate *Private;
......
......@@ -168,8 +168,8 @@ protected:
vtkTextProperty* TitleProperties;
private:
vtkPlotBox(const vtkPlotBox &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotBox &) VTK_DELETE_FUNCTION;
vtkPlotBox(const vtkPlotBox &) = delete;
void operator=(const vtkPlotBox &) = delete;
};
......
......@@ -166,8 +166,8 @@ protected:
bool LogX, LogY;
private:
vtkPlotFunctionalBag(const vtkPlotFunctionalBag &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotFunctionalBag &) VTK_DELETE_FUNCTION;
vtkPlotFunctionalBag(const vtkPlotFunctionalBag &) = delete;
void operator=(const vtkPlotFunctionalBag &) = delete;
};
#endif //vtkPlotFunctionalBag_h
......@@ -75,8 +75,8 @@ protected:
//@}
private:
vtkPlotGrid(const vtkPlotGrid &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotGrid &) VTK_DELETE_FUNCTION;
vtkPlotGrid(const vtkPlotGrid &) = delete;
void operator=(const vtkPlotGrid &) = delete;
};
......
......@@ -134,8 +134,8 @@ protected:
vtkRectf Position;
private:
vtkPlotHistogram2D(const vtkPlotHistogram2D &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotHistogram2D &) VTK_DELETE_FUNCTION;
vtkPlotHistogram2D(const vtkPlotHistogram2D &) = delete;
void operator=(const vtkPlotHistogram2D &) = delete;
};
......
......@@ -76,8 +76,8 @@ protected:
bool PolyLine;
private:
vtkPlotLine(const vtkPlotLine &) VTK_DELETE_FUNCTION;
void operator=(const vtkPlotLine &) VTK_DELETE_FUNCTION;