diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h index 251c8f5281d8ce61fa477bf9afa4532de75f45e3..da776603a313ee94fa952bd7b3675271c6e38dc5 100644 --- a/Modules/IO/ImageIO/include/otbImageFileReader.h +++ b/Modules/IO/ImageIO/include/otbImageFileReader.h @@ -140,9 +140,6 @@ public: void SetImageIO( otb::ImageIOBase * imageIO ); itkGetObjectMacro(ImageIO,otb::ImageIOBase); - /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */ - virtual void SetFileName(const char* extendedFileName); - virtual void SetFileName(const std::string& extendedFileName); virtual const char* GetFileName () const; diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx index 87dfef57e5bbe706a3064726b646554bf6926e4a..770f8b791230c14cfe68f9e58c304c892e5191ff 100644 --- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx +++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx @@ -668,17 +668,6 @@ ImageFileReader<TOutputImage, ConvertPixelTraits> return (fic_trouve); } -template <class TOutputImage, class ConvertPixelTraits> -void -ImageFileReader<TOutputImage, ConvertPixelTraits> -::SetFileName(const char* in) -{ - if (in) - { - this->SetFileName(std::string(in)); - } -} - template <class TOutputImage, class ConvertPixelTraits> void ImageFileReader<TOutputImage, ConvertPixelTraits> diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h index f06203c9f5c41e9edbb500f5a1393bff27040634..697363336b0466a54298247191075c0894ab80e3 100644 --- a/Modules/IO/ImageIO/include/otbImageFileWriter.h +++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h @@ -172,9 +172,6 @@ public: * has no output. */ void Update() override; - /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */ - virtual void SetFileName(const char* extendedFileName); - virtual void SetFileName(const std::string& extendedFileName); virtual const char* GetFileName () const; diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx index 0e6f11f470ddaf0a35ddf988b1fdaf74532154b6..f046197d3bbf6ff3c81e3275b705d25d8c856e65 100644 --- a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx +++ b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx @@ -837,19 +837,6 @@ ImageFileWriter<TInputImage> this->Modified(); } -template <class TInputImage> -void -ImageFileWriter<TInputImage> -::SetFileName(const char* extendedFileName) -{ - if (extendedFileName == nullptr) - { - itkGenericExceptionMacro( << "Filename is NULL" ); - } - - this->SetFileName(std::string(extendedFileName)); -} - template <class TInputImage> const char* ImageFileWriter<TInputImage> diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h index a474a87aef64ce8b32004cd76a1ee862bcecbf02..885352cd31d422621e0daa76f0e8654ef490cf0a 100644 --- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h +++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h @@ -117,14 +117,6 @@ public: */ virtual void SetFileName(const std::string& file); - /** - * Set the file to be read. Once the Filename is set, ReadMeatFile is called in order to get - * the number of image files to be read, the images file names, the band and region - * selection - * \deprecated const char* overload of SetFileName is deprecated, use std::string instead - */ - virtual void SetFileName(const char * file); - /** get the Filenames */ std::string GetFileName(unsigned int i) const { diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx index 08d97f431cde884713bf8d8441b80b1076d15ed8..6bd0d55fa4878f53cb327635b563bc70dcc2a292 100644 --- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx +++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx @@ -52,17 +52,6 @@ ImageSeriesFileReaderBase<TImage, TInternalImage> this->Modified(); } -template <class TImage, class TInternalImage> -void -ImageSeriesFileReaderBase<TImage, TInternalImage> -::SetFileName(const char * file) -{ - if (file) - { - this->SetFileName(std::string(file)); - } -} - template <class TImage, class TInternalImage> typename ImageSeriesFileReaderBase<TImage, TInternalImage>::OutputImageListType * ImageSeriesFileReaderBase<TImage, TInternalImage> diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h index 520d33f8a24dab0e41bc38ad00b07cf0ca28acc4..0fe5cb7ede587fb1b651fd3cc9ac2d0cd9453b35 100644 --- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h +++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h @@ -217,9 +217,6 @@ public: /** Does the real work. */ virtual void Update() override; - /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */ - virtual void SetFileName(const char* extendedFileName); - virtual void SetFileName(const std::string& extendedFileName); virtual const char* GetFileName () const; diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx index 25639be0e8226747ff74da3e68b42abdcb01ad64..0e132d6e908f252bb3ed256ed83aff27bb931d7f 100644 --- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx +++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx @@ -829,19 +829,6 @@ SimpleParallelTiffWriter<TInputImage> this->Modified(); } -template <class TInputImage> -void -SimpleParallelTiffWriter<TInputImage> -::SetFileName(const char* extendedFileName) -{ - if (extendedFileName == nullptr) - { - itkGenericExceptionMacro( << "Filename is NULL" ); - } - - this->SetFileName(std::string(extendedFileName)); -} - template <class TInputImage> const char* SimpleParallelTiffWriter<TInputImage> diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h index 5cf4d1583c0702123f9ca61ebd992d49e80a1fb2..bf9ff5f6f00630fd49bd054a40ffa8f994fcf95b 100644 --- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h +++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h @@ -80,9 +80,6 @@ public: /** Does the real work. */ virtual void Update() override; - /** \deprecated const char* overload of SetFileName is deprecated, use std::string instead */ - virtual void SetFileName(const char* extendedFileName); - virtual void SetFileName(const std::string& extendedFileName); virtual const char* GetFileName () const; diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx index a78fd43f21d5d1239a18506e69da0a6d2ed70f70..218fd40038436488bf94075ac6c43ad9d9b07ea2 100644 --- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx +++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx @@ -59,16 +59,6 @@ MPIVrtWriter<TImage>::GetInput() return static_cast<const InputImageType*>(this->ProcessObject::GetInput(0)); } -template <typename TImage> -void -MPIVrtWriter<TImage>::SetFileName(const char* extendedFileName) -{ - if (m_Filename.compare(extendedFileName) != 0 ) - { - this->SetFileName(std::string(extendedFileName)); - } -} - template <typename TImage> void MPIVrtWriter<TImage>::SetFileName(const std::string& extendedFileName) diff --git a/Modules/Visualization/MonteverdiCore/src/mvdVectorImageModel.cxx b/Modules/Visualization/MonteverdiCore/src/mvdVectorImageModel.cxx index e25a3d5f2268b1a6c0af8082c960c3a183940cba..6470adfd61825a585696cb142d3a7c3252073d0c 100644 --- a/Modules/Visualization/MonteverdiCore/src/mvdVectorImageModel.cxx +++ b/Modules/Visualization/MonteverdiCore/src/mvdVectorImageModel.cxx @@ -110,7 +110,7 @@ VectorImageModel // << "\tstd::string: " << QFile::encodeName( GetFilename() ).constData() // << std::endl; - m_ImageFileReader->SetFileName( QFile::encodeName( GetFilename() ) ); + m_ImageFileReader->SetFileName(GetFilename().toStdString()); m_ImageFileReader->GetOutput()->UpdateOutputInformation(); // Retrieve the list of Lod from file @@ -180,7 +180,7 @@ VectorImageModel { fname.append(QChar('?')); } - imageFileReader->SetFileName( QFile::encodeName( fname.append(QString("&skipgeom=true"))).constData()); + imageFileReader->SetFileName(fname.append(QString("&skipgeom=true")).toStdString()); imageFileReader->GetOutput()->UpdateOutputInformation(); }