Fixed compile issues resulting from VTK merge

Charts/Testing/Cxx/TestLinePlotAxisFonts.cxx

@@ -61,7 +61,7 @@ int TestLinePlotAxisFonts(int, char * [])
 
   // Add multiple line plots, setting the colors etc
   vtkPlot *line = chart->AddPlot(vtkChart::LINE);
-  line->SetInput(table.GetPointer(), 0, 1);
+  line->SetInputData(table.GetPointer(), 0, 1);
   line->SetColor(0, 255, 0, 255);
   line->SetWidth(1.0);
 

Hybrid/vtkAxisActor.cxx

@@ -99,17 +99,17 @@ vtkAxisActor::vtkAxisActor()
   this->AxisLinesActor->SetMapper(this->AxisLinesMapper);
   this->Gridlines = vtkPolyData::New();
   this->GridlinesMapper = vtkPolyDataMapper::New();
-  this->GridlinesMapper->SetInput(this->Gridlines);
+  this->GridlinesMapper->SetInputData(this->Gridlines);
   this->GridlinesActor = vtkActor::New();
   this->GridlinesActor->SetMapper(this->GridlinesMapper);
   this->InnerGridlines = vtkPolyData::New();
   this->InnerGridlinesMapper = vtkPolyDataMapper::New();
-  this->InnerGridlinesMapper->SetInput(this->InnerGridlines);
+  this->InnerGridlinesMapper->SetInputData(this->InnerGridlines);
   this->InnerGridlinesActor = vtkActor::New();
   this->InnerGridlinesActor->SetMapper(this->InnerGridlinesMapper);
   this->Gridpolys = vtkPolyData::New();
   this->GridpolysMapper = vtkPolyDataMapper::New();
-  this->GridpolysMapper->SetInput(this->Gridpolys);
+  this->GridpolysMapper->SetInputData(this->Gridpolys);
   this->GridpolysActor = vtkActor::New();
   this->GridpolysActor->SetMapper(this->GridpolysMapper);
 

Hybrid/vtkPolarAxesActor.cxx

@@ -211,7 +211,7 @@ vtkPolarAxesActor::vtkPolarAxesActor() : vtkActor()
   // Create and set polar arcs and ancillary objects, with default color white
   this->PolarArcs = vtkPolyData::New();
   this->PolarArcsMapper = vtkPolyDataMapper::New();
-  this->PolarArcsMapper->SetInput( this->PolarArcs );
+  this->PolarArcsMapper->SetInputData( this->PolarArcs );
   this->PolarArcsActor = vtkActor::New();
   this->PolarArcsActor->SetMapper( this->PolarArcsMapper );
   this->PolarArcsActor->GetProperty()->SetColor( 1., 1., 1. );

Rendering/Testing/Cxx/TestScalarBar.cxx

@@ -16,7 +16,8 @@
 
 #include "vtkActor.h"
 #include "vtkCamera.h"
-#include "vtkPLOT3DReader.h"
+#include "vtkMultiBlockDataSet.h"
+#include "vtkMultiBlockPLOT3DReader.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkProperty2D.h"
 #include "vtkRegressionTestImage.h"
@@ -38,8 +39,8 @@ int TestScalarBar( int argc, char *argv[] )
     vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/combq.bin");
 
   // Start by loading some data.
-  vtkSmartPointer<vtkPLOT3DReader> pl3d =
-    vtkSmartPointer<vtkPLOT3DReader>::New();
+  vtkSmartPointer<vtkMultiBlockPLOT3DReader> pl3d =
+    vtkSmartPointer<vtkMultiBlockPLOT3DReader>::New();
   pl3d->SetXYZFileName(fname);
   pl3d->SetQFileName(fname2);
   pl3d->SetScalarFunctionNumber(100);
@@ -52,7 +53,7 @@ int TestScalarBar( int argc, char *argv[] )
   // An outline is shown for context.
   vtkSmartPointer<vtkStructuredGridGeometryFilter> outline =
     vtkSmartPointer<vtkStructuredGridGeometryFilter>::New();
-  outline->SetInputConnection(pl3d->GetOutputPort());
+  outline->SetInputData(pl3d->GetOutput()->GetBlock(0));
   outline->SetExtent(0,100,0,100,9,9);
 
   vtkSmartPointer<vtkPolyDataMapper> outlineMapper =

Rendering/vtkScalarBarActor.cxx

@@ -166,7 +166,7 @@ vtkScalarBarActor::vtkScalarBarActor()
   this->DrawBackground = 0;
   this->Background = vtkPolyData::New();
   this->BackgroundMapper = vtkPolyDataMapper2D::New();
-  this->BackgroundMapper->SetInput(this->Background);
+  this->BackgroundMapper->SetInputData(this->Background);
   this->BackgroundActor = vtkActor2D::New();
   this->BackgroundActor->SetMapper(this->BackgroundMapper);
   this->BackgroundActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate);
@@ -174,7 +174,7 @@ vtkScalarBarActor::vtkScalarBarActor()
   this->DrawFrame = 0;
   this->Frame = vtkPolyData::New();
   this->FrameMapper = vtkPolyDataMapper2D::New();
-  this->FrameMapper->SetInput(this->Frame);
+  this->FrameMapper->SetInputData(this->Frame);
   this->FrameActor = vtkActor2D::New();
   this->FrameActor->SetMapper(this->FrameMapper);
   this->FrameActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate);