remove legacy method signature for multitexture

Marking one signature of a method as legacy when it is overridden is a mess as it results in either a partial override or a deprecated override method both of which result in a warning so just removing that sig. The method has been a nop for a few releases.
Kitware · Feb 25, 2018 · 2f231fb · 2f231fb · jasjuang · Apr 28, 2018
1 parent f21d1c1
commit 2f231fb
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 34 deletions.
diff --git a/Rendering/Core/vtkPolyDataMapper.cxx b/Rendering/Core/vtkPolyDataMapper.cxx
@@ -183,18 +183,6 @@ void vtkPolyDataMapper::MapDataArrayToVertexAttribute(
   vtkErrorMacro("Not implemented at this level...");
 }
 
-#ifndef VTK_LEGACY_REMOVE
-void vtkPolyDataMapper::MapDataArrayToMultiTextureAttribute(
-    int vtkNotUsed(unit),
-    const char* vtkNotUsed(dataArrayName),
-    int vtkNotUsed(fieldAssociation),
-    int vtkNotUsed(componentno)
-    )
-{
-  VTK_LEGACY_BODY(vtkPolyDataMapper::MapDataArrayToMultiTextureAttribute, "VTK 8.2");
-}
-#endif
-
 //----------------------------------------------------------------------------
 void vtkPolyDataMapper::MapDataArrayToMultiTextureAttribute(
     const char* vtkNotUsed(tname),

diff --git a/Rendering/Core/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h
@@ -124,11 +124,6 @@ class VTKRENDERINGCORE_EXPORT vtkPolyDataMapper : public vtkMapper
     const char *textureName,
     const char* dataArrayName, int fieldAssociation, int componentno = -1);
 
-  // deprecated in favor of the const char * signature
-  VTK_LEGACY(virtual void MapDataArrayToMultiTextureAttribute(
-    int unit,
-    const char* dataArrayName, int fieldAssociation, int componentno = -1));
-
   /**
    * Remove a vertex attribute mapping.
    */

diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
@@ -3572,18 +3572,6 @@ void vtkOpenGLPolyDataMapper::MapDataArrayToMultiTextureAttribute(
     dataArrayName, tname, fieldAssociation, componentno);
 }
 
-#ifndef VTK_LEGACY_REMOVE
-void vtkOpenGLPolyDataMapper::MapDataArrayToMultiTextureAttribute(
-    int vtkNotUsed(unit),
-    const char* vtkNotUsed(dataArrayName),
-    int vtkNotUsed(fieldAssociation),
-    int vtkNotUsed(componentno)
-    )
-{
-  VTK_LEGACY_BODY(vtkPolyDataMapper::MapDataArrayToMultiTextureAttribute, "VTK 8.2");
-}
-#endif
-
 void vtkOpenGLPolyDataMapper::MapDataArray(
     const char* vertexAttributeName,
     const char* dataArrayName,

diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
@@ -266,11 +266,6 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLPolyDataMapper : public vtkPolyDataMap
     const char *tname,
     const char* dataArrayName, int fieldAssociation, int componentno = -1) override;
 
-  // deprecated in favor of the const char * signature
-  VTK_LEGACY(void MapDataArrayToMultiTextureAttribute(
-    int unit,
-    const char* dataArrayName, int fieldAssociation, int componentno = -1) override);
-
   /**
    * Remove a vertex attribute mapping.
    */