Merge topic 'BTX-ETX-purge2'

4d127b1 Remove all BTX and ETX markers from VTK headers
55878a2 Manual search & destroy of (B|E)TX

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: David E DeMarle <[email protected]>
Merge-request: !1519

Accelerators/Piston/vtkPistonDataObject.h

@@ -55,11 +55,10 @@ class VTKACCELERATORSPISTON_EXPORT vtkPistonDataObject : public vtkDataObject
   // A convenience handle to get whatever is actually stored in the reference.
   void * GetReferredData();
 
-//BTX
   // Description:
   // GPU level representation and storage this manages.
   vtkPistonReference *GetReference() { return this->Reference; };
-//ETX
+
   // Description:
   // Shallow/deep copy the data from src into this object.
   virtual void ShallowCopy(vtkDataObject* src);
@@ -101,12 +100,10 @@ class VTKACCELERATORSPISTON_EXPORT vtkPistonDataObject : public vtkDataObject
   // Set scalars range.
   void SetScalarsRange(double range[2]);
 
-  //BTX
   // Description:
   // Retrieve an instance of this class from an information object.
   static vtkPistonDataObject* GetData(vtkInformation* info);
   static vtkPistonDataObject* GetData(vtkInformationVector* v, int i=0);
-  //ETX
 
 protected:
   vtkPistonDataObject();

CMakeLists.txt

@@ -455,9 +455,6 @@ set(VTK_PYTHON_VERSION 2 CACHE STRING
 # Add the option for build the Python wrapping to VTK.
 option(VTK_WRAP_JAVA "Should VTK Java wrapping be built?" OFF)
 
-# FIXME: This variable should not be necessary once we are done
-set(VTK_IGNORE_BTX ON CACHE INTERNAL "VTK modular always ignores BTX")
-
 # Force reset of hints file location in cache if it was moved
 if(VTK_WRAP_HINTS)
   if(NOT EXISTS ${VTK_WRAP_HINTS})

Charts/Core/vtkAxis.h

@@ -433,7 +433,6 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
   // is TICK_SIMPLE.
   vtkStdString GenerateSimpleLabel(double val);
 
-//BTX
 protected:
   vtkAxis();
   ~vtkAxis();
@@ -602,7 +601,6 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
   // Return true if the value is in range, false otherwise.
   bool InRange(double value);
 
-//ETX
 };
 
 #endif //vtkAxis_h

Charts/Core/vtkChart.h

@@ -44,7 +44,6 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
   vtkTypeMacro(vtkChart, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
-//BTX
   // Description:
   // Enum of the available chart types
   enum {
@@ -81,7 +80,6 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
   enum EventIds {
     UpdateRange = 1002
   };
-//ETX
 
   // Description:
   // Paint event for the chart, called whenever the chart needs to be drawn

Charts/Core/vtkChartBox.h

@@ -102,7 +102,6 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
   // only contain one plot, this will replace the previous plot.
   virtual void SetPlot(vtkPlotBox *plot);
 
-//BTX
   // Description:
   // Return true if the supplied x, y coordinate is inside the item.
   virtual bool Hit(const vtkContextMouseEvent &mouse);
@@ -119,8 +118,6 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
   // Mouse button release event.
   virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
 
-//ETX
-
   // Description:
   // Set the vtkTooltipItem object that will be displayed by the chart.
   virtual void SetTooltip(vtkTooltipItem *tooltip);
@@ -135,7 +132,7 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
                               const vtkVector2d &,
                               vtkIdType, vtkPlot*,
                               vtkIdType segmentIndex = -1);
-//BTX
+
 protected:
   vtkChartBox();
   ~vtkChartBox();
@@ -187,7 +184,7 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
 private:
   vtkChartBox(const vtkChartBox &); // Not implemented.
   void operator=(const vtkChartBox &);   // Not implemented.
-//ETX
+
 };
 
 // Description:

Charts/Core/vtkChartParallelCoordinates.h

@@ -92,7 +92,6 @@ class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
   // only contain one plot, this will replace the previous plot.
   virtual void SetPlot(vtkPlotParallelCoordinates *plot);
 
-//BTX
   // Description:
   // Return true if the supplied x, y coordinate is inside the item.
   virtual bool Hit(const vtkContextMouseEvent &mouse);
@@ -120,9 +119,7 @@ class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
   // Description:
   // Mouse wheel event, positive delta indicates forward movement of the wheel.
   virtual bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta);
-//ETX
 
-//BTX
 protected:
   vtkChartParallelCoordinates();
   ~vtkChartParallelCoordinates();
@@ -154,7 +151,7 @@ class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
 private:
   vtkChartParallelCoordinates(const vtkChartParallelCoordinates &); // Not implemented.
   void operator=(const vtkChartParallelCoordinates &);   // Not implemented.
-//ETX
+
 };
 
 #endif //vtkChartParallelCoordinates_h

Charts/Core/vtkChartPie.h

