Renamed from 'help' to 'description' for ParserKeyword and ParserItem

This commit is contained in:
Atle Haugan
2014-01-10 10:57:35 +01:00
parent 308cfda3c5
commit ddd4563f97
8 changed files with 48 additions and 47 deletions

View File

@@ -43,7 +43,7 @@ namespace Opm {
m_action = action;
m_record = ParserRecordPtr(new ParserRecord);
m_keywordSizeType = sizeType;
m_helpText = "";
m_Description = "";
}
ParserKeyword::ParserKeyword(const std::string& name, ParserKeywordSizeEnum sizeType, ParserKeywordActionEnum action) {
@@ -79,12 +79,12 @@ namespace Opm {
return m_isTableCollection;
}
std::string ParserKeyword::getHelpText() const {
return m_helpText;
std::string ParserKeyword::getDescription() const {
return m_Description;
}
void ParserKeyword::setHelpText(const std::string& helpText) {
m_helpText = helpText;
void ParserKeyword::setDescription(const std::string& description) {
m_Description = description;
}
void ParserKeyword::initSize(const Json::JsonObject& jsonConfig) {
@@ -141,8 +141,8 @@ namespace Opm {
if (jsonConfig.has_item("data"))
initData(jsonConfig);
if (jsonConfig.has_item("help")) {
m_helpText = jsonConfig.get_string("help");
if (jsonConfig.has_item("description")) {
m_Description = jsonConfig.get_string("description");
}
if ((m_fixedSize == 0 && m_keywordSizeType == FIXED) || (m_action != INTERNALIZE))
@@ -446,7 +446,7 @@ namespace Opm {
break;
}
}
os << indent << lhs << "->setHelpText(\"" << m_helpText << "\");" << std::endl;
os << indent << lhs << "->setDescription(\"" << getDescription() << "\");" << std::endl;
for (size_t i = 0; i < m_record->size(); i++) {
os << indent << "{" << std::endl;
@@ -456,7 +456,7 @@ namespace Opm {
os << local_indent << "ParserItemPtr item(";
item->inlineNew(os);
os << ");" << std::endl;
os << local_indent << "item->setHelpText(\"" << item->getHelpText() << "\");" << std::endl;
os << local_indent << "item->setDescription(\"" << item->getDescription() << "\");" << std::endl;
for (size_t idim=0; idim < item->numDimensions(); idim++)
os << local_indent << "item->push_backDimension(\"" << item->getDimension( idim ) << "\");" << std::endl;
{