Skip to content

Commit 84ba579

Browse files
authored
Merge pull request #2200 from neheb/3
clang-tidy with headers
2 parents 053f516 + c997b09 commit 84ba579

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+166
-144
lines changed

include/exiv2/basicio.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,9 @@ class EXIV2API XPathIo : public FileIo {
711711
~XPathIo() override;
712712
//@}
713713

714+
XPathIo(const XPathIo&) = delete;
715+
XPathIo& operator=(const XPathIo&) = delete;
716+
714717
//! @name Manipulators
715718
//@{
716719
/*!
@@ -751,6 +754,9 @@ class EXIV2API RemoteIo : public BasicIo {
751754
~RemoteIo() override;
752755
//@}
753756

757+
RemoteIo(const RemoteIo&) = delete;
758+
RemoteIo& operator=(const RemoteIo&) = delete;
759+
754760
//! @name Manipulators
755761
//@{
756762
/*!
@@ -920,6 +926,7 @@ class EXIV2API HttpIo : public RemoteIo {
920926
*/
921927
explicit HttpIo(const std::string& url, size_t blockSize = 1024);
922928

929+
~HttpIo() override = default;
923930
// NOT IMPLEMENTED
924931
//! Copy constructor
925932
HttpIo(const HttpIo&) = delete;
@@ -964,6 +971,7 @@ class EXIV2API CurlIo : public RemoteIo {
964971
*/
965972
size_t write(BasicIo& src) override;
966973

974+
~CurlIo() override = default;
967975
// NOT IMPLEMENTED
968976
//! Copy constructor
969977
CurlIo(const CurlIo&) = delete;

include/exiv2/bmffimage.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class EXIV2API BmffImage : public Image {
123123
@warning This function should only be called by readMetadata()
124124
*/
125125
long boxHandler(std::ostream& out, Exiv2::PrintStructureOption option, const long pbox_end, int depth);
126-
[[nodiscard]] std::string indent(int i) const {
126+
[[nodiscard]] static std::string indent(int i) {
127127
return std::string(2 * i, ' ');
128128
}
129129

include/exiv2/bmpimage.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace Exiv2 {
2626
*/
2727
class EXIV2API BmpImage : public Image {
2828
public:
29+
~BmpImage() override = default;
2930
//! @name NOT Implemented
3031
//@{
3132
//! Copy constructor

include/exiv2/cr2image.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class EXIV2API Cr2Image : public Image {
7171
[[nodiscard]] uint32_t pixelHeight() const override;
7272
//@}
7373

74+
~Cr2Image() override = default;
7475
//! @name NOT implemented
7576
//@{
7677
//! Copy constructor

include/exiv2/crwimage.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class EXIV2API CrwImage : public Image {
7373
[[nodiscard]] uint32_t pixelHeight() const override;
7474
//@}
7575

76+
~CrwImage() override = default;
7677
//! @name NOT Implemented
7778
//@{
7879
//! Copy constructor

include/exiv2/datasets.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class EXIV2API IptcDataSets {
132132
static constexpr uint16_t Preview = 202;
133133
//@}
134134

135+
~IptcDataSets() = delete;
135136
//! Prevent copy-construction: not implemented.
136137
IptcDataSets(const IptcDataSets&) = delete;
137138
//! Prevent assignment: not implemented.
@@ -263,7 +264,7 @@ class EXIV2API IptcKey : public Key {
263264
IptcKey(uint16_t tag, uint16_t record);
264265
//! Copy constructor
265266
IptcKey(const IptcKey& rhs);
266-
IptcKey& operator=(const IptcKey&) = delete;
267+
IptcKey& operator=(const IptcKey&) = default;
267268
//! Destructor
268269
~IptcKey() override = default;
269270
//@}

include/exiv2/epsimage.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class EXIV2API EpsImage : public Image {
7373
[[nodiscard]] std::string mimeType() const override;
7474
//@}
7575

76+
~EpsImage() override = default;
7677
//! @name NOT Implemented
7778
//@{
7879
//! Copy constructor

include/exiv2/gifimage.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace Exiv2 {
2121
*/
2222
class EXIV2API GifImage : public Image {
2323
public:
24+
~GifImage() override = default;
2425
//! @name NOT Implemented
2526
//@{
2627
//! Copy constructor

include/exiv2/image.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,7 @@ class EXIV2API ImageFactory {
656656

657657
//! @name Creators
658658
//@{
659+
~ImageFactory() = delete;
659660
//! Prevent copy construction: not implemented.
660661
ImageFactory(const ImageFactory&) = delete;
661662
ImageFactory& operator=(const ImageFactory&) = delete;

include/exiv2/jp2image.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class EXIV2API Jp2Image : public Image {
6464
[[nodiscard]] std::string mimeType() const override;
6565
//@}
6666

67+
~Jp2Image() override = default;
6768
//! @name NOT Implemented
6869
//@{
6970
//! Copy constructor

0 commit comments

Comments
 (0)