@@ -78,7 +78,6 @@ class VTKCHARTSCORE_EXPORT vtkChartPie : public vtkChart
   // Set the vtkContextScene for the item, always set for an item in a scene.
   virtual void SetScene(vtkContextScene *scene);
 
-//BTX
   // Description:
   // Return true if the supplied x, y coordinate is inside the item.
   virtual bool Hit(const vtkContextMouseEvent &mouse);
@@ -106,9 +105,7 @@ class VTKCHARTSCORE_EXPORT vtkChartPie : public vtkChart
   // Description:
   // Mouse wheel event, positive delta indicates forward movement of the wheel.
   virtual bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta);
-//ETX
 
-//BTX
 protected:
   vtkChartPie();
   ~vtkChartPie();
@@ -141,7 +138,6 @@ class VTKCHARTSCORE_EXPORT vtkChartPie : public vtkChart
   // Private implementation details
   vtkChartPiePrivate *Private;
 
-//ETX
 };
 
 #endif //vtkChartPie_h

Charts/Core/vtkChartXY.h

@@ -211,7 +211,6 @@ class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart
                               vtkIdType, vtkPlot*,
                               vtkIdType segmentIndex = -1);
 
-//BTX
   // Description:
   // Return true if the supplied x, y coordinate is inside the item.
   virtual bool Hit(const vtkContextMouseEvent &mouse);
@@ -243,9 +242,7 @@ class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart
   // Description:
   // Key press event.
   virtual bool KeyPressEvent(const vtkContextKeyEvent &key);
-//ETX
 
-//BTX
 protected:
   vtkChartXY();
   ~vtkChartXY();
@@ -378,7 +375,6 @@ class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart
                              vtkVector2f &min, vtkVector2f &max,
                              vtkContextPolygon &polygon);
 
-//ETX
 };
 
 // Description:

Charts/Core/vtkChartXYZ.h

@@ -117,7 +117,6 @@ class VTKCHARTSCORE_EXPORT vtkChartXYZ : public vtkContextItem
   // properly render the data within the chart.
   void RecalculateTransform();
 
-  //BTX
   // Description:
   // Returns true if the transform is interactive, false otherwise.
   virtual bool Hit(const vtkContextMouseEvent &mouse);
@@ -139,7 +138,6 @@ class VTKCHARTSCORE_EXPORT vtkChartXYZ : public vtkContextItem
   // different 2D views.  "x" changes the view so we're looking down the X axis.
   // Similar behavior occurs for "y" or "z".
   virtual bool KeyPressEvent(const vtkContextKeyEvent &key);
-  //ETX
 
 protected:
   vtkChartXYZ();

Charts/Core/vtkPiecewisePointHandleItem.h

@@ -81,7 +81,6 @@ class VTKCHARTSCORE_EXPORT vtkPiecewisePointHandleItem : public vtkContextItem
   // Mouse button release event.
   virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
 
-//BTX
 protected:
   vtkPiecewisePointHandleItem();
   ~vtkPiecewisePointHandleItem();
@@ -103,7 +102,7 @@ class VTKCHARTSCORE_EXPORT vtkPiecewisePointHandleItem : public vtkContextItem
 
   class InternalPiecewisePointHandleInfo;
   InternalPiecewisePointHandleInfo* Internal;
-//ETX
+
 };
 
 #endif //vtkPiecewisePointHandleItem_h

Charts/Core/vtkPlot.h

@@ -87,7 +87,6 @@ class VTKCHARTSCORE_EXPORT vtkPlot : public vtkContextItem
   virtual void SetTooltipPrecision(int precision);
   virtual int GetTooltipPrecision();
 
-//BTX
   // Description:
   // Generate and return the tooltip label string for this plot
   // The segmentIndex parameter is ignored, except for vtkPlotBar
@@ -110,7 +109,6 @@ class VTKCHARTSCORE_EXPORT vtkPlot : public vtkContextItem
   // Description:
   // Select all points in the specified polygon.
   virtual bool SelectPointsInPolygon(const vtkContextPolygon &polygon);
-//ETX
 
   // Description:
   // Set the plot color
@@ -296,15 +294,12 @@ class VTKCHARTSCORE_EXPORT vtkPlot : public vtkContextItem
   // Default implementation is empty.
   virtual void UpdateCache() {}
 
-//BTX
   // Description:
   // A General setter/getter that should be overridden. It can silently drop
   // options, case is important
   virtual void SetProperty(const vtkStdString &property, const vtkVariant &var);
   virtual vtkVariant GetProperty(const vtkStdString &property);
-//ETX
 
-//BTX
 protected:
   vtkPlot();
   ~vtkPlot();
@@ -392,7 +387,6 @@ class VTKCHARTSCORE_EXPORT vtkPlot : public vtkContextItem
   vtkPlot(const vtkPlot &); // Not implemented.
   void operator=(const vtkPlot &); // Not implemented.
 
-//ETX
 };
 
 #endif //vtkPlot_h

Charts/Core/vtkPlot3D.h

