From d434c4e299e9a8a659c88ef0d0a18c2bb968de49 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 11 Jul 2018 12:24:45 +0200 Subject: [PATCH] Remove legacy API --- CMakeLists.txt | 1 - mp4/mp4tag.cpp | 16 ---------------- mp4/mp4tag.h | 6 ------ 3 files changed, 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2278ca..dc7299e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,6 @@ set(META_VERSION_MINOR 0) set(META_VERSION_PATCH 0) set(META_PUBLIC_SHARED_LIB_DEPENDS c++utilities) set(META_PUBLIC_STATIC_LIB_DEPENDS c++utilities_static) -set(META_PRIVATE_COMPILE_DEFINITIONS LEGACY_API) set(META_REQUIRED_CPP_UNIT_VERSION 1.14.0) # find c++utilities diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp index 5723491..51613cb 100644 --- a/mp4/mp4tag.cpp +++ b/mp4/mp4tag.cpp @@ -114,14 +114,6 @@ const TagValue &Mp4Tag::value(const char *mean, const char *name) const return TagValue::empty(); } -/*! - * \brief Returns the value of the field with the specified \a mean and \a name attributes. - */ -const TagValue &Mp4Tag::value(const string mean, const string name) const -{ - return (this->*static_cast(&Mp4Tag::value))(mean, name); -} - Mp4Tag::IdentifierType Mp4Tag::internallyGetFieldId(KnownField field) const { using namespace Mp4TagAtomIds; @@ -291,14 +283,6 @@ bool Mp4Tag::setValue(const char *mean, const char *name, const TagValue &value) return true; } -/*! - * \brief Assigns the given \a value to the field with the specified \a mean and \a name attributes. - */ -bool Mp4Tag::setValue(const string mean, const string name, const TagValue &value) -{ - return (this->*static_cast(&Mp4Tag::setValue))(mean, name, value); -} - bool Mp4Tag::hasField(KnownField field) const { switch (field) { diff --git a/mp4/mp4tag.h b/mp4/mp4tag.h index 63337c4..bf4e395 100644 --- a/mp4/mp4tag.h +++ b/mp4/mp4tag.h @@ -110,18 +110,12 @@ public: const TagValue &value(KnownField value) const override; using FieldMapBasedTag::values; std::vector values(KnownField field) const override; -#ifdef LEGACY_API - const TagValue &value(const std::string mean, const std::string name) const; -#endif const TagValue &value(const std::string &mean, const std::string &name) const; const TagValue &value(const char *mean, const char *name) const; using FieldMapBasedTag::setValue; bool setValue(KnownField field, const TagValue &value) override; using FieldMapBasedTag::setValues; bool setValues(KnownField field, const std::vector &values) override; -#ifdef LEGACY_API - bool setValue(const std::string mean, const std::string name, const TagValue &value); -#endif bool setValue(const std::string &mean, const std::string &name, const TagValue &value); bool setValue(const char *mean, const char *name, const TagValue &value); using FieldMapBasedTag::hasField;