Skip to content
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

Jump to bottom

clang-tidy: use default member init #1698

Merged
merged 1 commit into from
Jun 10, 2021
Merged

clang-tidy: use default member init #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 21 additions & 26 deletions include/exiv2/value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,10 +992,10 @@ namespace Exiv2 {

//! Simple Date helper structure
struct EXIV2API Date {
Date() : year(0), month(0), day(0) {}
int year; //!< Year
int month; //!< Month
int day; //!< Day
Date() = default;
int year{0}; //!< Year
int month{0}; //!< Month
int day{0}; //!< Day
};

//! @name Manipulators
Expand Down Expand Up @@ -1096,13 +1096,13 @@ namespace Exiv2 {
//! Simple Time helper structure
struct Time
{
Time() : hour(0), minute(0), second(0), tzHour(0), tzMinute(0) {}
Time() = default;

int hour; //!< Hour
int minute; //!< Minute
int second; //!< Second
int tzHour; //!< Hours ahead or behind UTC
int tzMinute; //!< Minutes ahead or behind UTC
int hour{0}; //!< Hour
int minute{0}; //!< Minute
int second{0}; //!< Second
int tzHour{0}; //!< Hours ahead or behind UTC
int tzMinute{0}; //!< Minutes ahead or behind UTC
};

//! @name Manipulators
Expand Down Expand Up @@ -1321,9 +1321,9 @@ namespace Exiv2 {

// DATA
//! Pointer to the buffer, nullptr if none has been allocated
byte* pDataArea_;
byte* pDataArea_{nullptr};
//! The current size of the buffer
long sizeDataArea_;
long sizeDataArea_{0};
}; // class ValueType

//! Unsigned short value type
Expand Down Expand Up @@ -1493,28 +1493,24 @@ namespace Exiv2 {
return d2Data(buf, t, byteOrder);
}

template<typename T>
ValueType<T>::ValueType()
: Value(getType<T>()), pDataArea_(nullptr), sizeDataArea_(0)
template <typename T>
ValueType<T>::ValueType() : Value(getType<T>())
{
}

template<typename T>
ValueType<T>::ValueType(TypeId typeId)
: Value(typeId), pDataArea_(nullptr), sizeDataArea_(0)
template <typename T>
ValueType<T>::ValueType(TypeId typeId) : Value(typeId)
{
}

template<typename T>
ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId)
: Value(typeId), pDataArea_(nullptr), sizeDataArea_(0)
template <typename T>
ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId) : Value(typeId)
{
read(buf, len, byteOrder);
}

template<typename T>
ValueType<T>::ValueType(const T& val, TypeId typeId)
: Value(typeId), pDataArea_(nullptr), sizeDataArea_(0)
template <typename T>
ValueType<T>::ValueType(const T& val, TypeId typeId) : Value(typeId)
{
value_.push_back(val);
}
Expand All @@ -1523,8 +1519,7 @@ namespace Exiv2 {
ValueType<T>::ValueType(const ValueType<T>& rhs)
: Value(rhs.typeId())
, value_(rhs.value_)
, pDataArea_(nullptr)
, sizeDataArea_(0)

{
if (rhs.sizeDataArea_ > 0) {
pDataArea_ = new byte[rhs.sizeDataArea_];
Expand Down
4 changes: 2 additions & 2 deletions include/exiv2/xmp_exiv2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ namespace Exiv2 {
class EXIV2API XmpData {
public:
//! Default constructor
XmpData() : xmpMetadata_(), xmpPacket_(), usePacket_(0) {}
XmpData() = default;

//! XmpMetadata iterator type
typedef XmpMetadata::iterator iterator;
Expand Down Expand Up @@ -257,7 +257,7 @@ namespace Exiv2 {
// DATA
XmpMetadata xmpMetadata_;
std::string xmpPacket_ ;
bool usePacket_ ;
bool usePacket_{0};
}; // class XmpData

/*!
Expand Down