Skip to content

Commit e309680

Browse files
committed
remove deleted members from static classes
This is a holdover from C++98. No need anymore Signed-off-by: Rosen Penev <[email protected]>
1 parent 6a34d9e commit e309680

File tree

7 files changed

+0
-46
lines changed

7 files changed

+0
-46
lines changed

include/exiv2/datasets.hpp

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

135-
~IptcDataSets() = delete;
136-
//! Prevent copy-construction: not implemented.
137-
IptcDataSets(const IptcDataSets&) = delete;
138-
//! Prevent assignment: not implemented.
139-
IptcDataSets& operator=(const IptcDataSets&) = delete;
140-
141135
/*!
142136
@brief Return the name of the dataset.
143137
@param number The dataset number

include/exiv2/image.hpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -657,15 +657,6 @@ class EXIV2API ImageFactory {
657657
false if the data does not match
658658
*/
659659
static bool checkType(ImageType type, BasicIo& io, bool advance);
660-
661-
//! @name Creators
662-
//@{
663-
~ImageFactory() = delete;
664-
//! Prevent copy construction: not implemented.
665-
ImageFactory(const ImageFactory&) = delete;
666-
ImageFactory& operator=(const ImageFactory&) = delete;
667-
//@}
668-
669660
}; // class ImageFactory
670661

671662
// *****************************************************************************

include/exiv2/properties.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ class EXIV2API XmpProperties {
7272
static const XmpNsInfo* lookupNsRegistryUnsafe(const XmpNsInfo::Prefix& prefix);
7373

7474
public:
75-
~XmpProperties() = delete;
76-
//! Prevent copy-construction: not implemented.
77-
XmpProperties(const XmpProperties&) = delete;
78-
//! Prevent assignment: not implemented.
79-
XmpProperties& operator=(const XmpProperties&) = delete;
80-
8175
/*!
8276
@brief Return the title (label) of the property.
8377
@param key The property key

include/exiv2/tags.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,6 @@ struct EXIV2API TagInfo {
236236
//! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class.
237237
class EXIV2API ExifTags {
238238
public:
239-
~ExifTags() = delete;
240-
//! Prevent copy-construction: not implemented.
241-
ExifTags(const ExifTags&) = delete;
242-
//! Prevent assignment: not implemented.
243-
ExifTags& operator=(const ExifTags&) = delete;
244-
245239
//! Return read-only list of built-in groups
246240
static const GroupInfo* groupList();
247241
//! Return read-only list of built-in \em groupName tags.

include/exiv2/types.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ using Blob = std::vector<byte>;
117117
//! Type information lookup functions. Implemented as a static class.
118118
class EXIV2API TypeInfo {
119119
public:
120-
//! Prevent copy-construction: not implemented.
121-
TypeInfo(const TypeInfo&) = delete;
122-
//! Prevent assignment: not implemented.
123-
TypeInfo& operator=(const TypeInfo&) = delete;
124-
~TypeInfo() = delete;
125-
126120
//! Return the name of the type, 0 if unknown.
127121
static const char* typeName(TypeId typeId);
128122
//! Return the type id for a type name

include/exiv2/value.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,6 @@ class EXIV2API CommentValue : public StringValueBase {
481481
//! Charset information lookup functions. Implemented as a static class.
482482
class EXIV2API CharsetInfo {
483483
public:
484-
//! Prevent copy-construction: not implemented.
485-
CharsetInfo(const CharsetInfo&) = delete;
486-
//! Prevent assignment: not implemented.
487-
CharsetInfo& operator=(const CharsetInfo&) = delete;
488-
~CharsetInfo() = delete;
489-
490484
//! Return the name for a charset id
491485
static const char* name(CharsetId charsetId);
492486
//! Return the code for a charset id

src/crwimage_int.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -527,13 +527,6 @@ struct CrwMapping {
527527
*/
528528
class CrwMap {
529529
public:
530-
~CrwMap() = delete;
531-
//! @name Not implemented
532-
//@{
533-
CrwMap(const CrwMap&) = delete;
534-
CrwMap& operator=(const CrwMap&) = delete;
535-
//@}
536-
537530
/*!
538531
@brief Decode image metadata from a CRW entry, convert and add it
539532
to the image metadata. This function converts only one CRW

0 commit comments

Comments
 (0)