Skip to content

clazy fixes #3410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2025
Merged

clazy fixes #3410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6467f06
clazy: trivial types to value
neheb Oct 9, 2025
7a7fe78
clazy: delete some polymorphic classes
neheb Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/convert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool convertStringCharsetWindows(std::string& str, std::string_view from, std::s
exactly one entry, \em value is set to this entry, without the qualifier.
The return code indicates if the operation was successful.
*/
bool getTextValue(std::string& value, const Exiv2::XmpData::iterator& pos);
bool getTextValue(std::string& value, Exiv2::XmpData::iterator pos);
} // namespace

// *****************************************************************************
Expand Down Expand Up @@ -1589,7 +1589,7 @@ bool convertStringCharsetWindows(std::string& str, std::string_view from, std::s
}

#endif // EXV_HAVE_ICONV
bool getTextValue(std::string& value, const XmpData::iterator& pos) {
bool getTextValue(std::string& value, XmpData::iterator pos) {
if (pos->typeId() == langAlt) {
// get the default language entry without x-default qualifier
value = pos->toString(0);
Expand Down
2 changes: 2 additions & 0 deletions src/crwimage_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ class CiffComponent {
CiffComponent(uint16_t tag, uint16_t dir);
//! Virtual destructor.
virtual ~CiffComponent() = default;
CiffComponent(const CiffComponent&) = delete;
CiffComponent& operator=(const CiffComponent&) = delete;
//@}

//! @name Manipulators
Expand Down
3 changes: 3 additions & 0 deletions src/exif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,11 @@ class Thumbnail {

//! @name Creators
//@{
Thumbnail() = default;
//! Virtual destructor
virtual ~Thumbnail() = default;
Thumbnail(const Thumbnail&) = delete;
Thumbnail& operator=(const Thumbnail&) = delete;
//@}

//! Factory function to create a thumbnail for the Exif metadata provided.
Expand Down
5 changes: 2 additions & 3 deletions src/makernote_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace fs = std::filesystem;
namespace {
// Todo: Can be generalized further - get any tag as a string/long/...
//! Get the Value for a tag within a particular group
const Exiv2::Value* getExifValue(Exiv2::Internal::TiffComponent* pRoot, const uint16_t& tag, const Exiv2::IfdId& group);
const Exiv2::Value* getExifValue(Exiv2::Internal::TiffComponent* pRoot, uint16_t tag, Exiv2::IfdId group);
//! Get the model name from tag Exif.Image.Model
std::string getExifModel(Exiv2::Internal::TiffComponent* pRoot);

Expand Down Expand Up @@ -1036,8 +1036,7 @@ int sonyMisc3cSelector(uint16_t /*tag*/, const byte* /*pData*/, size_t /*size*/,
// *****************************************************************************
// local definitions
namespace {
const Exiv2::Value* getExifValue(Exiv2::Internal::TiffComponent* pRoot, const uint16_t& tag,
const Exiv2::IfdId& group) {
const Exiv2::Value* getExifValue(Exiv2::Internal::TiffComponent* pRoot, uint16_t tag, Exiv2::IfdId group) {
Exiv2::Internal::TiffFinder finder(tag, group);
if (!pRoot)
return nullptr;
Expand Down
3 changes: 3 additions & 0 deletions src/makernote_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,11 @@ class MnHeader {
public:
//! @name Creators
//@{
MnHeader() = default;
//! Virtual destructor.
virtual ~MnHeader() = default;
MnHeader(const MnHeader&) = delete;
MnHeader& operator=(const MnHeader&) = delete;
//@}
//! @name Manipulators
//@{
Expand Down
4 changes: 3 additions & 1 deletion src/tiffimage_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class TiffHeaderBase {
TiffHeaderBase(uint16_t tag, uint32_t size, ByteOrder byteOrder, uint32_t offset);
//! Virtual destructor.
virtual ~TiffHeaderBase() = default;
TiffHeaderBase(const TiffHeaderBase&) = delete;
TiffHeaderBase& operator=(const TiffHeaderBase&) = delete;
//@}

//! @name Manipulators
Expand Down Expand Up @@ -139,7 +141,7 @@ class TiffHeader : public TiffHeaderBase {
using TiffGroupKey = std::pair<uint32_t, IfdId>;

struct TiffGroupKey_hash {
std::size_t operator()(const TiffGroupKey& pair) const noexcept {
std::size_t operator()(TiffGroupKey pair) const noexcept {
return std::hash<uint64_t>{}(static_cast<uint64_t>(pair.first) << 32 | static_cast<uint64_t>(pair.second));
}
};
Expand Down
3 changes: 3 additions & 0 deletions src/tiffvisitor_int.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ class TiffVisitor {
public:
//! @name Creators
//@{
TiffVisitor() = default;
//! Virtual destructor
virtual ~TiffVisitor() = default;
TiffVisitor(const TiffVisitor&) = delete;
TiffVisitor& operator=(const TiffVisitor&) = delete;
//@}

//! @name Manipulators
Expand Down
18 changes: 9 additions & 9 deletions src/xmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,16 @@ class FindXmpdatum {

#ifdef EXV_HAVE_XMP_TOOLKIT
//! Convert XMP Toolkit struct option bit to Value::XmpStruct
Exiv2::XmpValue::XmpStruct xmpStruct(const XMP_OptionBits& opt);
Exiv2::XmpValue::XmpStruct xmpStruct(XMP_OptionBits opt);

//! Convert Value::XmpStruct to XMP Toolkit array option bits
XMP_OptionBits xmpArrayOptionBits(Exiv2::XmpValue::XmpStruct xs);

//! Convert XMP Toolkit array option bits to array TypeId
Exiv2::TypeId arrayValueTypeId(const XMP_OptionBits& opt);
Exiv2::TypeId arrayValueTypeId(XMP_OptionBits opt);

//! Convert XMP Toolkit array option bits to Value::XmpArrayType
Exiv2::XmpValue::XmpArrayType xmpArrayType(const XMP_OptionBits& opt);
Exiv2::XmpValue::XmpArrayType xmpArrayType(XMP_OptionBits opt);

//! Convert Value::XmpArrayType to XMP Toolkit array option bits
XMP_OptionBits xmpArrayOptionBits(Exiv2::XmpValue::XmpArrayType xat);
Expand All @@ -225,7 +225,7 @@ XMP_OptionBits xmpFormatOptionBits(Exiv2::XmpParser::XmpFormatFlags flags);

//! Print information about a parsed XMP node
void printNode(const std::string& schemaNs, const std::string& propPath, const std::string& propValue,
const XMP_OptionBits& opt);
XMP_OptionBits opt);

//! Make an XMP key from a schema namespace and property path
Exiv2::XmpKey::UniquePtr makeXmpKey(const std::string& schemaNs, const std::string& propPath);
Expand Down Expand Up @@ -904,7 +904,7 @@ int XmpParser::encode(std::string& /*xmpPacket*/, const XmpData& xmpData, uint16
// local definitions
namespace {
#ifdef EXV_HAVE_XMP_TOOLKIT
Exiv2::XmpValue::XmpStruct xmpStruct(const XMP_OptionBits& opt) {
Exiv2::XmpValue::XmpStruct xmpStruct(XMP_OptionBits opt) {
Exiv2::XmpValue::XmpStruct var(Exiv2::XmpValue::xsNone);
if (XMP_PropIsStruct(opt)) {
var = Exiv2::XmpValue::xsStruct;
Expand All @@ -924,7 +924,7 @@ XMP_OptionBits xmpArrayOptionBits(Exiv2::XmpValue::XmpStruct xs) {
return var;
}

Exiv2::TypeId arrayValueTypeId(const XMP_OptionBits& opt) {
Exiv2::TypeId arrayValueTypeId(XMP_OptionBits opt) {
Exiv2::TypeId typeId(Exiv2::invalidTypeId);
if (XMP_PropIsArray(opt)) {
if (XMP_ArrayIsAlternate(opt))
Expand All @@ -937,7 +937,7 @@ Exiv2::TypeId arrayValueTypeId(const XMP_OptionBits& opt) {
return typeId;
}

Exiv2::XmpValue::XmpArrayType xmpArrayType(const XMP_OptionBits& opt) {
Exiv2::XmpValue::XmpArrayType xmpArrayType(XMP_OptionBits opt) {
return Exiv2::XmpValue::xmpArrayType(arrayValueTypeId(opt));
}

Expand Down Expand Up @@ -986,7 +986,7 @@ XMP_OptionBits xmpFormatOptionBits(Exiv2::XmpParser::XmpFormatFlags flags) {

#ifdef EXIV2_DEBUG_MESSAGES
void printNode(const std::string& schemaNs, const std::string& propPath, const std::string& propValue,
const XMP_OptionBits& opt) {
XMP_OptionBits opt) {
static bool first = true;
if (first) {
first = false;
Expand Down Expand Up @@ -1041,7 +1041,7 @@ void printNode(const std::string& schemaNs, const std::string& propPath, const s
std::cout << '\n';
}
#else
void printNode(const std::string&, const std::string&, const std::string&, const XMP_OptionBits&) {
void printNode(const std::string&, const std::string&, const std::string&, XMP_OptionBits) {
}
#endif // EXIV2_DEBUG_MESSAGES

Expand Down