third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused var from deleted stuff

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-03-29 21:56:46 -07:00 committed by Luis Díaz Más
parent 8f9b3965ed
commit fafe999c6e
30 changed files with 130 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/actions.hpp
View File

@ -98,7 +98,7 @@ class TaskFactory {
static TaskFactory& instance(); static TaskFactory& instance();
//! Prevent copy construction: not implemented. //! Prevent copy construction: not implemented.
TaskFactory(const TaskFactory& rhs) = delete; TaskFactory(const TaskFactory&) = delete;
//! Destructor //! Destructor
void cleanup(); void cleanup();

2
app/exiv2app.hpp
View File

@ -116,7 +116,7 @@ class Params : public Util::Getopt {
static Params& instance(); static Params& instance();
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
Params(const Params& rhs) = delete; Params(const Params&) = delete;
//! Enumerates print modes //! Enumerates print modes
enum PrintMode { enum PrintMode {

108
include/exiv2/basicio.hpp
View File

@ -79,7 +79,7 @@ class EXIV2API BasicIo {
@return Number of bytes written to IO source successfully;<BR> @return Number of bytes written to IO source successfully;<BR>
0 if failure; 0 if failure;
*/ */
virtual size_t write(const byte *data, size_t wcount) = 0; virtual size_t write(const byte* data, size_t wcount) = 0;
/*! /*!
@brief Write data that is read from another BasicIo instance to @brief Write data that is read from another BasicIo instance to
the IO source. Current IO position is advanced by the number the IO source. Current IO position is advanced by the number
@ -89,7 +89,7 @@ class EXIV2API BasicIo {
@return Number of bytes written to IO source successfully;<BR> @return Number of bytes written to IO source successfully;<BR>
0 if failure; 0 if failure;
*/ */
virtual size_t write(BasicIo &src) = 0; virtual size_t write(BasicIo& src) = 0;
/*! /*!
@brief Write one byte to the IO source. Current IO position is @brief Write one byte to the IO source. Current IO position is
advanced by one byte. advanced by one byte.
@ -121,7 +121,7 @@ class EXIV2API BasicIo {
@return Number of bytes read from IO source successfully;<BR> @return Number of bytes read from IO source successfully;<BR>
0 if failure; 0 if failure;
*/ */
virtual size_t read(byte *buf, size_t rcount) = 0; virtual size_t read(byte* buf, size_t rcount) = 0;
/*! /*!
@brief Safe version of `read()` that checks for errors and throws @brief Safe version of `read()` that checks for errors and throws
an exception if the read was unsuccessful. an exception if the read was unsuccessful.
@ -132,7 +132,7 @@ class EXIV2API BasicIo {
read if \em rcount bytes are not available. read if \em rcount bytes are not available.
@param err Error code to use if an exception is thrown. @param err Error code to use if an exception is thrown.
*/ */
void readOrThrow(byte *buf, size_t rcount, ErrorCode err); void readOrThrow(byte* buf, size_t rcount, ErrorCode err);
/*! /*!
@brief Read one byte from the IO source. Current IO position is @brief Read one byte from the IO source. Current IO position is
advanced by one byte. advanced by one byte.
@ -153,7 +153,7 @@ class EXIV2API BasicIo {
invalidated by the method. invalidated by the method.
@throw Error In case of failure @throw Error In case of failure
*/ */
virtual void transfer(BasicIo &src) = 0; virtual void transfer(BasicIo& src) = 0;
/*! /*!
@brief Move the current IO position. @brief Move the current IO position.
@param offset Number of bytes to move the position relative @param offset Number of bytes to move the position relative
@ -183,7 +183,7 @@ class EXIV2API BasicIo {
@return A pointer to the mapped area. @return A pointer to the mapped area.
@throw Error In case of failure. @throw Error In case of failure.
*/ */
virtual byte *mmap(bool isWriteable = false) = 0; virtual byte* mmap(bool isWriteable = false) = 0;
/*! /*!
@brief Remove a mapping established with mmap(). If the mapped area @brief Remove a mapping established with mmap(). If the mapped area
is writeable, this ensures that changes are written back. is writeable, this ensures that changes are written back.
@ -219,7 +219,7 @@ class EXIV2API BasicIo {
comprehensive error messages where only a BasicIo instance is comprehensive error messages where only a BasicIo instance is
available. available.
*/ */
[[nodiscard]] virtual const std::string &path() const noexcept = 0; [[nodiscard]] virtual const std::string& path() const noexcept = 0;
/*! /*!
@brief Mark all the bNone blocks to bKnow. This avoids allocating memory @brief Mark all the bNone blocks to bKnow. This avoids allocating memory
@ -233,7 +233,7 @@ class EXIV2API BasicIo {
/*! /*!
@brief this is allocated and populated by mmap() @brief this is allocated and populated by mmap()
*/ */
byte *bigBlock_{}; byte* bigBlock_{};
//@} //@}
}; // class BasicIo }; // class BasicIo
@ -249,7 +249,7 @@ class EXIV2API IoCloser {
//! @name Creators //! @name Creators
//@{ //@{
//! Constructor, takes a BasicIo reference //! Constructor, takes a BasicIo reference
explicit IoCloser(BasicIo &bio) : bio_(bio) { explicit IoCloser(BasicIo& bio) : bio_(bio) {
} }
//! Destructor, closes the BasicIo reference //! Destructor, closes the BasicIo reference
virtual ~IoCloser() { virtual ~IoCloser() {
@ -268,13 +268,13 @@ class EXIV2API IoCloser {
// DATA // DATA
//! The BasicIo reference //! The BasicIo reference
BasicIo &bio_; BasicIo& bio_;
// Not implemented // Not implemented
//! Copy constructor //! Copy constructor
IoCloser(const IoCloser &) = delete; IoCloser(const IoCloser&) = delete;
//! Assignment operator //! Assignment operator
IoCloser &operator=(const IoCloser &) = delete; IoCloser& operator=(const IoCloser&) = delete;
}; // class IoCloser }; // class IoCloser
/*! /*!
@ -291,7 +291,7 @@ class EXIV2API FileIo : public BasicIo {
therefore never fails. therefore never fails.
@param path The full path of a file @param path The full path of a file
*/ */
explicit FileIo(const std::string &path); explicit FileIo(const std::string& path);
//! Destructor. Flushes and closes an open file. //! Destructor. Flushes and closes an open file.
~FileIo() override; ~FileIo() override;
@ -312,7 +312,7 @@ class EXIV2API FileIo : public BasicIo {
@return 0 if successful;<BR> @return 0 if successful;<BR>
Nonzero if failure. Nonzero if failure.
*/ */
int open(const std::string &mode); int open(const std::string& mode);
/*! /*!
@brief Open the file using the default access mode of "rb". @brief Open the file using the default access mode of "rb".
This method can also be used to "reopen" a file which will flush This method can also be used to "reopen" a file which will flush
@ -337,7 +337,7 @@ class EXIV2API FileIo : public BasicIo {
@return Number of bytes written to the file successfully;<BR> @return Number of bytes written to the file successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t write(const byte *data, size_t wcount) override; size_t write(const byte* data, size_t wcount) override;
/*! /*!
@brief Write data that is read from another BasicIo instance to @brief Write data that is read from another BasicIo instance to
the file. The file position is advanced by the number the file. The file position is advanced by the number
@ -347,7 +347,7 @@ class EXIV2API FileIo : public BasicIo {
@return Number of bytes written to the file successfully;<BR> @return Number of bytes written to the file successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t write(BasicIo &src) override; size_t write(BasicIo& src) override;
/*! /*!
@brief Write one byte to the file. The file position is @brief Write one byte to the file. The file position is
advanced by one byte. advanced by one byte.
@ -379,7 +379,7 @@ class EXIV2API FileIo : public BasicIo {
@return Number of bytes read from the file successfully;<BR> @return Number of bytes read from the file successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t read(byte *buf, size_t rcount) override; size_t read(byte* buf, size_t rcount) override;
/*! /*!
@brief Read one byte from the file. The file position is @brief Read one byte from the file. The file position is
advanced by one byte. advanced by one byte.
@ -405,7 +405,7 @@ class EXIV2API FileIo : public BasicIo {
invalidated by the method. invalidated by the method.
@throw Error In case of failure @throw Error In case of failure
*/ */
void transfer(BasicIo &src) override; void transfer(BasicIo& src) override;
int seek(int64_t offset, Position pos) override; int seek(int64_t offset, Position pos) override;
@ -420,7 +420,7 @@ class EXIV2API FileIo : public BasicIo {
@return A pointer to the mapped area. @return A pointer to the mapped area.
@throw Error In case of failure. @throw Error In case of failure.
*/ */
byte *mmap(bool isWriteable = false) override; byte* mmap(bool isWriteable = false) override;
/*! /*!
@brief Remove a mapping established with mmap(). If the mapped area is @brief Remove a mapping established with mmap(). If the mapped area is
writeable, this ensures that changes are written back to the writeable, this ensures that changes are written back to the
@ -432,7 +432,7 @@ class EXIV2API FileIo : public BasicIo {
/*! /*!
@brief close the file source and set a new path. @brief close the file source and set a new path.
*/ */
virtual void setPath(const std::string &path); virtual void setPath(const std::string& path);
//@} //@}
//! @name Accessors //! @name Accessors
@ -457,7 +457,7 @@ class EXIV2API FileIo : public BasicIo {
//! Returns true if the file position has reached the end, otherwise false. //! Returns true if the file position has reached the end, otherwise false.
[[nodiscard]] bool eof() const override; [[nodiscard]] bool eof() const override;
//! Returns the path of the file //! Returns the path of the file
[[nodiscard]] const std::string &path() const noexcept override; [[nodiscard]] const std::string& path() const noexcept override;
/*! /*!
@brief Mark all the bNone blocks to bKnow. This avoids allocating memory @brief Mark all the bNone blocks to bKnow. This avoids allocating memory
@ -471,9 +471,9 @@ class EXIV2API FileIo : public BasicIo {
// NOT IMPLEMENTED // NOT IMPLEMENTED
//! Copy constructor //! Copy constructor
FileIo(FileIo &rhs) = delete; FileIo(const FileIo&) = delete;
//! Assignment operator //! Assignment operator
FileIo &operator=(const FileIo &rhs) = delete; FileIo& operator=(const FileIo&) = delete;
private: private:
// Pimpl idiom // Pimpl idiom
@ -507,7 +507,7 @@ class EXIV2API MemIo : public BasicIo {
@param data Pointer to data. Data must be at least \em size bytes long @param data Pointer to data. Data must be at least \em size bytes long
@param size Number of bytes to copy. @param size Number of bytes to copy.
*/ */
MemIo(const byte *data, size_t size); MemIo(const byte* data, size_t size);
//! Destructor. Releases all managed memory //! Destructor. Releases all managed memory
~MemIo() override; ~MemIo() override;
//@} //@}
@ -536,7 +536,7 @@ class EXIV2API MemIo : public BasicIo {
@return Number of bytes written to the memory block successfully;<BR> @return Number of bytes written to the memory block successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t write(const byte *data, size_t wcount) override; size_t write(const byte* data, size_t wcount) override;
/*! /*!
@brief Write data that is read from another BasicIo instance to @brief Write data that is read from another BasicIo instance to
the memory block. If needed, the size of the internal memory the memory block. If needed, the size of the internal memory
@ -547,7 +547,7 @@ class EXIV2API MemIo : public BasicIo {
@return Number of bytes written to the memory block successfully;<BR> @return Number of bytes written to the memory block successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t write(BasicIo &src) override; size_t write(BasicIo& src) override;
/*! /*!
@brief Write one byte to the memory block. The IO position is @brief Write one byte to the memory block. The IO position is
advanced by one byte. advanced by one byte.
@ -579,7 +579,7 @@ class EXIV2API MemIo : public BasicIo {
@return Number of bytes read from the memory block successfully;<BR> @return Number of bytes read from the memory block successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t read(byte *buf, size_t rcount) override; size_t read(byte* buf, size_t rcount) override;
/*! /*!
@brief Read one byte from the memory block. The IO position is @brief Read one byte from the memory block. The IO position is
advanced by one byte. advanced by one byte.
@ -602,7 +602,7 @@ class EXIV2API MemIo : public BasicIo {
invalidated by the method. invalidated by the method.
@throw Error In case of failure @throw Error In case of failure
*/ */
void transfer(BasicIo &src) override; void transfer(BasicIo& src) override;
int seek(int64_t offset, Position pos) override; int seek(int64_t offset, Position pos) override;
@ -614,7 +614,7 @@ class EXIV2API MemIo : public BasicIo {
returned pointer remains valid and allocated as long as the returned pointer remains valid and allocated as long as the
MemIo object exists. MemIo object exists.
*/ */
byte *mmap(bool /*isWriteable*/ = false) override; byte* mmap(bool /*isWriteable*/ = false) override;
int munmap() override; int munmap() override;
//@} //@}
@ -638,7 +638,7 @@ class EXIV2API MemIo : public BasicIo {
//! Returns true if the IO position has reached the end, otherwise false. //! Returns true if the IO position has reached the end, otherwise false.
[[nodiscard]] bool eof() const override; [[nodiscard]] bool eof() const override;
//! Returns a dummy path, indicating that memory access is used //! Returns a dummy path, indicating that memory access is used
[[nodiscard]] const std::string &path() const noexcept override; [[nodiscard]] const std::string& path() const noexcept override;
/*! /*!
@brief Mark all the bNone blocks to bKnow. This avoids allocating memory @brief Mark all the bNone blocks to bKnow. This avoids allocating memory
@ -653,9 +653,9 @@ class EXIV2API MemIo : public BasicIo {
// NOT IMPLEMENTED // NOT IMPLEMENTED
//! Copy constructor //! Copy constructor
MemIo(MemIo &rhs) = delete; MemIo(const MemIo&) = delete;
//! Assignment operator //! Assignment operator
MemIo &operator=(const MemIo &rhs) = delete; MemIo& operator=(const MemIo&) = delete;
private: private:
// Pimpl idiom // Pimpl idiom
@ -673,7 +673,7 @@ class EXIV2API XPathIo : public MemIo {
//! @name Creators //! @name Creators
//@{ //@{
//! Default constructor //! Default constructor
XPathIo(const std::string &path); XPathIo(const std::string& path);
//@} //@}
private: private:
/*! /*!
@ -686,7 +686,7 @@ class EXIV2API XPathIo : public MemIo {
@param path The data uri. @param path The data uri.
@throw Error if no base64 data in path. @throw Error if no base64 data in path.
*/ */
void ReadDataUri(const std::string &path); void ReadDataUri(const std::string& path);
}; // class XPathIo }; // class XPathIo
#else #else
class EXIV2API XPathIo : public FileIo { class EXIV2API XPathIo : public FileIo {
@ -705,7 +705,7 @@ class EXIV2API XPathIo : public FileIo {
//! @name Creators //! @name Creators
//@{ //@{
//! Default constructor that reads data from stdin/data uri path and writes them to the temp file. //! Default constructor that reads data from stdin/data uri path and writes them to the temp file.
explicit XPathIo(const std::string &orgPath); explicit XPathIo(const std::string& orgPath);
//! Destructor. Releases all managed memory and removes the temp file. //! Destructor. Releases all managed memory and removes the temp file.
~XPathIo() override; ~XPathIo() override;
@ -717,7 +717,7 @@ class EXIV2API XPathIo : public FileIo {
@brief Change the name of the temp file and make it untemporary before @brief Change the name of the temp file and make it untemporary before
calling the method of superclass FileIo::transfer. calling the method of superclass FileIo::transfer.
*/ */
void transfer(BasicIo &src) override; void transfer(BasicIo& src) override;
//@} //@}
@ -729,7 +729,7 @@ class EXIV2API XPathIo : public FileIo {
@return the name of the new file. @return the name of the new file.
@throw Error if it fails. @throw Error if it fails.
*/ */
static std::string writeDataToFile(const std::string &orgPath); static std::string writeDataToFile(const std::string& orgPath);
//@} //@}
private: private:
@ -774,7 +774,7 @@ class EXIV2API RemoteIo : public BasicIo {
@brief Not support this method. @brief Not support this method.
@return 0 means failure @return 0 means failure
*/ */
size_t write(const byte *data, size_t wcount) override; size_t write(const byte* data, size_t wcount) override;
/*! /*!
@brief Write data that is read from another BasicIo instance to the remote file. @brief Write data that is read from another BasicIo instance to the remote file.
@ -789,7 +789,7 @@ class EXIV2API RemoteIo : public BasicIo {
@note The write access is only supported by http, https, ssh. @note The write access is only supported by http, https, ssh.
*/ */
size_t write(BasicIo &src) override; size_t write(BasicIo& src) override;
/*! /*!
@brief Not support @brief Not support
@ -823,7 +823,7 @@ class EXIV2API RemoteIo : public BasicIo {
@return Number of bytes read from the memory block successfully;<BR> @return Number of bytes read from the memory block successfully;<BR>
0 if failure; 0 if failure;
*/ */
size_t read(byte *buf, size_t rcount) override; size_t read(byte* buf, size_t rcount) override;
/*! /*!
@brief Read one byte from the memory blocks. The IO position is @brief Read one byte from the memory blocks. The IO position is
advanced by one byte. advanced by one byte.
@ -847,7 +847,7 @@ class EXIV2API RemoteIo : public BasicIo {
@note The write access is only supported by http, https, ssh. @note The write access is only supported by http, https, ssh.
*/ */
void transfer(BasicIo &src) override; void transfer(BasicIo& src) override;
int seek(int64_t offset, Position pos) override; int seek(int64_t offset, Position pos) override;
@ -855,7 +855,7 @@ class EXIV2API RemoteIo : public BasicIo {
@brief Not support @brief Not support
@return NULL @return NULL
*/ */
byte *mmap(bool /*isWriteable*/ = false) override; byte* mmap(bool /*isWriteable*/ = false) override;
/*! /*!
@brief Not support @brief Not support
@return 0 @return 0
@ -882,7 +882,7 @@ class EXIV2API RemoteIo : public BasicIo {
//! Returns true if the IO position has reached the end, otherwise false. //! Returns true if the IO position has reached the end, otherwise false.
[[nodiscard]] bool eof() const override; [[nodiscard]] bool eof() const override;
//! Returns the URL of the file. //! Returns the URL of the file.
[[nodiscard]] const std::string &path() const noexcept override; [[nodiscard]] const std::string& path() const noexcept override;
/*! /*!
@brief Mark all the bNone blocks to bKnow. This avoids allocating memory @brief Mark all the bNone blocks to bKnow. This avoids allocating memory
@ -918,13 +918,13 @@ class EXIV2API HttpIo : public RemoteIo {
divided into the memory blocks. These blocks are populated divided into the memory blocks. These blocks are populated
on demand from the server, so it avoids copying the complete file. on demand from the server, so it avoids copying the complete file.
*/ */
explicit HttpIo(const std::string &url, size_t blockSize = 1024); explicit HttpIo(const std::string& url, size_t blockSize = 1024);
// NOT IMPLEMENTED // NOT IMPLEMENTED
//! Copy constructor //! Copy constructor
HttpIo(HttpIo &rhs) = delete; HttpIo(const HttpIo&) = delete;
//! Assignment operator //! Assignment operator
HttpIo &operator=(const HttpIo &rhs) = delete; HttpIo& operator=(const HttpIo&) = delete;
private: private:
// Pimpl idiom // Pimpl idiom
@ -949,26 +949,26 @@ class EXIV2API CurlIo : public RemoteIo {
on demand from the server, so it avoids copying the complete file. on demand from the server, so it avoids copying the complete file.
@throw Error if it is unable to init curl pointer. @throw Error if it is unable to init curl pointer.
*/ */
explicit CurlIo(const std::string &url, size_t blockSize = 0); explicit CurlIo(const std::string& url, size_t blockSize = 0);
/*! /*!
@brief Write access is only available for some protocols. This method @brief Write access is only available for some protocols. This method
will call RemoteIo::write(const byte* data, long wcount) if the write will call RemoteIo::write(const byte* data, long wcount) if the write
access is available for the protocol. Otherwise, it throws the Error. access is available for the protocol. Otherwise, it throws the Error.
*/ */
size_t write(const byte *data, size_t wcount) override; size_t write(const byte* data, size_t wcount) override;
/*! /*!
@brief Write access is only available for some protocols. This method @brief Write access is only available for some protocols. This method
will call RemoteIo::write(BasicIo& src) if the write access is available will call RemoteIo::write(BasicIo& src) if the write access is available
for the protocol. Otherwise, it throws the Error. for the protocol. Otherwise, it throws the Error.
*/ */
size_t write(BasicIo &src) override; size_t write(BasicIo& src) override;
// NOT IMPLEMENTED // NOT IMPLEMENTED
//! Copy constructor //! Copy constructor
CurlIo(CurlIo &rhs) = delete; CurlIo(const CurlIo&) = delete;
//! Assignment operator //! Assignment operator
CurlIo &operator=(const CurlIo &rhs) = delete; CurlIo& operator=(const CurlIo&) = delete;
protected: protected:
// Pimpl idiom // Pimpl idiom
@ -984,18 +984,18 @@ class EXIV2API CurlIo : public RemoteIo {
@return Buffer containing the file. @return Buffer containing the file.
@throw Error In case of failure. @throw Error In case of failure.
*/ */
EXIV2API DataBuf readFile(const std::string &path); EXIV2API DataBuf readFile(const std::string& path);
/*! /*!
@brief Write DataBuf \em buf to file \em path. @brief Write DataBuf \em buf to file \em path.
@return Return the number of bytes written. @return Return the number of bytes written.
@throw Error In case of failure. @throw Error In case of failure.
*/ */
EXIV2API size_t writeFile(const DataBuf &buf, const std::string &path); EXIV2API size_t writeFile(const DataBuf& buf, const std::string& path);
#ifdef EXV_USE_CURL #ifdef EXV_USE_CURL
/*! /*!
@brief The callback function is called by libcurl to write the data @brief The callback function is called by libcurl to write the data
*/ */
EXIV2API size_t curlWriter(char *data, size_t size, size_t nmemb, std::string *writerData); EXIV2API size_t curlWriter(char* data, size_t size, size_t nmemb, std::string* writerData);
#endif #endif
} // namespace Exiv2 } // namespace Exiv2
#endif // #ifndef BASICIO_HPP_ #endif // #ifndef BASICIO_HPP_

4
include/exiv2/bmpimage.hpp
View File

@ -29,9 +29,9 @@ class EXIV2API BmpImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
BmpImage(const BmpImage& rhs) = delete; BmpImage(const BmpImage&) = delete;
//! Assignment operator //! Assignment operator
BmpImage& operator=(const BmpImage& rhs) = delete; BmpImage& operator=(const BmpImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

4
include/exiv2/cr2image.hpp
View File

@ -74,9 +74,9 @@ class EXIV2API Cr2Image : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
Cr2Image(const Cr2Image& rhs) = delete; Cr2Image(const Cr2Image&) = delete;
//! Assignment operator //! Assignment operator
Cr2Image& operator=(const Cr2Image& rhs) = delete; Cr2Image& operator=(const Cr2Image&) = delete;
//@} //@}
}; // class Cr2Image }; // class Cr2Image

4
include/exiv2/crwimage.hpp
View File

@ -76,9 +76,9 @@ class EXIV2API CrwImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
CrwImage(const CrwImage& rhs) = delete; CrwImage(const CrwImage&) = delete;
//! Assignment operator //! Assignment operator
CrwImage& operator=(const CrwImage& rhs) = delete; CrwImage& operator=(const CrwImage&) = delete;
//@} //@}
}; // class CrwImage }; // class CrwImage

8
include/exiv2/datasets.hpp
View File

@ -132,12 +132,10 @@ class EXIV2API IptcDataSets {
static constexpr uint16_t Preview = 202; static constexpr uint16_t Preview = 202;
//@} //@}
//! Prevent construction: not implemented.
IptcDataSets() = delete;
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
IptcDataSets(const IptcDataSets& rhs) = delete; IptcDataSets(const IptcDataSets&) = delete;
//! Prevent assignment: not implemented. //! Prevent assignment: not implemented.
IptcDataSets& operator=(const IptcDataSets& rhs) = delete; IptcDataSets& operator=(const IptcDataSets&) = delete;
/*! /*!
@brief Return the name of the dataset. @brief Return the name of the dataset.
@ -265,7 +263,7 @@ class EXIV2API IptcKey : public Key {
IptcKey(uint16_t tag, uint16_t record); IptcKey(uint16_t tag, uint16_t record);
//! Copy constructor //! Copy constructor
IptcKey(const IptcKey& rhs); IptcKey(const IptcKey& rhs);
IptcKey& operator=(const IptcKey& rhs) = delete; IptcKey& operator=(const IptcKey&) = delete;
//! Destructor //! Destructor
~IptcKey() override = default; ~IptcKey() override = default;
//@} //@}

4
include/exiv2/epsimage.hpp
View File

@ -76,9 +76,9 @@ class EXIV2API EpsImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
EpsImage(const EpsImage& rhs) = delete; EpsImage(const EpsImage&) = delete;
//! Assignment operator //! Assignment operator
EpsImage& operator=(const EpsImage& rhs) = delete; EpsImage& operator=(const EpsImage&) = delete;
//@} //@}
}; // class EpsImage }; // class EpsImage

4
include/exiv2/gifimage.hpp
View File

@ -24,9 +24,9 @@ class EXIV2API GifImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
GifImage(const GifImage& rhs) = delete; GifImage(const GifImage&) = delete;
//! Assignment operator //! Assignment operator
GifImage& operator=(const GifImage& rhs) = delete; GifImage& operator=(const GifImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

9
include/exiv2/image.hpp
View File

@ -453,9 +453,9 @@ class EXIV2API Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
Image(const Image& rhs) = delete; Image(const Image&) = delete;
//! Assignment operator //! Assignment operator
Image& operator=(const Image& rhs) = delete; Image& operator=(const Image&) = delete;
//@} //@}
protected: protected:
@ -656,10 +656,9 @@ class EXIV2API ImageFactory {
//! @name Creators //! @name Creators
//@{ //@{
//! Prevent construction: not implemented.
ImageFactory() = delete;
//! Prevent copy construction: not implemented. //! Prevent copy construction: not implemented.
ImageFactory(const ImageFactory& rhs) = delete; ImageFactory(const ImageFactory&) = delete;
ImageFactory& operator=(const ImageFactory&) = delete;
//@} //@}
}; // class ImageFactory }; // class ImageFactory

12
include/exiv2/jp2image.hpp
View File

@ -50,7 +50,7 @@ class EXIV2API Jp2Image : public Image {
not valid (does not look like data of the specific image type). not valid (does not look like data of the specific image type).
@warning This function is not thread safe and intended for exiv2 -pS for debugging. @warning This function is not thread safe and intended for exiv2 -pS for debugging.
*/ */
void printStructure(std::ostream &out, PrintStructureOption option, int depth) override; void printStructure(std::ostream& out, PrintStructureOption option, int depth) override;
/*! /*!
@brief Todo: Not supported yet(?). Calling this function will throw @brief Todo: Not supported yet(?). Calling this function will throw
@ -67,9 +67,9 @@ class EXIV2API Jp2Image : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
Jp2Image(const Jp2Image &rhs) = delete; Jp2Image(const Jp2Image&) = delete;
//! Assignment operator //! Assignment operator
Jp2Image &operator=(const Jp2Image &rhs) = delete; Jp2Image& operator=(const Jp2Image&) = delete;
private: private:
/*! /*!
@ -79,14 +79,14 @@ class EXIV2API Jp2Image : public Image {
@return 4 if opening or writing to the associated BasicIo fails @return 4 if opening or writing to the associated BasicIo fails
*/ */
void doWriteMetadata(BasicIo &outIo); void doWriteMetadata(BasicIo& outIo);
/*! /*!
@brief reformats the Jp2Header to store iccProfile @brief reformats the Jp2Header to store iccProfile
@param oldData DataBufRef to data in the file. @param oldData DataBufRef to data in the file.
@param newData DataBufRef with updated data @param newData DataBufRef with updated data
*/ */
void encodeJp2Header(const DataBuf &boxBuf, DataBuf &outBuf); void encodeJp2Header(const DataBuf& boxBuf, DataBuf& outBuf);
//@} //@}
}; // class Jp2Image }; // class Jp2Image
@ -104,7 +104,7 @@ class EXIV2API Jp2Image : public Image {
EXIV2API Image::UniquePtr newJp2Instance(BasicIo::UniquePtr io, bool create); EXIV2API Image::UniquePtr newJp2Instance(BasicIo::UniquePtr io, bool create);
//! Check if the file iIo is a JPEG-2000 image. //! Check if the file iIo is a JPEG-2000 image.
EXIV2API bool isJp2Type(BasicIo &iIo, bool advance); EXIV2API bool isJp2Type(BasicIo& iIo, bool advance);
} // namespace Exiv2 } // namespace Exiv2

18
include/exiv2/jpgimage.hpp
View File

@ -104,12 +104,10 @@ class EXIV2API JpegBase : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Default constructor.
JpegBase() = delete;
//! Copy constructor //! Copy constructor
JpegBase(const JpegBase& rhs) = delete; JpegBase(const JpegBase&) = delete;
//! Assignment operator //! Assignment operator
JpegBase& operator=(const JpegBase& rhs) = delete; JpegBase& operator=(const JpegBase&) = delete;
//@} //@}
protected: protected:
@ -286,12 +284,10 @@ class EXIV2API JpegImage : public JpegBase {
//@} //@}
// NOT Implemented // NOT Implemented
//! Default constructor
JpegImage() = delete;
//! Copy constructor //! Copy constructor
JpegImage(const JpegImage& rhs) = delete; JpegImage(const JpegImage&) = delete;
//! Assignment operator //! Assignment operator
JpegImage& operator=(const JpegImage& rhs) = delete; JpegImage& operator=(const JpegImage&) = delete;
protected: protected:
//! @name Accessors //! @name Accessors
@ -347,12 +343,10 @@ class EXIV2API ExvImage : public JpegBase {
//@} //@}
// NOT Implemented // NOT Implemented
//! Default constructor
ExvImage() = delete;
//! Copy constructor //! Copy constructor
ExvImage(const ExvImage& rhs) = delete; ExvImage(const ExvImage&) = delete;
//! Assignment operator //! Assignment operator
ExvImage& operator=(const ExvImage& rhs) = delete; ExvImage& operator=(const ExvImage&) = delete;
protected: protected:
//! @name Accessors //! @name Accessors

6
include/exiv2/metadatum.hpp
View File

@ -77,7 +77,7 @@ class EXIV2API Key {
@brief Assignment operator. Protected so that it can only be used @brief Assignment operator. Protected so that it can only be used
by subclasses but not directly. by subclasses but not directly.
*/ */
Key& operator=(const Key& rhs) = default; Key& operator=(const Key&) = default;
//@} //@}
private: private:
@ -102,7 +102,7 @@ class EXIV2API Metadatum {
//! Default Constructor //! Default Constructor
Metadatum() = default; Metadatum() = default;
//! Copy constructor //! Copy constructor
Metadatum(const Metadatum& rhs) = default; Metadatum(const Metadatum&) = default;
//! Destructor //! Destructor
virtual ~Metadatum() = default; virtual ~Metadatum() = default;
//@} //@}
@ -259,7 +259,7 @@ class EXIV2API Metadatum {
@brief Assignment operator. Protected so that it can only be used @brief Assignment operator. Protected so that it can only be used
by subclasses but not directly. by subclasses but not directly.
*/ */
Metadatum& operator=(const Metadatum& rhs) = default; Metadatum& operator=(const Metadatum&) = default;
//@} //@}
}; // class Metadatum }; // class Metadatum

4
include/exiv2/mrwimage.hpp
View File

@ -24,9 +24,9 @@ class EXIV2API MrwImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
MrwImage(const MrwImage& rhs) = delete; MrwImage(const MrwImage&) = delete;
//! Assignment operator //! Assignment operator
MrwImage& operator=(const MrwImage& rhs) = delete; MrwImage& operator=(const MrwImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

4
include/exiv2/orfimage.hpp
View File

@ -24,9 +24,9 @@ class EXIV2API OrfImage : public TiffImage {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
OrfImage(const OrfImage& rhs) = delete; OrfImage(const OrfImage&) = delete;
//! Assignment operator //! Assignment operator
OrfImage& operator=(const OrfImage& rhs) = delete; OrfImage& operator=(const OrfImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

4
include/exiv2/pgfimage.hpp
View File

@ -57,9 +57,9 @@ class EXIV2API PgfImage : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
PgfImage(const PgfImage& rhs) = delete; PgfImage(const PgfImage&) = delete;
//! Assignment operator //! Assignment operator
PgfImage& operator=(const PgfImage& rhs) = delete; PgfImage& operator=(const PgfImage&) = delete;
private: private:
bool bSwap_; // true for bigEndian hardware, else false bool bSwap_; // true for bigEndian hardware, else false

4
include/exiv2/pngimage.hpp
View File

@ -63,9 +63,9 @@ class EXIV2API PngImage : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
PngImage(const PngImage& rhs) = delete; PngImage(const PngImage&) = delete;
//! Assignment operator //! Assignment operator
PngImage& operator=(const PngImage& rhs) = delete; PngImage& operator=(const PngImage&) = delete;
private: private:
/*! /*!

4
include/exiv2/properties.hpp
View File

@ -71,12 +71,10 @@ class EXIV2API XmpProperties {
static const XmpNsInfo* lookupNsRegistryUnsafe(const XmpNsInfo::Prefix& prefix); static const XmpNsInfo* lookupNsRegistryUnsafe(const XmpNsInfo::Prefix& prefix);
public: public:
//! Prevent construction: not implemented.
XmpProperties() = delete;
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
XmpProperties(const XmpProperties&) = delete; XmpProperties(const XmpProperties&) = delete;
//! Prevent assignment: not implemented. //! Prevent assignment: not implemented.
XmpProperties& operator=(const XmpProperties& rhs) = delete; XmpProperties& operator=(const XmpProperties&) = delete;
/*! /*!
@brief Return the title (label) of the property. @brief Return the title (label) of the property.

4
include/exiv2/psdimage.hpp
View File

@ -23,9 +23,9 @@ class EXIV2API PsdImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
PsdImage(const PsdImage& rhs) = delete; PsdImage(const PsdImage&) = delete;
//! Assignment operator //! Assignment operator
PsdImage& operator=(const PsdImage& rhs) = delete; PsdImage& operator=(const PsdImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

4
include/exiv2/rafimage.hpp
View File

@ -77,9 +77,9 @@ class EXIV2API RafImage : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
RafImage(const RafImage& rhs) = delete; RafImage(const RafImage&) = delete;
//! Assignment operator //! Assignment operator
RafImage& operator=(const RafImage& rhs) = delete; RafImage& operator=(const RafImage&) = delete;
//@} //@}
}; // class RafImage }; // class RafImage

4
include/exiv2/rw2image.hpp
View File

@ -75,9 +75,9 @@ class EXIV2API Rw2Image : public Image {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Copy constructor //! Copy constructor
Rw2Image(const Rw2Image& rhs) = delete; Rw2Image(const Rw2Image&) = delete;
//! Assignment operator //! Assignment operator
Rw2Image& operator=(const Rw2Image& rhs) = delete; Rw2Image& operator=(const Rw2Image&) = delete;
//@} //@}
}; // class Rw2Image }; // class Rw2Image

6
include/exiv2/tags.hpp
View File

@ -63,12 +63,10 @@ struct EXIV2API TagInfo {
//! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class. //! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class.
class EXIV2API ExifTags { class EXIV2API ExifTags {
public: public:
//! Prevent construction: not implemented.
ExifTags() = delete;
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
ExifTags(const ExifTags& rhs) = delete; ExifTags(const ExifTags&) = delete;
//! Prevent assignment: not implemented. //! Prevent assignment: not implemented.
ExifTags& operator=(const ExifTags& rhs) = delete; ExifTags& operator=(const ExifTags&) = delete;
//! Return read-only list of built-in groups //! Return read-only list of built-in groups
static const GroupInfo* groupList(); static const GroupInfo* groupList();

4
include/exiv2/tgaimage.hpp
View File

@ -23,9 +23,9 @@ class EXIV2API TgaImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
TgaImage(const TgaImage& rhs) = delete; TgaImage(const TgaImage&) = delete;
//! Assignment operator //! Assignment operator
TgaImage& operator=(const TgaImage& rhs) = delete; TgaImage& operator=(const TgaImage&) = delete;
//@} //@}
//! @name Creators //! @name Creators

4
include/exiv2/tiffimage.hpp
View File

@ -71,9 +71,9 @@ class EXIV2API TiffImage : public Image {
//! @name NOT Implemented //! @name NOT Implemented
//@{ //@{
//! Copy constructor //! Copy constructor
TiffImage(const TiffImage& rhs) = delete; TiffImage(const TiffImage&) = delete;
//! Assignment operator //! Assignment operator
TiffImage& operator=(const TiffImage& rhs) = delete; TiffImage& operator=(const TiffImage&) = delete;
//@} //@}
private: private:

6
include/exiv2/types.hpp
View File

@ -117,12 +117,10 @@ using Blob = std::vector<byte>;
//! Type information lookup functions. Implemented as a static class. //! Type information lookup functions. Implemented as a static class.
class EXIV2API TypeInfo { class EXIV2API TypeInfo {
public: public:
//! Prevent construction: not implemented.
TypeInfo() = delete;
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
TypeInfo(const TypeInfo& rhs) = delete; TypeInfo(const TypeInfo&) = delete;
//! Prevent assignment: not implemented. //! Prevent assignment: not implemented.
TypeInfo& operator=(const TypeInfo& rhs) = delete; TypeInfo& operator=(const TypeInfo&) = delete;
//! Return the name of the type, 0 if unknown. //! Return the name of the type, 0 if unknown.
static const char* typeName(TypeId typeId); static const char* typeName(TypeId typeId);

8
include/exiv2/value.hpp
View File

@ -225,7 +225,7 @@ class EXIV2API Value {
@brief Assignment operator. Protected so that it can only be used @brief Assignment operator. Protected so that it can only be used
by subclasses but not directly. by subclasses but not directly.
*/ */
Value& operator=(const Value& rhs) = default; Value& operator=(const Value&) = default;
// DATA // DATA
mutable bool ok_; //!< Indicates the status of the previous to<Type> conversion mutable bool ok_; //!< Indicates the status of the previous to<Type> conversion
@ -323,7 +323,7 @@ class EXIV2API StringValueBase : public Value {
//! Constructor for subclasses //! Constructor for subclasses
StringValueBase(TypeId typeId, const std::string& buf); StringValueBase(TypeId typeId, const std::string& buf);
//! Copy constructor //! Copy constructor
StringValueBase(const StringValueBase& rhs) = default; StringValueBase(const StringValueBase&) = default;
//! Virtual destructor. //! Virtual destructor.
~StringValueBase() override = default; ~StringValueBase() override = default;
//@} //@}
@ -365,7 +365,7 @@ class EXIV2API StringValueBase : public Value {
protected: protected:
//! Assignment operator. //! Assignment operator.
StringValueBase& operator=(const StringValueBase& rhs); StringValueBase& operator=(const StringValueBase&);
//! Internal virtual copy constructor. //! Internal virtual copy constructor.
StringValueBase* clone_() const override = 0; StringValueBase* clone_() const override = 0;
@ -485,8 +485,6 @@ class EXIV2API CommentValue : public StringValueBase {
//! Charset information lookup functions. Implemented as a static class. //! Charset information lookup functions. Implemented as a static class.
class EXIV2API CharsetInfo { class EXIV2API CharsetInfo {
public: public:
//! Prevent construction: not implemented.
CharsetInfo() = delete;
//! Prevent copy-construction: not implemented. //! Prevent copy-construction: not implemented.
CharsetInfo(const CharsetInfo&) = delete; CharsetInfo(const CharsetInfo&) = delete;
//! Prevent assignment: not implemented. //! Prevent assignment: not implemented.

4
include/exiv2/webpimage.hpp
View File

@ -55,9 +55,9 @@ class EXIV2API WebPImage : public Image {
//@} //@}
//! Copy constructor //! Copy constructor
WebPImage(const WebPImage& rhs) = delete; WebPImage(const WebPImage&) = delete;
//! Assignment operator //! Assignment operator
WebPImage& operator=(const WebPImage& rhs) = delete; WebPImage& operator=(const WebPImage&) = delete;
//@} //@}
private: private:

22
src/basicio.cpp
View File

@ -112,9 +112,9 @@ class FileIo::Impl {
//! stat wrapper for internal use //! stat wrapper for internal use
int stat(StructStat& buf) const; int stat(StructStat& buf) const;
// NOT IMPLEMENTED // NOT IMPLEMENTED
Impl(const Impl& rhs) = delete; //!< Copy constructor Impl(const Impl&) = delete; //!< Copy constructor
Impl& operator=(const Impl& rhs) = delete; //!< Assignment Impl& operator=(const Impl&) = delete; //!< Assignment
}; // class FileIo::Impl };
FileIo::Impl::Impl(std::string path) : path_(std::move(path)) { FileIo::Impl::Impl(std::string path) : path_(std::move(path)) {
} }
@ -570,9 +570,9 @@ class MemIo::Impl final {
void reserve(size_t wcount); //!< Reserve memory void reserve(size_t wcount); //!< Reserve memory
// NOT IMPLEMENTED // NOT IMPLEMENTED
Impl(const Impl& rhs) = delete; //!< Copy constructor Impl(const Impl&) = delete; //!< Copy constructor
Impl& operator=(const Impl& rhs) = delete; //!< Assignment Impl& operator=(const Impl&) = delete; //!< Assignment
}; // class MemIo::Impl };
MemIo::Impl::Impl(const byte* data, size_t size) : data_(const_cast<byte*>(data)), size_(size) { MemIo::Impl::Impl(const byte* data, size_t size) : data_(const_cast<byte*>(data)), size_(size) {
} }
@ -1414,9 +1414,9 @@ class HttpIo::HttpImpl : public Impl {
void writeRemote(const byte* data, size_t size, size_t from, size_t to) override; void writeRemote(const byte* data, size_t size, size_t from, size_t to) override;
// NOT IMPLEMENTED // NOT IMPLEMENTED
HttpImpl(const HttpImpl& rhs) = delete; //!< Copy constructor HttpImpl(const HttpImpl&) = delete; //!< Copy constructor
HttpImpl& operator=(const HttpImpl& rhs) = delete; //!< Assignment HttpImpl& operator=(const HttpImpl&) = delete; //!< Assignment
}; // class HttpIo::HttpImpl };
HttpIo::HttpImpl::HttpImpl(const std::string& url, size_t blockSize) : Impl(url, blockSize) { HttpIo::HttpImpl::HttpImpl(const std::string& url, size_t blockSize) : Impl(url, blockSize) {
hostInfo_ = Exiv2::Uri::Parse(url); hostInfo_ = Exiv2::Uri::Parse(url);
@ -1564,8 +1564,8 @@ class CurlIo::CurlImpl : public Impl {
void writeRemote(const byte* data, size_t size, size_t from, size_t to) override; void writeRemote(const byte* data, size_t size, size_t from, size_t to) override;
// NOT IMPLEMENTED // NOT IMPLEMENTED
CurlImpl(const CurlImpl& rhs) = delete; //!< Copy constructor CurlImpl(const CurlImpl&) = delete; //!< Copy constructor
CurlImpl& operator=(const CurlImpl& rhs) = delete; //!< Assignment CurlImpl& operator=(const CurlImpl&) = delete; //!< Assignment
private: private:
long timeout_; //!< The number of seconds to wait while trying to connect. long timeout_; //!< The number of seconds to wait while trying to connect.
}; // class RemoteIo::Impl }; // class RemoteIo::Impl

4
src/crwimage_int.hpp
View File

@ -531,8 +531,8 @@ class CrwMap {
public: public:
//! @name Not implemented //! @name Not implemented
//@{ //@{
//! Default constructor CrwMap(const CrwMap&) = delete;
CrwMap() = delete; CrwMap& operator=(const CrwMap&) = delete;
//@} //@}
/*! /*!

2
src/tiffcomposite_int.hpp
View File

@ -396,7 +396,7 @@ class TiffEntryBase : public TiffComponent {
//! @name NOT implemented //! @name NOT implemented
//@{ //@{
//! Assignment operator. //! Assignment operator.
TiffEntryBase& operator=(const TiffEntryBase& rhs) = delete; TiffEntryBase& operator=(const TiffEntryBase&) = delete;
//@} //@}
//! @name Manipulators //! @name Manipulators