@@ -103,7 +103,6 @@ class VTKCHARTSCORE_EXPORT vtkPlot3D : public vtkContextItem
   virtual void SetSelection(vtkIdTypeArray *id);
   virtual vtkIdTypeArray* GetSelection();
 
-//BTX
 protected:
   vtkPlot3D();
   ~vtkPlot3D();
@@ -165,7 +164,6 @@ class VTKCHARTSCORE_EXPORT vtkPlot3D : public vtkContextItem
   vtkPlot3D(const vtkPlot3D &); // Not implemented.
   void operator=(const vtkPlot3D &); // Not implemented.
 
-//ETX
 };
 
 #endif //vtkPlot3D_h

Charts/Core/vtkPlotArea.h

@@ -78,8 +78,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotArea : public vtkPlot
   virtual bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
                            int legendIndex);
 
-//BTX
-
   // Description:
   // Function to query a plot for the nearest point to the specified coordinate.
   // Returns the index of the data series with which the point is associated, or
@@ -110,7 +108,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotArea : public vtkPlot
   vtkTableCache* TableCache;
 
   vtkTimeStamp UpdateTime;
-//ETX
+
 };
 
 #endif

Charts/Core/vtkPlotBar.h

@@ -172,7 +172,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotBar : public vtkPlot
   // Select all points in the specified rectangle.
   virtual bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max);
 
-//BTX
   // Description:
   // Function to query a plot for the nearest point to the specified coordinate.
   // Returns the index of the data series with which the point is associated or
@@ -241,7 +240,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotBar : public vtkPlot
 
   vtkPlotBarPrivate *Private;
 
-//ETX
 };
 
 #endif //vtkPlotBar_h

Charts/Core/vtkPlotBox.h

@@ -105,7 +105,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotBox : public vtkPlot
   // Get the vtkTextProperty that governs how the plot title is displayed.
   vtkGetObjectMacro(TitleProperties, vtkTextProperty);
 
-//BTX
 protected:
   vtkPlotBox();
   ~vtkPlotBox();
@@ -141,7 +140,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotBox : public vtkPlot
   vtkPlotBox(const vtkPlotBox &); // Not implemented.
   void operator=(const vtkPlotBox &); // Not implemented.
 
-//ETX
 };
 
 #endif //vtkPlotBox_h

Charts/Core/vtkPlotFunctionalBag.h

@@ -95,15 +95,14 @@ class VTKCHARTSCORE_EXPORT vtkPlotFunctionalBag : public vtkPlot
   // is available with the scalar data.
   virtual void CreateDefaultLookupTable();
 
-//BTX
   // Description:
   // Function to query a plot for the nearest point to the specified coordinate.
   // Returns the index of the data series with which the point is associated or
   // -1.
   virtual vtkIdType GetNearestPoint(const vtkVector2f& point,
                                     const vtkVector2f& tolerance,
                                     vtkVector2f* location);
-//ETX
+
   // Description:
   // Select all points in the specified rectangle.
   virtual bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max);

Charts/Core/vtkPlotGrid.h

@@ -54,7 +54,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotGrid : public vtkContextItem
   // Paint event for the axis, called whenever the axis needs to be drawn
   virtual bool Paint(vtkContext2D *painter);
 
-//BTX
 protected:
   vtkPlotGrid();
   ~vtkPlotGrid();
@@ -68,7 +67,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotGrid : public vtkContextItem
 private:
   vtkPlotGrid(const vtkPlotGrid &); // Not implemented.
   void operator=(const vtkPlotGrid &);   // Not implemented.
-//ETX
+
 };
 
 #endif //vtkPlotGrid_h

Charts/Core/vtkPlotHistogram2D.h

@@ -75,7 +75,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotHistogram2D : public vtkPlot
   virtual void SetPosition(const vtkRectf& pos);
   virtual vtkRectf GetPosition();
 
-//BTX
   // Description:
   // Generate and return the tooltip label string for this plot
   // The segmentIndex parameter is ignored.
@@ -125,7 +124,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotHistogram2D : public vtkPlot
   vtkPlotHistogram2D(const vtkPlotHistogram2D &); // Not implemented.
   void operator=(const vtkPlotHistogram2D &); // Not implemented.
 
-//ETX
 };
 
 #endif //vtkPlotHistogram2D_h

Charts/Core/vtkPlotLine.h

@@ -57,7 +57,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotLine : public vtkPlotPoints
   vtkGetMacro(PolyLine,bool);
   vtkBooleanMacro(PolyLine,bool);
 
-//BTX
 protected:
   vtkPlotLine();
   ~vtkPlotLine();
@@ -70,7 +69,6 @@ class VTKCHARTSCORE_EXPORT vtkPlotLine : public vtkPlotPoints
   vtkPlotLine(const vtkPlotLine &); // Not implemented.
   void operator=(const vtkPlotLine &); // Not implemented.
 
-//ETX
 };
 
 #endif //vtkPlotLine_h