More fixes.

Former-commit-id: 5b740de8

src/Cxx/Filtering/ConstrainedDelaunay2D.cxx

@@ -13,6 +13,7 @@
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkNamedColors.h>
+#include <vtkVersionMacros.h> // For version macros
 
 int main(int, char *[])
 {

src/Cxx/GeometricObjects/CellTypeSource.cxx

@@ -77,7 +77,6 @@ int main (int argc, char *argv[])
       std::cout << "Cell type " << cellName << " is not supported." << std::endl;
       return EXIT_FAILURE;
     }
-  int dims[3] = {2, 2, 1};
   vtkSmartPointer<vtkCellTypeSource> source =
     vtkSmartPointer<vtkCellTypeSource>::New();
   source->SetCellType(cellMap[cellName]);
@@ -201,9 +200,9 @@ int main (int argc, char *argv[])
   renderer->ResetCameraClippingRange();
 
   //Render and interact
-  renderWindow->SetSize(640, 480);  
+  renderWindow->SetSize(640, 480);
   renderWindow->Render();
   renderWindowInteractor->Start();
-  
+
   return EXIT_SUCCESS;
 }

src/Cxx/IO/OBJImporter.cxx

@@ -50,7 +50,6 @@ int main (int argc, char *argv[])
   actors->InitTraversal();
   std::cout << "There are " << actors->GetNumberOfItems() << " actors" << std::endl;
 
-  int m = 0;
   for (vtkIdType a = 0; a < actors->GetNumberOfItems(); ++a)
   {
     std::cout << importer->GetOutputDescription(a) << std::endl;

src/Cxx/IO/VRMLImporterDemo.cxx

@@ -53,7 +53,6 @@ int main ( int argc, char *argv[])
     vtkSmartPointer<vtkActorCollection>::New();
   actors = renderer->GetActors();
   std::cout << "There are " << actors->GetNumberOfItems() << " actors" << std::endl;
-  int m = 0;
   actors->InitTraversal();
   for (vtkIdType a = 0; a < actors->GetNumberOfItems(); ++a)
   {

src/Cxx/InfoVis/DelimitedTextReader.cxx

@@ -10,6 +10,7 @@
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRenderer.h>
+#include <vtkVersionMacros.h> // For version macros
 #include <vtkVertexGlyphFilter.h>
 
 #include <vtkNamedColors.h>

src/Cxx/Interaction/UserEvent.cxx

@@ -37,16 +37,16 @@ int main(int, char *[])
   filter->AddObserver(filter->RefreshEvent, callback);
 
   filter->Update();
-  
+
   renderWindow->Render();
   renderWindowInteractor->Start();
 
   return EXIT_SUCCESS;
 }
 
-void CallbackFunction(vtkObject* caller,
-                long unsigned int eventId,
-                void* clientData, void* callData )
+void CallbackFunction(vtkObject* /* caller */,
+                long unsigned int /* eventId */,
+                void* /* clientData */, void* /* callData */)
 {
   std::cout << "CallbackFunction called." << std::endl;
 }

src/Cxx/Interaction/vtkTestFilter.h

@@ -45,8 +45,8 @@ vtkTestFilter::vtkTestFilter()
 }
 
 int vtkTestFilter::RequestData(vtkInformation *vtkNotUsed(request),
-                                             vtkInformationVector **inputVector,
-                                             vtkInformationVector *outputVector)
+ vtkInformationVector **,
+ vtkInformationVector *)
 {
   // Get the info object
 //  vtkInformation *outInfo = outputVector->GetInformationObject(0);
@@ -54,6 +54,6 @@ int vtkTestFilter::RequestData(vtkInformation *vtkNotUsed(request),
 //  vtkPolyData *output = vtkPolyData::SafeDownCast(
 //      outInfo->Get(vtkDataObject::DATA_OBJECT()));
   this->InvokeEvent(this->RefreshEvent, NULL);
-  
+
   return 1;
 }

src/Cxx/Modelling/DiscreteMarchingCubes.cxx

@@ -20,7 +20,7 @@
 static vtkSmartPointer<vtkLookupTable> MakeColors (unsigned int n);
 static vtkSmartPointer<vtkImageData> MakeBlob(int n, double radius);
 
-int main (int argc, char *argv[])
+int main (int /*argc*/, char * /* argv */ [])
 {
   int n = 20;
   double radius = 8;
@@ -133,7 +133,7 @@ vtkSmartPointer<vtkLookupTable> MakeColors (unsigned int n)
   vtkSmartPointer<vtkMath> math =
     vtkSmartPointer<vtkMath>::New();
   math->RandomSeed(5071);
-  for ( int i = 1; i < n; ++i)
+  for ( int i = 1; i < static_cast<int>(n); ++i)
   {
     lut->SetTableValue(i, math->Random(.4, 1),
                        math->Random(.4, 1), math->Random(.4, 1), 1.0);

src/Cxx/Modelling/SmoothDiscreteMarchingCubes.cxx

@@ -21,7 +21,7 @@
 static vtkSmartPointer<vtkLookupTable> MakeColors (unsigned int n);
 static vtkSmartPointer<vtkImageData> MakeBlob(int n, double radius);
 
-int main (int argc, char *argv[])
+int main (int /* argc */, char * /* argv */ [])
 {
   int n = 20;
   double radius = 8;
@@ -150,7 +150,7 @@ vtkSmartPointer<vtkLookupTable> MakeColors (unsigned int n)
   vtkSmartPointer<vtkMath> math =
     vtkSmartPointer<vtkMath>::New();
   math->RandomSeed(5071);
-  for ( int i = 1; i < n; ++i)
+  for ( int i = 1; i < static_cast<int>(n); ++i)
   {
     lut->SetTableValue(i, math->Random(.4, 1),
                        math->Random(.4, 1), math->Random(.4, 1), 1.0);

src/Cxx/Plotting/PieChartActor.cxx

@@ -20,11 +20,11 @@
 
 #include <map>
 
-int main( int argc, char * argv [] )
+int main( int /*argc*/, char * /*argv*/ [] )
 {
   typedef std::map<std::string, int>  DataContainer;
   DataContainer movies;
-  
+
   movies["Comedy"] = 27;
   movies["Action"] = 18;
   movies["Romance"] = 14;
@@ -33,8 +33,7 @@ int main( int argc, char * argv [] )
   movies["Foreign"] = 8;
   movies["Scifi"] = 8;
 
-  int numTuples;
-  numTuples = movies.size();
+  int numTuples = static_cast<int>(movies.size());
 
   vtkSmartPointer<vtkFloatArray> bitter  =
     vtkSmartPointer<vtkFloatArray>::New();

src/Cxx/Points/ExtractPointsDemo.cxx

@@ -19,7 +19,7 @@
 
 #include <vector>
 
-int main (int argc, char *argv[])
+int main (int /*argc*/, char * /* argv */ [])
 {
   // Create implicit functions
   vtkSmartPointer<vtkCone> cone =