Reduce load on the header files; take unnecessary includes out;

IO/vtkBMPReader.h

@@ -39,7 +39,6 @@
 #ifndef __vtkBMPReader_h
 #define __vtkBMPReader_h
 
-#include <stdio.h>
 #include "vtkImageReader.h"
 
 class VTK_IO_EXPORT vtkBMPReader : public vtkImageReader

IO/vtkBYUReader.h

@@ -25,7 +25,6 @@
 #ifndef __vtkBYUReader_h
 #define __vtkBYUReader_h
 
-#include <stdio.h>
 #include "vtkPolyDataSource.h"
 
 class VTK_IO_EXPORT vtkBYUReader : public vtkPolyDataSource 

IO/vtkBYUWriter.h

@@ -29,9 +29,7 @@
 #ifndef __vtkBYUWriter_h
 #define __vtkBYUWriter_h
 
-#include <stdio.h>
 #include "vtkPolyDataWriter.h"
-#include "vtkPolyData.h"
 
 class VTK_IO_EXPORT vtkBYUWriter : public vtkPolyDataWriter
 {

IO/vtkDEMReader.h

@@ -28,8 +28,8 @@
 #ifndef __vtkDEMReader_h
 #define __vtkDEMReader_h
 
-#include <stdio.h>
 #include "vtkImageSource.h"
+
 class VTK_IO_EXPORT vtkDEMReader : public vtkImageSource
 {
 public:

IO/vtkDataObjectReader.h

@@ -32,7 +32,8 @@
 #define __vtkDataObjectReader_h
 
 #include "vtkDataReader.h"
-#include "vtkDataObject.h"
+
+class vtkDataObject;
 
 class VTK_IO_EXPORT vtkDataObjectReader : public vtkDataReader
 {

IO/vtkDataObjectWriter.h

@@ -30,8 +30,7 @@
 #ifndef __vtkDataObjectWriter_h
 #define __vtkDataObjectWriter_h
 
-#include "vtkDataWriter.h"
-#include "vtkFieldData.h"
+#include "vtkDataWriter.h" // Neds data because it calls methods on it
 
 class VTK_IO_EXPORT vtkDataObjectWriter : public vtkWriter
 {

IO/vtkDataSetReader.h

@@ -35,13 +35,13 @@
 #define __vtkDataSetReader_h
 
 #include "vtkDataReader.h"
-#include "vtkDataSet.h"
 
+class vtkDataSet;
 class vtkPolyData;
-class vtkStructuredPoints;
+class vtkRectilinearGrid;
 class vtkStructuredGrid;
+class vtkStructuredPoints;
 class vtkUnstructuredGrid;
-class vtkRectilinearGrid;
 
 class VTK_IO_EXPORT vtkDataSetReader : public vtkDataReader
 {
@@ -55,8 +55,7 @@ public:
   // to know the type of the data, the FileName must be set before GetOutput 
   // is applied.
   vtkDataSet *GetOutput();
-  vtkDataSet *GetOutput(int idx)
-    {return static_cast<vtkDataSet *>(this->vtkSource::GetOutput(idx)); };
+  vtkDataSet *GetOutput(int idx);
 
   // Description:
   // Get the output as various concrete types. This method is typically used

IO/vtkDataWriter.h

@@ -29,7 +29,6 @@
 #ifndef __vtkDataWriter_h
 #define __vtkDataWriter_h
 
-#include <stdio.h>
 #include "vtkWriter.h"
 
 class vtkDataSet;

IO/vtkEnSightReader.h

@@ -21,7 +21,8 @@
 #define __vtkEnSightReader_h
 
 #include "vtkDataSetSource.h"
-#include "vtkCollection.h"
+
+class vtkCollection;
 
 // element types
 #define VTK_ENSIGHT_POINT               0

IO/vtkGESignaReader.h

@@ -32,7 +32,6 @@
 #ifndef __vtkGESignaReader_h
 #define __vtkGESignaReader_h
 
-#include <stdio.h>
 #include "vtkMedicalImageReader2.h"
 
 class VTK_IO_EXPORT vtkGESignaReader : public vtkMedicalImageReader2

IO/vtkImageReader2Collection.h

@@ -26,7 +26,8 @@
 #define __vtkImageReader2Collection_h
 
 #include "vtkCollection.h"
-#include "vtkImageReader2.h"
+
+class vtkImageReader2;
 
 class VTK_IO_EXPORT vtkImageReader2Collection : public vtkCollection
 {
@@ -56,14 +57,4 @@ private:
   void operator=(const vtkImageReader2Collection&);  // Not implemented.
 };
 
-inline void vtkImageReader2Collection::AddItem(vtkImageReader2 *f) 
-{
-  this->vtkCollection::AddItem((vtkObject *)f);
-}
-
-inline vtkImageReader2 *vtkImageReader2Collection::GetNextItem() 
-{ 
-  return static_cast<vtkImageReader2*>(this->GetNextItemAsObject());
-}
-
 #endif

IO/vtkImageWriter.h

@@ -27,7 +27,8 @@
 #define __vtkImageWriter_h
 
 #include "vtkProcessObject.h"
-#include "vtkImageData.h"
+
+class vtkImageData;
 
 class VTK_IO_EXPORT vtkImageWriter : public vtkProcessObject
 {

IO/vtkJPEGReader.h

@@ -26,7 +26,6 @@
 #ifndef __vtkJPEGReader_h
 #define __vtkJPEGReader_h
 
-#include <stdio.h>
 #include "vtkImageReader2.h"
 
 class VTK_IO_EXPORT vtkJPEGReader : public vtkImageReader2

IO/vtkJPEGWriter.h

@@ -29,6 +29,9 @@
 
 #include "vtkImageWriter.h"
 
+class vtkUnsignedCharArray;
+class vtkImageData;
+
 class VTK_IO_EXPORT vtkJPEGWriter : public vtkImageWriter
 {
 public:

IO/vtkMCubesReader.h

@@ -50,10 +50,7 @@
 #ifndef __vtkMCubesReader_h
 #define __vtkMCubesReader_h
 
-#include <stdio.h>
 #include "vtkPolyDataSource.h"
-#include "vtkPoints.h"
-#include "vtkCellArray.h"
 
 #define VTK_FILE_BYTE_ORDER_BIG_ENDIAN 0
 #define VTK_FILE_BYTE_ORDER_LITTLE_ENDIAN 1

IO/vtkMCubesWriter.h

@@ -34,7 +34,6 @@
 #ifndef __vtkMCubesWriter_h
 #define __vtkMCubesWriter_h
 
-#include <stdio.h>
 #include "vtkPolyDataWriter.h"
 
 class VTK_IO_EXPORT vtkMCubesWriter : public vtkPolyDataWriter

IO/vtkOBJReader.h

@@ -25,7 +25,6 @@
 #ifndef __vtkOBJReader_h
 #define __vtkOBJReader_h
 
-#include <stdio.h>
 #include "vtkPolyDataSource.h"
 
 class VTK_IO_EXPORT vtkOBJReader : public vtkPolyDataSource 

IO/vtkPLOT3DReader.h

@@ -78,10 +78,9 @@
 #ifndef __vtkPLOT3DReader_h
 #define __vtkPLOT3DReader_h
 
-#include <stdio.h>
 #include "vtkStructuredGridSource.h"
-#include "vtkIntArray.h"
 
+class vtkIntArray;
 class vtkFloatArray;
 
 // file formats

IO/vtkPLY.h

@@ -65,7 +65,6 @@ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 #ifndef __vtkPLY_h
 #define __vtkPLY_h
 
-#include <stdio.h>
 #include <stddef.h>
 #include "vtkObject.h"
 

IO/vtkPLYWriter.h

@@ -35,6 +35,7 @@
 #include "vtkPolyDataWriter.h"
 
 class vtkScalarsToColors;
+class vtkDataSetAttributes;
 
 #define VTK_LITTLE_ENDIAN 0
 #define VTK_BIG_ENDIAN    1

IO/vtkPNGReader.h

@@ -26,7 +26,6 @@
 #ifndef __vtkPNGReader_h
 #define __vtkPNGReader_h
 
-#include <stdio.h>
 #include "vtkImageReader2.h"
 
 class VTK_IO_EXPORT vtkPNGReader : public vtkImageReader2

IO/vtkPNGWriter.h

@@ -28,6 +28,9 @@
 
 #include "vtkImageWriter.h"
 
+class vtkImageData;
+class vtkUnsignedCharArray;
+
 class VTK_IO_EXPORT vtkPNGWriter : public vtkImageWriter
 {
 public:

IO/vtkPNMReader.h

@@ -36,7 +36,6 @@
 #ifndef __vtkPNMReader_h
 #define __vtkPNMReader_h
 
-#include <stdio.h>
 #include "vtkImageReader.h"
 
 class VTK_IO_EXPORT vtkPNMReader : public vtkImageReader

IO/vtkPolyDataReader.h

@@ -32,7 +32,8 @@
 #define __vtkPolyDataReader_h
 
 #include "vtkDataReader.h"
-#include "vtkPolyData.h"
+
+class vtkPolyData;
 
 class VTK_IO_EXPORT vtkPolyDataReader : public vtkDataReader
 {

IO/vtkPolyDataWriter.h

@@ -26,7 +26,8 @@
 #define __vtkPolyDataWriter_h
 
 #include "vtkDataWriter.h"
-#include "vtkPolyData.h"
+
+class vtkPolyData;
 
 class VTK_IO_EXPORT vtkPolyDataWriter : public vtkDataWriter
 {

IO/vtkRectilinearGridReader.h

@@ -32,7 +32,8 @@
 #define __vtkRectilinearGridReader_h
 
 #include "vtkDataReader.h"
-#include "vtkRectilinearGrid.h"
+
+class vtkRectilinearGrid;
 
 class VTK_IO_EXPORT vtkRectilinearGridReader : public vtkDataReader
 {

IO/vtkRectilinearGridWriter.h

@@ -27,7 +27,8 @@
 #define __vtkRectilinearGridWriter_h
 
 #include "vtkDataWriter.h"
-#include "vtkRectilinearGrid.h"
+
+class vtkRectilinearGrid;
 
 class VTK_IO_EXPORT vtkRectilinearGridWriter : public vtkDataWriter
 {

IO/vtkSLCReader.h

@@ -25,7 +25,6 @@
 #ifndef __vtkSLCReader_h
 #define __vtkSLCReader_h
 
-#include <stdio.h>
 #include "vtkImageReader2.h"
 
 class VTK_IO_EXPORT vtkSLCReader : public vtkImageReader2 

IO/vtkSTLReader.h

@@ -35,10 +35,10 @@
 #ifndef __vtkSTLReader_h
 #define __vtkSTLReader_h
 
-#include <stdio.h>
 #include "vtkPolyDataSource.h"
-#include "vtkPoints.h"
-#include "vtkCellArray.h"
+
+class vtkPoints;
+class vtkCellArray;
 
 class VTK_IO_EXPORT vtkSTLReader : public vtkPolyDataSource 
 {

IO/vtkSTLWriter.h

@@ -29,9 +29,7 @@
 #ifndef __vtkSTLWriter_h
 #define __vtkSTLWriter_h
 
-#include <stdio.h>
 #include "vtkPolyDataWriter.h"
-#include "vtkPolyData.h"
 
 class VTK_IO_EXPORT vtkSTLWriter : public vtkPolyDataWriter
 {

IO/vtkStructuredGridReader.h

@@ -32,7 +32,8 @@
 #define __vtkStructuredGridReader_h
 
 #include "vtkDataReader.h"
-#include "vtkStructuredGrid.h"
+
+class vtkStructuredGrid;
 
 class VTK_IO_EXPORT vtkStructuredGridReader : public vtkDataReader
 {

IO/vtkStructuredGridWriter.h

@@ -27,7 +27,8 @@
 #define __vtkStructuredGridWriter_h
 
 #include "vtkDataWriter.h"
-#include "vtkStructuredGrid.h"
+
+class vtkStructuredGrid;
 
 class VTK_IO_EXPORT vtkStructuredGridWriter : public vtkDataWriter
 {

IO/vtkStructuredPointsReader.h

@@ -32,7 +32,8 @@
 #define __vtkStructuredPointsReader_h
 
 #include "vtkDataReader.h"
-#include "vtkStructuredPoints.h"
+
+class vtkStructuredPoints;
 
 class VTK_IO_EXPORT vtkStructuredPointsReader : public vtkDataReader
 {

IO/vtkStructuredPointsWriter.h

@@ -26,7 +26,8 @@
 #define __vtkStructuredPointsWriter_h
 
 #include "vtkDataWriter.h"
-#include "vtkImageData.h"
+
+class vtkImageData;
 
 class VTK_IO_EXPORT vtkStructuredPointsWriter : public vtkDataWriter
 {

IO/vtkTIFFReader.h

@@ -50,7 +50,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __vtkTIFFReader_h
 #define __vtkTIFFReader_h
 
-#include <stdio.h>
 #include "vtkImageReader2.h"
 
 //BTX

IO/vtkTIFFWriter.h

@@ -22,7 +22,6 @@
 #ifndef __vtkTIFFWriter_h
 #define __vtkTIFFWriter_h
 
-#include <stdio.h>
 #include "vtkImageWriter.h"
 
 class VTK_IO_EXPORT vtkTIFFWriter : public vtkImageWriter

IO/vtkUGFacetReader.h

@@ -24,9 +24,9 @@
 #ifndef __vtkUGFacetReader_h
 #define __vtkUGFacetReader_h
 
-#include <stdio.h>
 #include "vtkPolyDataSource.h"
-#include "vtkShortArray.h"
+
+class vtkShortArray;
 
 class VTK_IO_EXPORT vtkUGFacetReader : public vtkPolyDataSource 
 {

IO/vtkUnstructuredGridReader.h

@@ -32,7 +32,8 @@
 #define __vtkUnstructuredGridReader_h
 
 #include "vtkDataReader.h"
-#include "vtkUnstructuredGrid.h"
+
+class vtkUnstructuredGrid;
 
 class VTK_IO_EXPORT vtkUnstructuredGridReader : public vtkDataReader
 {

IO/vtkUnstructuredGridWriter.h

@@ -26,7 +26,7 @@
 #define __vtkUnstructuredGridWriter_h
 
 #include "vtkDataWriter.h"
-#include "vtkUnstructuredGrid.h"
+class vtkUnstructuredGrid;
 
 class VTK_IO_EXPORT vtkUnstructuredGridWriter : public vtkDataWriter
 {

IO/vtkVolumeReader.h

@@ -45,7 +45,6 @@
 #ifndef __vtkVolumeReader_h
 #define __vtkVolumeReader_h
 
-#include <stdio.h>
 #include "vtkStructuredPointsSource.h"
 
 class VTK_IO_EXPORT vtkVolumeReader : public vtkStructuredPointsSource

IO/vtkWriter.h

@@ -37,7 +37,8 @@
 #define __vtkWriter_h
 
 #include "vtkProcessObject.h"
-#include "vtkDataObject.h"
+
+class vtkDataObject;
 
 #define VTK_ASCII 1
 #define VTK_BINARY 2