doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidying

Browse Source
This commit is contained in:
Nav
2024-02-27 21:27:41 +00:00
parent 94c20b2978
commit e75ce8b403
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Targets/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -255,6 +255,16 @@ namespace Targets::TargetDescription
this->loadPinouts(document); this->loadPinouts(document);
} }
const std::string& TargetDescriptionFile::deviceAttribute(const std::string& attributeName) const {
const auto attributeIt = this->deviceAttributesByName.find(attributeName);
if (attributeIt == this->deviceAttributesByName.end()) {
throw Exception("Missing target device attribute (\"" + attributeName + "\")");
}
return attributeIt->second;
}
std::optional<std::string> TargetDescriptionFile::tryGetAttribute( std::optional<std::string> TargetDescriptionFile::tryGetAttribute(
const QDomElement& element, const QDomElement& element,
const QString& attributeName const QString& attributeName
@@ -594,16 +604,6 @@ namespace Targets::TargetDescription
); );
} }
const std::string& TargetDescriptionFile::deviceAttribute(const std::string& attributeName) const {
const auto attributeIt = this->deviceAttributesByName.find(attributeName);
if (attributeIt == this->deviceAttributesByName.end()) {
throw Exception("Missing target device attribute (\"" + attributeName + "\")");
}
return attributeIt->second;
}
void TargetDescriptionFile::loadVariants(const QDomDocument& document) { void TargetDescriptionFile::loadVariants(const QDomDocument& document) {
const auto deviceElement = document.elementsByTagName("device").item(0).toElement(); const auto deviceElement = document.elementsByTagName("device").item(0).toElement();

10
src/Targets/TargetDescription/TargetDescriptionFile.hpp
View File

@@ -140,6 +140,8 @@ namespace Targets::TargetDescription
void init(const std::string& xmlFilePath); void init(const std::string& xmlFilePath);
void init(const QDomDocument& document); void init(const QDomDocument& document);
const std::string& deviceAttribute(const std::string& attributeName) const;
static std::optional<std::string> tryGetAttribute(const QDomElement& element, const QString& attributeName); static std::optional<std::string> tryGetAttribute(const QDomElement& element, const QString& attributeName);
static std::string getAttribute(const QDomElement& element, const QString& attributeName); static std::string getAttribute(const QDomElement& element, const QString& attributeName);
@@ -158,14 +160,6 @@ namespace Targets::TargetDescription
static RegisterGroupInstance registerGroupInstanceFromXml(const QDomElement& xmlElement); static RegisterGroupInstance registerGroupInstanceFromXml(const QDomElement& xmlElement);
static Signal signalFromXml(const QDomElement& xmlElement); static Signal signalFromXml(const QDomElement& xmlElement);
/**
* Fetches a device attribute value by name. Throws an exception if the attribute is not found.
*
* @param attributeName
* @return
*/
const std::string& deviceAttribute(const std::string& attributeName) const;
/** /**
* Extracts all variants and loads them into this->variants. * Extracts all variants and loads them into this->variants.
*/ */