Minor style issues

Filters/Points/vtkPointInterpolator.cxx

@@ -489,9 +489,9 @@ int vtkPointInterpolator::RequestUpdateExtent(
 }
 
 //--------------------------------------------------------------------------
-unsigned long int vtkPointInterpolator::GetMTime()
+unsigned long vtkPointInterpolator::GetMTime()
 {
-  unsigned long mTime=this->vtkObject::GetMTime();
+  unsigned long mTime=this->Superclass::GetMTime();
   unsigned long mTime2;
   if ( this->Locator != NULL )
     {

Filters/Points/vtkPointInterpolator.h

@@ -210,7 +210,7 @@ public:
 
   // Description:
   // Get the MTime of this object also considering the locator and kernel.
-  unsigned long int GetMTime();
+  unsigned long GetMTime();
 
 protected:
   vtkPointInterpolator();

Filters/Points/vtkSPHInterpolator.cxx

@@ -80,7 +80,7 @@ struct ProbePoints
       this->Locator = sphInt->GetLocator();
       this->Strategy = sphInt->GetNullPointsStrategy();
       double nullV = sphInt->GetNullValue();
-      this->Promote = sphInt->GetPromoteOutput();
+      this->Promote = sphInt->GetPromoteOutputArrays();
 
       // Manage arrays for interpolation
       for (int i=0; i < sphInt->GetNumberOfExcludedArrays(); ++i)
@@ -294,7 +294,7 @@ vtkSPHInterpolator::vtkSPHInterpolator()
   this->ComputeShepardSum = true;
   this->ShepardSumArrayName = "Shepard Summation";
 
-  this->PromoteOutput = true;
+  this->PromoteOutputArrays = true;
 
   this->PassPointArrays = true;
   this->PassCellArrays = true;
@@ -573,9 +573,9 @@ int vtkSPHInterpolator::RequestUpdateExtent(
 }
 
 //--------------------------------------------------------------------------
-unsigned long int vtkSPHInterpolator::GetMTime()
+unsigned long vtkSPHInterpolator::GetMTime()
 {
-  unsigned long mTime=this->vtkObject::GetMTime();
+  unsigned long mTime=this->Superclass::GetMTime();
   unsigned long mTime2;
   if ( this->Locator != NULL )
     {

Filters/Points/vtkSPHInterpolator.h

@@ -260,9 +260,9 @@ public:
   // or double) are promoted to float type on output. This is because the
   // interpolation process may not be well behaved when integral types are
   // combined using interpolation weights.
-  vtkSetMacro(PromoteOutput, bool);
-  vtkBooleanMacro(PromoteOutput, bool);
-  vtkGetMacro(PromoteOutput, bool);
+  vtkSetMacro(PromoteOutputArrays, bool);
+  vtkBooleanMacro(PromoteOutputArrays, bool);
+  vtkGetMacro(PromoteOutputArrays, bool);
 
   // Description:
   // Indicate whether to shallow copy the input point data arrays to the
@@ -287,7 +287,7 @@ public:
 
   // Description:
   // Get the MTime of this object also considering the locator and kernel.
-  unsigned long int GetMTime();
+  unsigned long GetMTime();
 
 protected:
   vtkSPHInterpolator();
@@ -311,7 +311,7 @@ protected:
   vtkStdString ShepardSumArrayName;
   vtkFloatArray *ShepardSumArray;
 
-  bool PromoteOutput;
+  bool PromoteOutputArrays;
 
   bool PassCellArrays;
   bool PassPointArrays;