Include module-wide headers and export macros

Include the module-wide header from every header in each module.
Reference the export/visibility macro for the module.

Co-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
Co-Author: Chris Harris <chris.harris@kitware.com>

AMR/Core/vtkAMRBaseParticlesReader.h

@@ -21,6 +21,7 @@
 #ifndef VTKAMRBASEPARTICLESREADER_H_
 #define VTKAMRBASEPARTICLESREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
 
 class vtkInformation;
@@ -31,7 +32,7 @@ class vtkPolyData;
 class vtkDataArraySelection;
 class vtkCallbackCommand;
 
-class VTK_AMR_EXPORT vtkAMRBaseParticlesReader :
+class VTKAMRCORE_EXPORT vtkAMRBaseParticlesReader :
   public vtkMultiBlockDataSetAlgorithm
 {
   public:

AMR/Core/vtkAMRBaseReader.h

@@ -20,6 +20,7 @@
 #ifndef VTKAMRBASEREADER_H_
 #define VTKAMRBASEREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkOverlappingAMRAlgorithm.h"
 #include <vector>    // STL vector header
 #include <map>       // STL map header
@@ -35,7 +36,7 @@ class vtkAMRDataSetCache;
 class vtkUniformGrid;
 class vtkDataArray;
 
-class VTK_AMR_EXPORT vtkAMRBaseReader :
+class VTKAMRCORE_EXPORT vtkAMRBaseReader :
   public vtkOverlappingAMRAlgorithm
 {
   public:

AMR/Core/vtkAMRCutPlane.h

@@ -22,6 +22,7 @@
 #ifndef VTKAMRCUTPLANE_H_
 #define VTKAMRCUTPLANE_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
 
 #include <vector> // For STL vector
@@ -41,7 +42,7 @@ class vtkCellArray;
 class vtkPointData;
 class vtkCellData;
 
-class VTK_AMR_EXPORT vtkAMRCutPlane : public vtkMultiBlockDataSetAlgorithm
+class VTKAMRCORE_EXPORT vtkAMRCutPlane : public vtkMultiBlockDataSetAlgorithm
 {
   public:
     static vtkAMRCutPlane *New();

AMR/Core/vtkAMRDataSetCache.h

@@ -23,13 +23,14 @@
 #ifndef VTKAMRDATASETCACHE_H_
 #define VTKAMRDATASETCACHE_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkObject.h"
 #include <map> // For STL map used as the data-structure for the cache.
 
 class vtkUniformGrid;
 class vtkDataArray;
 
-class VTK_AMR_EXPORT vtkAMRDataSetCache : public vtkObject
+class VTKAMRCORE_EXPORT vtkAMRDataSetCache : public vtkObject
 {
   public:
     static vtkAMRDataSetCache* New();

AMR/Core/vtkAMREnzoParticlesReader.h

@@ -24,6 +24,7 @@
 #ifndef VTKAMRENZOPARTICLESREADER_H_
 #define VTKAMRENZOPARTICLESREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkAMRBaseParticlesReader.h"
 
 
@@ -32,7 +33,7 @@ class vtkDataArray;
 class vtkIntArray;
 class vtkEnzoReaderInternal;
 
-class VTK_AMR_EXPORT vtkAMREnzoParticlesReader :
+class VTKAMRCORE_EXPORT vtkAMREnzoParticlesReader :
   public vtkAMRBaseParticlesReader
 {
   public:

AMR/Core/vtkAMREnzoReader.h

@@ -21,6 +21,7 @@
 #ifndef VTKAMRENZOREADER_H_
 #define VTKAMRENZOREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkAMRBaseReader.h"
 
 #include <map>     // For STL map
@@ -28,7 +29,7 @@
 class vtkOverlappingAMR;
 class vtkEnzoReaderInternal;
 
-class VTK_AMR_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
+class VTKAMRCORE_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
 {
   public:
     static vtkAMREnzoReader* New();

AMR/Core/vtkAMRFlashParticlesReader.h

@@ -20,6 +20,7 @@
 #ifndef VTKAMRFLASHPARTICLESREADER_H_
 #define VTKAMRFLASHPARTICLESREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkAMRBaseParticlesReader.h"
 
 class vtkIndent;
@@ -28,7 +29,7 @@ class vtkPointData;
 class vtkIdList;
 class vtkFlashReaderInternal;
 
-class VTK_AMR_EXPORT vtkAMRFlashParticlesReader :
+class VTKAMRCORE_EXPORT vtkAMRFlashParticlesReader :
   public vtkAMRBaseParticlesReader
 {
   public:

AMR/Core/vtkAMRFlashReader.h

@@ -21,12 +21,13 @@
 #ifndef VTKAMRFLASHREADER_H_
 #define VTKAMRFLASHREADER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkAMRBaseReader.h"
 
 class vtkOverlappingAMR;
 class vtkFlashReaderInternal;
 
-class VTK_AMR_EXPORT vtkAMRFlashReader : public vtkAMRBaseReader
+class VTKAMRCORE_EXPORT vtkAMRFlashReader : public vtkAMRBaseReader
 {
   public:
     static vtkAMRFlashReader* New();

AMR/Core/vtkAMRGaussianPulseSource.h

@@ -19,6 +19,7 @@
 #ifndef VTKAMRGAUSSIANPULSESOURCE_H_
 #define VTKAMRGAUSSIANPULSESOURCE_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkOverlappingAMRAlgorithm.h"
 
 #include <cmath> // For std::exp
@@ -28,7 +29,7 @@ class vtkUniformGrid;
 class vtkInformation;
 class vtkInformationVector;
 
-class VTK_AMR_EXPORT vtkAMRGaussianPulseSource :
+class VTKAMRCORE_EXPORT vtkAMRGaussianPulseSource :
   public vtkOverlappingAMRAlgorithm
 {
   public:

AMR/Core/vtkAMRResampleFilter.h

@@ -31,6 +31,7 @@
 #ifndef __vtkAMRResampleFilter_h
 #define __vtkAMRResampleFilter_h
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
 #include <vector> // For STL vector
 
@@ -45,7 +46,7 @@ class vtkCellData;
 class vtkPointData;
 class vtkIndent;
 
-class VTK_AMR_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgorithm
+class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgorithm
 {
   public:
     static vtkAMRResampleFilter *New();

AMR/Core/vtkAMRSliceFilter.h

@@ -22,6 +22,7 @@
 #ifndef VTKAMRSLICEFILTER_H_
 #define VTKAMRSLICEFILTER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkOverlappingAMRAlgorithm.h"
 
 #include <vector> // For STL vector
@@ -34,7 +35,7 @@ class vtkPlane;
 class vtkAMRBox;
 class vtkUniformGrid;
 
-class VTK_AMR_EXPORT vtkAMRSliceFilter :
+class VTKAMRCORE_EXPORT vtkAMRSliceFilter :
   public vtkOverlappingAMRAlgorithm
 {
   public:

AMR/Core/vtkAMRToMultiBlockFilter.h

@@ -24,6 +24,7 @@
 #ifndef VTKAMRTOMULTIBLOCKFILTER_H_
 #define VTKAMRTOMULTIBLOCKFILTER_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkMultiBlockDataSetAlgorithm.h"
 
 class vtkInformation;
@@ -33,7 +34,7 @@ class vtkMultiProcessController;
 class vtkOverlappingAMR;
 class vtkMultiBlockDataSet;
 
-class VTK_AMR_EXPORT vtkAMRToMultiBlockFilter :
+class VTKAMRCORE_EXPORT vtkAMRToMultiBlockFilter :
   public vtkMultiBlockDataSetAlgorithm
 {
   public:

AMR/Core/vtkAMRUtilities.h

@@ -24,6 +24,7 @@
 #ifndef VTKAMRUTILITIES_H_
 #define VTKAMRUTILITIES_H_
 
+#include "vtkAMRCoreModule.h" // For export macro
 #include "vtkObject.h"
 #include <vector> // For C++ vector
 
@@ -33,7 +34,7 @@ class vtkOverlappingAMR;
 class vtkMultiProcessController;
 class vtkUniformGrid;
 
-class VTK_PARALLEL_EXPORT vtkAMRUtilities : public vtkObject
+class VTKAMRCORE_EXPORT vtkAMRUtilities : public vtkObject
 {
   public:
 

Charts/Core/vtkAxis.h

@@ -23,6 +23,7 @@
 #ifndef __vtkAxis_h
 #define __vtkAxis_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
 #include "vtkSmartPointer.h" // For vtkSmartPointer
 #include "vtkVector.h"       // For position variables
@@ -36,7 +37,7 @@ class vtkDoubleArray;
 class vtkStringArray;
 class vtkTextProperty;
 
-class VTK_CHARTS_EXPORT vtkAxis : public vtkContextItem
+class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
 {
 public:
   vtkTypeMacro(vtkAxis, vtkContextItem);

Charts/Core/vtkAxisExtended.h

@@ -26,6 +26,7 @@
 #define __vtkAxisExtended_h
 #endif
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkObject.h"
 #include "vtkVector.h" // Needed for vtkVector
 //
@@ -35,7 +36,7 @@
 #  define VTK_DBL_EPSILON    DBL_EPSILON
 #endif  // DBL_EPSILON
 
-class VTK_CHARTS_EXPORT vtkAxisExtended : public vtkObject
+class VTKCHARTSCORE_EXPORT vtkAxisExtended : public vtkObject
 {
 public:
    vtkTypeMacro(vtkAxisExtended, vtkObject);

Charts/Core/vtkChart.h

@@ -21,6 +21,7 @@
 #ifndef __vtkChart_h
 #define __vtkChart_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
 #include "vtkRect.h"         // For vtkRectf
 #include "vtkStdString.h"    // For vtkStdString ivars
@@ -37,7 +38,7 @@ class vtkChartLegend;
 class vtkInteractorStyle;
 class vtkAnnotationLink;
 
-class VTK_CHARTS_EXPORT vtkChart : public vtkContextItem
+class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
 {
 public:
   vtkTypeMacro(vtkChart, vtkContextItem);

Charts/Core/vtkChartHistogram2D.h

@@ -21,6 +21,7 @@
 #ifndef __vtkChart2DHistogram_h
 #define __vtkChart2DHistogram_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChartXY.h"
 #include "vtkSmartPointer.h" // For SP ivars
 
@@ -29,7 +30,7 @@ class vtkPlotHistogram2D;
 class vtkImageData;
 class vtkScalarsToColors;
 
-class VTK_CHARTS_EXPORT vtkChartHistogram2D : public vtkChartXY
+class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
 {
 public:
   vtkTypeMacro(vtkChartHistogram2D, vtkChartXY);

Charts/Core/vtkChartLegend.h

@@ -23,6 +23,7 @@
 #ifndef __vtkChartLegend_h
 #define __vtkChartLegend_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkContextItem.h"
 #include "vtkNew.h"         // For vtkNew
 #include "vtkRect.h"        // For vtkRectf return value
@@ -32,7 +33,7 @@ class vtkPen;
 class vtkBrush;
 class vtkTextProperty;
 
-class VTK_CHARTS_EXPORT vtkChartLegend : public vtkContextItem
+class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
 {
 public:
   vtkTypeMacro(vtkChartLegend, vtkContextItem);

Charts/Core/vtkChartMatrix.h

@@ -23,12 +23,13 @@
 #ifndef __vtkChartMatrix_h
 #define __vtkChartMatrix_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkAbstractContextItem.h"
 #include "vtkVector.h" // For ivars
 
 class vtkChart;
 
-class VTK_CHARTS_EXPORT vtkChartMatrix : public vtkAbstractContextItem
+class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
 {
 public:
   vtkTypeMacro(vtkChartMatrix, vtkAbstractContextItem);

Charts/Core/vtkChartParallelCoordinates.h

@@ -21,6 +21,7 @@
 #ifndef __vtkChartParallelCoordinates_h
 #define __vtkChartParallelCoordinates_h
 
+#include "vtkChartsCoreModule.h" // For export macro
 #include "vtkChart.h"
 
 class vtkIdTypeArray;
@@ -28,7 +29,7 @@ class vtkStdString;
 class vtkStringArray;
 class vtkPlotParallelCoordinates;
 
-class VTK_CHARTS_EXPORT vtkChartParallelCoordinates : public vtkChart
+class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
 {
 public:
   vtkTypeMacro(vtkChartParallelCoordinates, vtkChart);