From: Richard Kimberly Heck Date: Fri, 28 Feb 2020 05:26:31 +0000 (-0500) Subject: Apparently, "requires" is a keyword in C++2a. X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=292fc72803f3f29c9438867d562d5bbffd952c4b;p=features.git Apparently, "requires" is a keyword in C++2a. --- diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 29a118147a..1155bc642f 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1497,7 +1497,7 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const void BufferParams::validate(LaTeXFeatures & features) const { - features.require(documentClass().requires()); + features.require(documentClass().required()); if (columns > 1 && language->rightToLeft()) features.require("rtloutputdblcol"); @@ -2496,8 +2496,8 @@ LayoutFile const * BufferParams::baseClass() const { if (LayoutFileList::get().haveClass(pimpl_->baseClass_)) return &(LayoutFileList::get()[pimpl_->baseClass_]); - else - return 0; + + return nullptr; } diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index fd16b28035..ced53bfe42 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -717,7 +717,7 @@ void LaTeXFeatures::useLayout(docstring const & layoutname, int level) return; Layout const & layout = tclass[layoutname]; - require(layout.requires()); + require(layout.required()); if (!layout.depends_on().empty()) { useLayout(layout.depends_on(), level + 1); @@ -744,7 +744,7 @@ void LaTeXFeatures::useInsetLayout(InsetLayout const & lay) != usedInsetLayouts_.end()) return; - require(lay.requires()); + require(lay.required()); usedInsetLayouts_.push_back(lname); } diff --git a/src/Layout.h b/src/Layout.h index 53fb682a6e..c8f7c95ad0 100644 --- a/src/Layout.h +++ b/src/Layout.h @@ -153,7 +153,7 @@ public: /// this layout for language \p lang docstring const babelpreamble() const { return babelpreamble_; } /// - std::set const & requires() const { return requires_; } + std::set const & required() const { return requires_; } /// std::set const & autonests() const { return autonests_; } /// diff --git a/src/TextClass.h b/src/TextClass.h index 3d06345636..64fa9aa127 100644 --- a/src/TextClass.h +++ b/src/TextClass.h @@ -490,7 +490,7 @@ public: /// is this feature already provided by the class? bool provides(std::string const & p) const; /// features required by the class? - std::set const & requires() const { return requires_; } + std::set const & required() const { return requires_; } /// package options to write to LaTeX file std::map const & packageOptions() const { return package_options_; } diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h index 3db9ad1679..8f3099438a 100644 --- a/src/insets/InsetLayout.h +++ b/src/insets/InsetLayout.h @@ -149,7 +149,7 @@ public: /// Defaults to true. bool htmlisblock() const { return htmlisblock_; } /// - std::set requires() const { return requires_; } + std::set required() const { return requires_; } /// bool isMultiPar() const { return multipar_; } /// diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index edcba48578..667fad76b6 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -371,13 +371,13 @@ bool checkModule(string const & name, bool command) if (layout) { found_style = true; dpre = layout->preamble(); - std::set lreqs = layout->requires(); + std::set lreqs = layout->required(); if (!lreqs.empty()) cmd_reqs.insert(lreqs.begin(), lreqs.end()); } else if (insetlayout) { found_style = true; dpre = insetlayout->preamble(); - std::set lreqs = insetlayout->requires(); + std::set lreqs = insetlayout->required(); if (!lreqs.empty()) cmd_reqs.insert(lreqs.begin(), lreqs.end()); } @@ -386,7 +386,7 @@ bool checkModule(string const & name, bool command) bool const package_cmd = dpre.empty(); bool match_req = false; if (package_cmd) { - std::set mreqs = it->second->requires(); + std::set mreqs = it->second->required(); if (!mreqs.empty()) cmd_reqs.insert(mreqs.begin(), mreqs.end()); for (auto const & pack : cmd_reqs) { diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index 0972599057..f9201cd1a2 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -2355,7 +2355,7 @@ void parse_environment(Parser & p, ostream & os, bool outer, p.skip_spaces(); if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); - set const & req = newlayout->requires(); + set const & req = newlayout->required(); set::const_iterator it = req.begin(); set::const_iterator en = req.end(); for (; it != en; ++it) @@ -3533,7 +3533,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, parse_text_snippet(p, os, FLAG_ITEM, outer, context); if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); - set const & req = newlayout->requires(); + set const & req = newlayout->required(); set::const_iterator it = req.begin(); set::const_iterator en = req.end(); for (; it != en; ++it) @@ -3559,7 +3559,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, p.skip_spaces(); if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); - set const & req = newlayout->requires(); + set const & req = newlayout->required(); for (set::const_iterator it = req.begin(); it != req.end(); ++it) preamble.registerAutomaticallyLoadedPackage(*it); continue; @@ -3576,7 +3576,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, p.skip_spaces(); if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); - set const & req = newlayout->requires(); + set const & req = newlayout->required(); for (set::const_iterator it = req.begin(); it != req.end(); ++it) preamble.registerAutomaticallyLoadedPackage(*it); continue; @@ -3590,7 +3590,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, p.skip_spaces(); if (!preamble.titleLayoutFound()) preamble.titleLayoutFound(newlayout->intitle); - set const & req = newlayout->requires(); + set const & req = newlayout->required(); for (set::const_iterator it = req.begin(); it != req.end(); ++it) preamble.registerAutomaticallyLoadedPackage(*it); continue;