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

Adapt to tagparser v7

This commit is contained in:
Martchus 2017-03-07 17:12:43 +01:00
parent c6fd3bb2e0
commit 254b9b7661
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -217,7 +217,7 @@ if(WIDGETS_GUI OR QUICK_GUI)
endif()
# find tagparser
find_package(tagparser 6.4.0 REQUIRED)
find_package(tagparser 7.0.0 REQUIRED)
use_tag_parser()
list(APPEND TEST_LIBRARIES ${TAG_PARSER_SHARED_LIB})

4
cli/helper.cpp
View File

@ -554,7 +554,7 @@ std::vector<const TagValue *> valuesForNativeField(const char *idString, std::si
if(tagType != ConcreteTag::tagType) {
return vector<const TagValue *>();
}
return static_cast<const ConcreteTag *>(tag)->values(ConcreteTag::fieldType::fieldIdFromString(idString, idStringSize));
return static_cast<const ConcreteTag *>(tag)->values(ConcreteTag::FieldType::fieldIdFromString(idString, idStringSize));
}
template<class ConcreteTag>
@ -563,7 +563,7 @@ bool setValuesForNativeField(const char *idString, std::size_t idStringSize, Tag
if(tagType != ConcreteTag::tagType) {
return false;
}
return static_cast<ConcreteTag *>(tag)->setValues(ConcreteTag::fieldType::fieldIdFromString(idString, idStringSize), values);
return static_cast<ConcreteTag *>(tag)->setValues(ConcreteTag::FieldType::fieldIdFromString(idString, idStringSize), values);
}
inline FieldId::FieldId(const char *nativeField, std::size_t nativeFieldSize, const GetValuesForNativeFieldType &valuesForNativeField, const SetValuesForNativeFieldType &setValuesForNativeField) :

8
gui/picturepreviewselection.cpp
View File

@ -95,9 +95,9 @@ void PicturePreviewSelection::setValue(const TagValue &value, PreviousValueHandl
* \brief Defines the predicate to get relevant fields.
*/
template<class TagType>
bool fieldPredicate(int i, const std::pair<typename TagType::fieldType::identifierType, typename TagType::fieldType> &pair)
bool fieldPredicate(int i, const std::pair<typename TagType::IdentifierType, typename TagType::FieldType> &pair)
{
return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == static_cast<unsigned int>(i)) : (i == 0);
return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == static_cast<typename TagType::FieldType::TypeInfoType>(i)) : (i == 0);
}
/*!
@ -251,8 +251,8 @@ void pushId3v2CoverValues(TagType *tag, KnownField field, const QList<Media::Tag
pair->second.setValue(TagValue());
}
} else if(!values[index].isEmpty()) {
typename TagType::fieldType field(id, values[index]);
field.setTypeInfo(static_cast<decltype(field.typeInfo())>(index));
typename TagType::FieldType field(id, values[index]);
field.setTypeInfo(index);
fields.insert(std::make_pair(id, field));
}
}

2
misc/htmlinfo.cpp
View File

@ -804,7 +804,7 @@ public:
{
mkElementNode(container->firstElement());
for(auto &element : container->additionalElements()) {
mkElementNode<typename ContainerType::elementType, true>(element.get());
mkElementNode<typename ContainerType::ContainerElementType, true>(element.get());
}
}