Merge topic 'override-deprecated-warnings'
3d991d1d8 Fix warnings about overriding deprecated methods Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2151
This commit is contained in:
commit
45c29a0c62
@ -40,10 +40,10 @@ public:
|
||||
virtual void SetActiveColorTable(const vtkm::cont::ColorTable& ct);
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() = 0;
|
||||
void StartScene() {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() = 0;
|
||||
void EndScene() {}
|
||||
|
||||
virtual void SetCanvas(vtkm::rendering::Canvas* canvas) = 0;
|
||||
virtual vtkm::rendering::Canvas* GetCanvas() const = 0;
|
||||
|
@ -37,12 +37,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
void CreateDefaultView();
|
||||
|
||||
|
@ -68,12 +68,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
void SetCompositeBackground(bool on);
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
|
||||
|
@ -79,11 +79,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
void SetCompositeBackground(bool on);
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
|
||||
|
@ -44,12 +44,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
void SetCompositeBackground(bool on);
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
|
||||
|
@ -38,12 +38,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
void SetCompositeBackground(bool on);
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
void SetShadingOn(bool on);
|
||||
|
@ -36,12 +36,6 @@ public:
|
||||
const vtkm::rendering::Camera& camera,
|
||||
const vtkm::Range& scalarRange) override;
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
vtkm::rendering::Mapper* NewCopy() const override;
|
||||
void SetSampleDistance(const vtkm::Float32 distance);
|
||||
void SetCompositeBackground(const bool compositeBackground);
|
||||
|
@ -42,12 +42,6 @@ public:
|
||||
bool GetIsOverlay() const;
|
||||
void SetIsOverlay(bool isOverlay);
|
||||
|
||||
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
|
||||
virtual void StartScene() override {}
|
||||
|
||||
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
|
||||
virtual void EndScene() override {}
|
||||
|
||||
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
|
||||
const vtkm::cont::CoordinateSystem& coords,
|
||||
const vtkm::cont::Field& scalarField,
|
||||
|
Loading…
Reference in New Issue
Block a user