aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/SourceParagraph.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-03 14:34:52 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-03 14:37:10 -0700
commit5b60e134665cdb33bd1f01f17e61c5b9ba4ad137 (patch)
treee90f5e64d85b6fe204449d3b7677d9d40a61ba3d /toolsrc/src/SourceParagraph.cpp
parentf67609acf1ebe1b4ce53e4128eee67e9fa13612c (diff)
downloadvcpkg-5b60e134665cdb33bd1f01f17e61c5b9ba4ad137.tar.gz
vcpkg-5b60e134665cdb33bd1f01f17e61c5b9ba4ad137.zip
[SourceParagraph] Consistency rename
Diffstat (limited to 'toolsrc/src/SourceParagraph.cpp')
-rw-r--r--toolsrc/src/SourceParagraph.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp
index c870bde21..34d2a8170 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/SourceParagraph.cpp
@@ -10,26 +10,26 @@ namespace vcpkg
static const std::string VERSION = "Version";
}
- namespace SourceParagraphOptionalEntry
+ namespace SourceParagraphOptionalField
{
static const std::string DESCRIPTION = "Description";
static const std::string MAINTAINER = "Maintainer";
static const std::string BUILD_DEPENDS = "Build-Depends";
}
- const std::vector<std::string>& SourceParagraph::get_list_of_valid_entries()
+ const std::vector<std::string>& SourceParagraph::get_list_of_valid_fields()
{
- static const std::vector<std::string> valid_enties =
+ static const std::vector<std::string> valid_fields =
{
SourceParagraphRequiredField::SOURCE,
SourceParagraphRequiredField::VERSION,
- SourceParagraphOptionalEntry::DESCRIPTION,
- SourceParagraphOptionalEntry::MAINTAINER,
- SourceParagraphOptionalEntry::BUILD_DEPENDS
+ SourceParagraphOptionalField::DESCRIPTION,
+ SourceParagraphOptionalField::MAINTAINER,
+ SourceParagraphOptionalField::BUILD_DEPENDS
};
- return valid_enties;
+ return valid_fields;
}
SourceParagraph::SourceParagraph() = default;
@@ -39,10 +39,10 @@ namespace vcpkg
using namespace vcpkg::details;
this->name = remove_required_field(&fields, SourceParagraphRequiredField::SOURCE);
this->version = remove_required_field(&fields, SourceParagraphRequiredField::VERSION);
- this->description = remove_optional_field(&fields, SourceParagraphOptionalEntry::DESCRIPTION);
- this->maintainer = remove_optional_field(&fields, SourceParagraphOptionalEntry::MAINTAINER);
+ this->description = remove_optional_field(&fields, SourceParagraphOptionalField::DESCRIPTION);
+ this->maintainer = remove_optional_field(&fields, SourceParagraphOptionalField::MAINTAINER);
- std::string deps = remove_optional_field(&fields, SourceParagraphOptionalEntry::BUILD_DEPENDS);
+ std::string deps = remove_optional_field(&fields, SourceParagraphOptionalField::BUILD_DEPENDS);
this->depends = parse_depends(deps);
this->unparsed_fields = std::move(fields);