Commit ecbbf7f7 authored by Mark Olesen's avatar Mark Olesen Committed by Brad King
Browse files

Remove vtk(Cxx|Type)RevisionMacro

The CVS $Revision$ keyword replacement will no longer maintain these
macros automatically.  They were used only to implement CollectRevisions
and vtkObjectBase::PrintRevisions, an API that was never used.

Automated as follows:

  pass 0:
  catch templates
  ---------------
  $ git grep 'vtk\(Cxx\|Type\)RevisionMacro' | grep '<'

  pass 1:
  main changes
  ---------------
  $ git grep -l '^vtkCxxRevisionMacro' | while read file; do
    echo "$file" 1>&2
    perl -i -ne 'print unless (/^vtkCxxRevisionMacro/ and /\)/)' $file
  done
  $ git grep -l -e 'vtkTypeRevisionMacro(' | while read file; do
    echo "$file" 1>&2
    perl -i -pe 's/vtkTypeRevisionMacro/vtkTypeMacro/g' $file
  done

  pass 2:
  verify
  ---------------
  $ git grep 'vtk\(Cxx\|Type\)RevisionMacro'

Fixed multi-line vtkCxxRevisionMacro and templates by hand.
parent 1cd36ac0

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -39,7 +39,7 @@ class ContextTest : public vtkContextItem
{
public:
static ContextTest *New();
vtkTypeRevisionMacro(ContextTest, vtkContextItem);
vtkTypeMacro(ContextTest, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
virtual bool Paint(vtkContext2D *painter);
};
......@@ -67,7 +67,6 @@ int TestContext( int argc, char * argv [] )
// Make our new derived class to draw a diagram
vtkStandardNewMacro(ContextTest);
vtkCxxRevisionMacro(ContextTest, "1.2");
// This function aims to test the primitives provided by the 2D API.
bool ContextTest::Paint(vtkContext2D *painter)
{
......
......@@ -37,7 +37,7 @@ class APIDiagram : public vtkContextItem
{
public:
static APIDiagram *New();
vtkTypeRevisionMacro(APIDiagram, vtkContextItem);
vtkTypeMacro(APIDiagram, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
virtual bool Paint(vtkContext2D *painter);
};
......@@ -76,7 +76,6 @@ int TestDiagram( int argc, char * argv [] )
// Make our new derived class to draw a diagram
vtkStandardNewMacro(APIDiagram);
vtkCxxRevisionMacro(APIDiagram, "1.5");
// This function draws our API diagram
bool APIDiagram::Paint(vtkContext2D *painter)
{
......
......@@ -39,7 +39,7 @@ class APIDiagram2 : public vtkContextItem
{
public:
static APIDiagram2 *New();
vtkTypeRevisionMacro(APIDiagram2, vtkContextItem);
vtkTypeMacro(APIDiagram2, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
virtual bool Paint(vtkContext2D *painter);
};
......@@ -89,7 +89,6 @@ int TestQtDiagram( int argc, char * argv [] )
// Make our new derived class to draw a diagram
vtkStandardNewMacro(APIDiagram2);
vtkCxxRevisionMacro(APIDiagram2, "1.5");
// This function draws our API diagram
bool APIDiagram2::Paint(vtkContext2D *painter)
{
......
......@@ -29,7 +29,6 @@
#include "math.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkAxis, "1.20.4.4");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkAxis);
......
......@@ -36,7 +36,7 @@ class vtkTextProperty;
class VTK_CHARTS_EXPORT vtkAxis : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkAxis, vtkContextItem);
vtkTypeMacro(vtkAxis, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
//BTX
......
......@@ -27,7 +27,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkBlockItem, "1.6");
vtkStandardNewMacro(vtkBlockItem);
//-----------------------------------------------------------------------------
......
......@@ -29,7 +29,7 @@ class vtkContext2D;
class VTK_CHARTS_EXPORT vtkBlockItem : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkBlockItem, vtkContextItem);
vtkTypeMacro(vtkBlockItem, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
static vtkBlockItem *New();
......
......@@ -18,7 +18,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkBrush, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkBrush);
......
......@@ -31,7 +31,7 @@
class VTK_CHARTS_EXPORT vtkBrush : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkBrush, vtkObject);
vtkTypeMacro(vtkBrush, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
static vtkBrush *New();
......
......@@ -21,7 +21,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkChart, "1.16");
vtkCxxSetObjectMacro(vtkChart, AnnotationLink, vtkAnnotationLink);
//-----------------------------------------------------------------------------
......
......@@ -36,7 +36,7 @@ class vtkTable;
class VTK_CHARTS_EXPORT vtkChart : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkChart, vtkContextItem);
vtkTypeMacro(vtkChart, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
//BTX
......
......@@ -47,7 +47,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkChartLegend, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkChartLegend);
......
......@@ -31,7 +31,7 @@ class vtkChart;
class VTK_CHARTS_EXPORT vtkChartLegend : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkChartLegend, vtkContextItem);
vtkTypeMacro(vtkChartLegend, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -59,7 +59,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkChartParallelCoordinates, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkChartParallelCoordinates);
......
......@@ -28,7 +28,7 @@ class vtkIdTypeArray;
class VTK_CHARTS_EXPORT vtkChartParallelCoordinates : public vtkChart
{
public:
vtkTypeRevisionMacro(vtkChartParallelCoordinates, vtkChart);
vtkTypeMacro(vtkChartParallelCoordinates, vtkChart);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -72,7 +72,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkChartXY, "1.46.4.1");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkChartXY);
......
......@@ -35,7 +35,7 @@ class vtkChartXYPrivate; // Private class to keep my STL vector in...
class VTK_CHARTS_EXPORT vtkChartXY : public vtkChart
{
public:
vtkTypeRevisionMacro(vtkChartXY, vtkChart);
vtkTypeMacro(vtkChartXY, vtkChart);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -27,7 +27,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkColorSeries, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkColorSeries);
......
......@@ -30,7 +30,7 @@
class VTK_CHARTS_EXPORT vtkColorSeries : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkColorSeries, vtkObject);
vtkTypeMacro(vtkColorSeries, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -29,7 +29,6 @@
#include <cassert>
vtkCxxRevisionMacro(vtkContext2D, "1.24");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkContext2D);
......
......@@ -42,7 +42,7 @@ class vtkContextBufferId;
class VTK_CHARTS_EXPORT vtkContext2D : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkContext2D, vtkObject);
vtkTypeMacro(vtkContext2D, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -24,7 +24,6 @@
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkContextActor, "1.7");
vtkStandardNewMacro(vtkContextActor);
vtkCxxSetObjectMacro(vtkContextActor, Context, vtkContext2D);
......
......@@ -30,7 +30,7 @@ class VTK_CHARTS_EXPORT vtkContextActor : public vtkProp
{
public:
void PrintSelf(ostream& os, vtkIndent indent);
vtkTypeRevisionMacro(vtkContextActor,vtkProp);
vtkTypeMacro(vtkContextActor,vtkProp);
static vtkContextActor* New();
......
......@@ -19,7 +19,6 @@
#include <cassert>
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkContextBufferId, "1.2");
vtkStandardNewMacro(vtkContextBufferId);
// ----------------------------------------------------------------------------
......
......@@ -29,7 +29,7 @@ class vtkIntArray;
class VTK_CHARTS_EXPORT vtkContextBufferId : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkContextBufferId, vtkObject);
vtkTypeMacro(vtkContextBufferId, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -19,7 +19,6 @@
#include "vtkObjectFactory.h"
#include <assert.h>
vtkCxxRevisionMacro(vtkContextDevice2D, "1.2");
//-----------------------------------------------------------------------------
//vtkStandardNewMacro(vtkContextDevice2D);
......
......@@ -37,7 +37,7 @@ class vtkContextBufferId;
class VTK_CHARTS_EXPORT vtkContextDevice2D : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkContextDevice2D, vtkObject);
vtkTypeMacro(vtkContextDevice2D, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -26,7 +26,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkContextItem, "1.8");
vtkCxxSetObjectMacro(vtkContextItem, Transform, vtkTransform2D);
//-----------------------------------------------------------------------------
......
......@@ -33,7 +33,7 @@ class vtkContextMouseEvent;
class VTK_CHARTS_EXPORT vtkContextItem : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkContextItem, vtkObject);
vtkTypeMacro(vtkContextItem, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -21,7 +21,6 @@
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkContextMapper2D, "1.1");
vtkStandardNewMacro(vtkContextMapper2D);
//-----------------------------------------------------------------------------
vtkContextMapper2D::vtkContextMapper2D()
......
......@@ -33,7 +33,7 @@ class vtkAbstractArray;
class VTK_CHARTS_EXPORT vtkContextMapper2D : public vtkAlgorithm
{
public:
vtkTypeRevisionMacro(vtkContextMapper2D, vtkAlgorithm);
vtkTypeMacro(vtkContextMapper2D, vtkAlgorithm);
virtual void PrintSelf(ostream &os, vtkIndent indent);
static vtkContextMapper2D *New();
......
......@@ -144,7 +144,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkContextScene, "1.19");
vtkStandardNewMacro(vtkContextScene);
vtkCxxSetObjectMacro(vtkContextScene, AnnotationLink, vtkAnnotationLink);
......
......@@ -41,7 +41,7 @@ class vtkContextBufferId;
class VTK_CHARTS_EXPORT vtkContextScene : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkContextScene, vtkObject);
vtkTypeMacro(vtkContextScene, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -27,7 +27,6 @@
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkContextView, "1.4");
vtkStandardNewMacro(vtkContextView);
vtkCxxSetObjectMacro(vtkContextView, Context, vtkContext2D);
......
......@@ -31,7 +31,7 @@ class VTK_CHARTS_EXPORT vtkContextView : public vtkRenderView
{
public:
void PrintSelf(ostream& os, vtkIndent indent);
vtkTypeRevisionMacro(vtkContextView,vtkRenderView);
vtkTypeMacro(vtkContextView,vtkRenderView);
static vtkContextView* New();
......
......@@ -29,7 +29,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkImageItem, "1.8.4.1");
vtkStandardNewMacro(vtkImageItem);
//-----------------------------------------------------------------------------
......
......@@ -31,7 +31,7 @@ class vtkImageData;
class VTK_CHARTS_EXPORT vtkImageItem : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkImageItem, vtkContextItem);
vtkTypeMacro(vtkImageItem, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
static vtkImageItem *New();
......
......@@ -149,7 +149,6 @@ public:
};
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkOpenGLContextDevice2D, "1.25");
vtkStandardNewMacro(vtkOpenGLContextDevice2D);
//-----------------------------------------------------------------------------
......
......@@ -35,7 +35,7 @@ class vtkOpenGLExtensionManager;
class VTK_CHARTS_EXPORT vtkOpenGLContextDevice2D : public vtkContextDevice2D
{
public:
vtkTypeRevisionMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
vtkTypeMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -19,7 +19,6 @@
#include "vtkColor.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkPen, "1.7");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPen);
......
......@@ -32,7 +32,7 @@
class VTK_CHARTS_EXPORT vtkPen : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkPen, vtkObject);
vtkTypeMacro(vtkPen, vtkObject);
virtual void PrintSelf(ostream &os, vtkIndent indent);
static vtkPen *New();
......
......@@ -26,7 +26,6 @@
#include "vtkStdString.h"
vtkCxxRevisionMacro(vtkPlot, "1.14");
vtkCxxSetObjectMacro(vtkPlot, Selection, vtkIdTypeArray);
vtkCxxSetObjectMacro(vtkPlot, XAxis, vtkAxis);
vtkCxxSetObjectMacro(vtkPlot, YAxis, vtkAxis);
......
......@@ -35,7 +35,7 @@ class vtkVector2f;
class VTK_CHARTS_EXPORT vtkPlot : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkPlot, vtkContextItem);
vtkTypeMacro(vtkPlot, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -33,7 +33,6 @@
#include "vtkstd/vector"
#include "vtkstd/algorithm"
vtkCxxRevisionMacro(vtkPlotBar, "1.7");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPlotBar);
......
......@@ -32,7 +32,7 @@ class vtkStdString;
class VTK_CHARTS_EXPORT vtkPlotBar : public vtkPlot
{
public:
vtkTypeRevisionMacro(vtkPlotBar, vtkPlot);
vtkTypeMacro(vtkPlotBar, vtkPlot);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -24,7 +24,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkPlotGrid, "1.5.4.1");
vtkCxxSetObjectMacro(vtkPlotGrid, XAxis, vtkAxis);
vtkCxxSetObjectMacro(vtkPlotGrid, YAxis, vtkAxis);
//-----------------------------------------------------------------------------
......
......@@ -34,7 +34,7 @@ class vtkAxis;
class VTK_CHARTS_EXPORT vtkPlotGrid : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkPlotGrid, vtkContextItem);
vtkTypeMacro(vtkPlotGrid, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -38,7 +38,6 @@
#include "vtkstd/vector"
#include "vtkstd/algorithm"
vtkCxxRevisionMacro(vtkPlotLine, "1.29");
// PIMPL for STL vector...
class vtkPlotLine::VectorPIMPL : public vtkstd::vector<vtkVector2f>
......
......@@ -33,7 +33,7 @@ class vtkImageData;
class VTK_CHARTS_EXPORT vtkPlotLine : public vtkPlot
{
public:
vtkTypeRevisionMacro(vtkPlotLine, vtkPlot);
vtkTypeMacro(vtkPlotLine, vtkPlot);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -49,7 +49,6 @@ public:
bool SelectionInitialized;
};
vtkCxxRevisionMacro(vtkPlotParallelCoordinates, "1.3");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPlotParallelCoordinates);
......
......@@ -32,7 +32,7 @@ class vtkStdString;
class VTK_CHARTS_EXPORT vtkPlotParallelCoordinates : public vtkPlot
{
public:
vtkTypeRevisionMacro(vtkPlotParallelCoordinates, vtkPlot);
vtkTypeMacro(vtkPlotParallelCoordinates, vtkPlot);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -30,7 +30,6 @@
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkPlotPoints, "1.4");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPlotPoints);
......
......@@ -32,7 +32,7 @@ class vtkStdString;
class VTK_CHARTS_EXPORT vtkPlotPoints : public vtkPlot
{
public:
vtkTypeRevisionMacro(vtkPlotPoints, vtkPlot);
vtkTypeMacro(vtkPlotPoints, vtkPlot);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -27,7 +27,6 @@
#include "vtkObjectFactory.h"
//-----------------------------------------------------------------------------
vtkCxxRevisionMacro(vtkTooltipItem, "1.1");
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkTooltipItem);
......
......@@ -34,7 +34,7 @@ class vtkTextProperty;
class VTK_CHARTS_EXPORT vtkTooltipItem : public vtkContextItem
{
public:
vtkTypeRevisionMacro(vtkTooltipItem, vtkContextItem);
vtkTypeMacro(vtkTooltipItem, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
// Description:
......
......@@ -32,7 +32,7 @@ public:
{
}
vtkTypeRevisionMacro(vtkTestPoints,vtkPoints);
vtkTypeMacro(vtkTestPoints,vtkPoints);
static vtkTestPoints* New() { return new vtkTestPoints; }
vtkTestPoints() { }
private:
......@@ -40,7 +40,6 @@ private:
void operator=(const vtkTestPoints&);
};
vtkCxxRevisionMacro(vtkTestPoints, "1.24");
class vtkTestPoints2 : public vtkPoints
{
......@@ -50,7 +49,7 @@ public:
}
// Methods from vtkObject
vtkTypeRevisionMacro(vtkTestPoints2,vtkPoints);
vtkTypeMacro(vtkTestPoints2,vtkPoints);
static vtkTestPoints2* New() { return new vtkTestPoints2; }
vtkTestPoints2() { }
private:
......@@ -58,7 +57,6 @@ private:
void operator=(const vtkTestPoints2&);
};
vtkCxxRevisionMacro(vtkTestPoints2, "1.24");
VTK_CREATE_CREATE_FUNCTION(vtkTestPoints);
VTK_CREATE_CREATE_FUNCTION(vtkTestPoints2);
......
......@@ -234,7 +234,7 @@ class TestVTKFiles:
rm = regx.match(line)
if rm:
found = 1
if rm.group(1) != "Revision":
if rm.group(1) == "Revision":
oldlines.append(" %4d: %s" % (cc, line))
cname = rm.group(2)
pname = rm.group(3)
......@@ -249,7 +249,7 @@ class TestVTKFiles:
rm = regx.match(line)
if rm:
found = 1
if rm.group(1) != "Revision":
if rm.group(1) == "Revision":
oldlines.append(" %4d: %s" % (cc, line))
cname = rm.group(2)
pname = rm.group(3)
......@@ -260,19 +260,19 @@ class TestVTKFiles:
self.Print( "File: %s has broken type macro(s):" % self.FileName )
for a in lines:
self.Print( a )