Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make many constructors explicit to avoid unintended implicit conversions

This commit is contained in:
Martchus 2020-12-05 20:48:57 +01:00
parent ed37b6c5e5
commit aa23750307
12 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -8,8 +8,8 @@ set(META_APP_NAME "Tag Parser")
set(META_APP_AUTHOR "Martchus")
set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
set(META_APP_DESCRIPTION "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags")
set(META_VERSION_MAJOR 9)
set(META_VERSION_MINOR 4)
set(META_VERSION_MAJOR 10)
set(META_VERSION_MINOR 0)
set(META_VERSION_PATCH 0)
set(META_REQUIRED_CPP_UNIT_VERSION 1.14.0)
set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON)

6
aspectratio.h
View File

@ -11,9 +11,9 @@
namespace TagParser {
struct TAG_PARSER_EXPORT AspectRatio {
constexpr AspectRatio();
AspectRatio(std::uint8_t aspectRatioType);
constexpr AspectRatio(std::uint16_t numerator, std::uint16_t denominator);
constexpr explicit AspectRatio();
explicit AspectRatio(std::uint8_t aspectRatioType);
constexpr explicit AspectRatio(std::uint16_t numerator, std::uint16_t denominator);
constexpr bool isValid() const;
constexpr bool isExtended() const;
std::string toString() const;

2
basicfileinfo.h
View File

@ -14,7 +14,7 @@ namespace TagParser {
class TAG_PARSER_EXPORT BasicFileInfo {
public:
// constructor, destructor
BasicFileInfo(const std::string &path = std::string());
explicit BasicFileInfo(const std::string &path = std::string());
BasicFileInfo(const BasicFileInfo &) = delete;
BasicFileInfo &operator=(const BasicFileInfo &) = delete;
virtual ~BasicFileInfo();

4
id3/id3v1tag.cpp
View File

@ -237,8 +237,8 @@ void Id3v1Tag::removeAllFields()
unsigned int Id3v1Tag::fieldCount() const
{
unsigned int count = 0;
for (const auto &value : { m_title, m_artist, m_album, m_year, m_comment, m_trackPos, m_genre }) {
if (!value.isEmpty()) {
for (const auto &value : std::initializer_list<const TagValue *>{ &m_title, &m_artist, &m_album, &m_year, &m_comment, &m_trackPos, &m_genre }) {
if (!value->isEmpty()) {
++count;
}
}

4
id3/id3v2tag.cpp
View File

@ -404,11 +404,11 @@ void Id3v2Tag::convertOldRecordDateFields(const std::string &diagContext, Diagno
// set the field values as DateTime
try {
setValue(Id3v2FrameIds::lRecordingTime, DateTime::fromDateAndTime(year, month, day, hour, minute));
setValue(Id3v2FrameIds::lRecordingTime, TagValue(DateTime::fromDateAndTime(year, month, day, hour, minute)));
} catch (const ConversionException &e) {
try {
// try to set at least the year
setValue(Id3v2FrameIds::lRecordingTime, DateTime::fromDate(year));
setValue(Id3v2FrameIds::lRecordingTime, TagValue(DateTime::fromDate(year)));
diag.emplace_back(DiagLevel::Critical,
argsToString(
"Unable to parse the full date of the recording. Only the 'Year' frame could be parsed; related frames failed: ", e.what()),

4
localeawarestring.h
View File

@ -13,8 +13,8 @@ namespace TagParser {
*/
class TAG_PARSER_EXPORT LocaleAwareString : public std::string {
public:
LocaleAwareString(const std::string &value = std::string());
LocaleAwareString(std::string &&value);
explicit LocaleAwareString(const std::string &value = std::string());
explicit LocaleAwareString(std::string &&value);
~LocaleAwareString();
const std::vector<std::string> &languages() const;

2
margin.h
View File

@ -15,7 +15,7 @@ namespace TagParser {
*/
class TAG_PARSER_EXPORT Margin {
public:
constexpr Margin(std::uint32_t top = 0, std::uint32_t left = 0, std::uint32_t bottom = 0, std::uint32_t right = 0);
constexpr explicit Margin(std::uint32_t top = 0, std::uint32_t left = 0, std::uint32_t bottom = 0, std::uint32_t right = 0);
constexpr std::uint32_t top() const;
void setTop(std::uint32_t top);
constexpr std::uint32_t left() const;

4
mediafileinfo.h
View File

@ -45,8 +45,8 @@ enum class ParsingStatus : std::uint8_t {
class TAG_PARSER_EXPORT MediaFileInfo : public BasicFileInfo {
public:
// constructor, destructor
MediaFileInfo();
MediaFileInfo(const std::string &path);
explicit MediaFileInfo();
explicit MediaFileInfo(const std::string &path);
MediaFileInfo(const MediaFileInfo &) = delete;
MediaFileInfo &operator=(const MediaFileInfo &) = delete;
~MediaFileInfo() override;

2
positioninset.h
View File

@ -20,7 +20,7 @@ namespace TagParser {
*/
class TAG_PARSER_EXPORT PositionInSet {
public:
constexpr PositionInSet(std::int32_t position = 0, std::int32_t total = 0);
constexpr explicit PositionInSet(std::int32_t position = 0, std::int32_t total = 0);
template <typename StringType = std::string,
CppUtilities::Traits::EnableIfAny<CppUtilities::Traits::IsSpecializationOf<StringType, std::basic_string>> * = nullptr>
PositionInSet(const StringType &numericString);

4
progressfeedback.h
View File

@ -14,8 +14,8 @@ template <typename ActualProgressFeedback> class BasicProgressFeedback {
public:
using Callback = std::function<void(ActualProgressFeedback &feedback)>;
BasicProgressFeedback(const Callback &callback, const Callback &percentageOnlyCallback = Callback());
BasicProgressFeedback(Callback &&callback, Callback &&percentageOnlyCallback = Callback());
explicit BasicProgressFeedback(const Callback &callback, const Callback &percentageOnlyCallback = Callback());
explicit BasicProgressFeedback(Callback &&callback, Callback &&percentageOnlyCallback = Callback());
const std::string &step() const;
std::uint8_t stepPercentage() const;

2
tagtarget.h
View File

@ -22,7 +22,7 @@ public:
using IdType = std::uint64_t;
using IdContainerType = std::vector<IdType>;
TagTarget(std::uint64_t level = 0, IdContainerType tracks = IdContainerType(), IdContainerType chapters = IdContainerType(),
explicit TagTarget(std::uint64_t level = 0, IdContainerType tracks = IdContainerType(), IdContainerType chapters = IdContainerType(),
IdContainerType editions = IdContainerType(), IdContainerType attachments = IdContainerType());
std::uint64_t level() const;

22
tagvalue.h
View File

@ -75,19 +75,21 @@ enum class TagValueComparisionFlags : unsigned int {
class TAG_PARSER_EXPORT TagValue {
public:
// constructor, destructor
TagValue();
TagValue(const char *text, std::size_t textSize, TagTextEncoding textEncoding = TagTextEncoding::Latin1,
explicit TagValue();
explicit TagValue(const char *text, std::size_t textSize, TagTextEncoding textEncoding = TagTextEncoding::Latin1,
TagTextEncoding convertTo = TagTextEncoding::Unspecified);
TagValue(const char *text, TagTextEncoding textEncoding = TagTextEncoding::Latin1, TagTextEncoding convertTo = TagTextEncoding::Unspecified);
TagValue(
explicit TagValue(
const char *text, TagTextEncoding textEncoding = TagTextEncoding::Latin1, TagTextEncoding convertTo = TagTextEncoding::Unspecified);
explicit TagValue(
const std::string &text, TagTextEncoding textEncoding = TagTextEncoding::Latin1, TagTextEncoding convertTo = TagTextEncoding::Unspecified);
TagValue(int value);
TagValue(const char *data, std::size_t length, TagDataType type = TagDataType::Undefined, TagTextEncoding encoding = TagTextEncoding::Latin1);
TagValue(std::unique_ptr<char[]> &&data, std::size_t length, TagDataType type = TagDataType::Binary,
explicit TagValue(int value);
explicit TagValue(
const char *data, std::size_t length, TagDataType type = TagDataType::Undefined, TagTextEncoding encoding = TagTextEncoding::Latin1);
explicit TagValue(std::unique_ptr<char[]> &&data, std::size_t length, TagDataType type = TagDataType::Binary,
TagTextEncoding encoding = TagTextEncoding::Latin1);
TagValue(PositionInSet value);
TagValue(CppUtilities::DateTime value);
TagValue(CppUtilities::TimeSpan value);
explicit TagValue(PositionInSet value);
explicit TagValue(CppUtilities::DateTime value);
explicit TagValue(CppUtilities::TimeSpan value);
TagValue(const TagValue &other);
TagValue(TagValue &&other) = default;
~TagValue();