diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h index ee1cc07ddac2a681fd6098c3b7bdde39452b9952..5f3ce2267578b13a85a1750cab18046cf680f9c7 100644 --- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h +++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h @@ -170,14 +170,6 @@ private: */ virtual void DoFinalizeInitialization() {} //@} - - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - void DoFinalizeInitialisation() - { - otbWarningMacro( - << "DoFinalizeInitialisation has been deprecated. Please use DoFinalizeInitialization() instead"); - this->DoFinalizeInitialization(); - } friend struct otb::internal::ProcessVisitor; }; diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h index 37f135939f5fea1b9e3b4cce5286d7a0631f6346..7ba5ffe592361e2203ba0fa015c67834b4a2e337 100644 --- a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h +++ b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h @@ -80,14 +80,6 @@ public: bool InstantiateProjection(); - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - bool InstanciateProjection() - { - otbWarningMacro( - << "InstanciateProjection has been deprecated. Please use InstanciateProjection() instead"); - return this->InstantiateProjection(); - } - void InverseTransform(double x, double y, double z, double& lon, double& lat, double& h); void ForwardTransform(double lon, double lat, double h, diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h index fa1c8fac33fe700b459f425795268326b6b52403..d7030760b47399069b2b16309ce06847b04a1d40 100644 --- a/Modules/Core/Transform/include/otbGenericMapProjection.h +++ b/Modules/Core/Transform/include/otbGenericMapProjection.h @@ -102,14 +102,6 @@ public: virtual bool InstantiateProjection(); - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - virtual bool InstanciateProjection() - { - otbWarningMacro( - << "InstanciateProjection has been deprecated. Please use InstantiateProjection() instead"); - return this->InstantiateProjection(); - } - const MapProjectionAdapter* GetMapProjection() const; virtual bool IsProjectionDefined() const; diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h index 3e734dab4a7ba7b3a053a86b6e8e42736616ffdf..09a8ed37867f476b0e28c6632680a437f712748a 100644 --- a/Modules/Core/Transform/include/otbGenericRSTransform.h +++ b/Modules/Core/Transform/include/otbGenericRSTransform.h @@ -171,13 +171,6 @@ public: OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE; virtual void InstantiateTransform(); - - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - void InstanciateTransform() - { - otbWarningMacro(<< "InstanciateTransform has been deprecated. Please use InstantiateTransform instead"); - this->InstantiateTransform(); - } // Get inverse methods bool GetInverse(Self * inverseTransform) const; diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h index de4bc2d68330d348ab6c4e6abc12f2d32f2a9822..04ad63740fcbbd8d0e04e5c7a38360dbcdb8c5e8 100644 --- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h +++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h @@ -110,14 +110,6 @@ public: void InstantiateTransform(); - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - void InstanciateTransform() - { - otbWarningMacro( - << "InstanciateTransform has been deprecated. Please use InstanciateTransform() instead"); - this->InstantiateTransform(); - } - /** * Set/Get input & output projections. * Set/Get input & output keywordlist diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h index 5f37427f9f4260ad13bbf2c52b51551788dc30b0..c00878892f2d0c7aa0950e835dc3f39264ae12b1 100644 --- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h +++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h @@ -202,13 +202,6 @@ public: { return m_ShrunkOutput; } - - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - OutputImageType * GetShrinkedOutput() - { - otbWarningMacro(<< "GetShrinkedOutput has been deprecated. Please use GetShrunkOutput instead"); - return GetShrunkOutput(); - } void Synthetize(void) ITK_OVERRIDE; diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h index e81803df67a8d54ea2a6cea4795c7502a93ac92c..50e7ea5b2ff20c75e2bbfc5abf2e136767994921 100644 --- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h +++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h @@ -214,14 +214,6 @@ private: * the last moment from \c DoProcessLayer(). */ void DoFinalizeInitialization() ITK_OVERRIDE; - - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - void DoFinalizeInitialisation() - { - otbWarningMacro( - << "DoFinalizeInitialisation has been deprecated. Please use DoFinalizeInitialization() instead"); - this->DoFinalizeInitialization(); - } /** * Hook used to define the fields of the new layer. diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h index 978ba4d46d88f30de1d0820651064915da1cfb09..18fc93404ae46febf4fcd730c942ce0c76720a63 100644 --- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h +++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h @@ -184,14 +184,6 @@ protected: virtual void InstantiateTransform(void); - /** THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. */ - void InstanciateTransform() - { - otbWarningMacro( - << "InstanciateTransform has been deprecated. Please use InstanciateTransform() instead"); - this->InstantiateTransform(); - } - void GenerateOutputInformation(void) ITK_OVERRIDE; void GenerateData(void) ITK_OVERRIDE;