anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disambiguate function name

Browse Source
This commit is contained in:
Juergen Spitzmueller 2018-05-27 09:56:45 +02:00
parent f5732bef83
commit a4c416a03d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TextClass.cpp
View File

@ -1036,7 +1036,7 @@ void TextClass::readClassOptions(Lexer & lexrc)
} }
vector<CitationStyle> const & TextClass::citeStyles( vector<CitationStyle> const & TextClass::getCiteStyles(
CiteEngineType const & type) const CiteEngineType const & type) const
{ {
static vector<CitationStyle> empty; static vector<CitationStyle> empty;
@ -1056,7 +1056,7 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
else if (type & ENGINE_TYPE_NUMERICAL) else if (type & ENGINE_TYPE_NUMERICAL)
cetype = ENGINE_TYPE_NUMERICAL; cetype = ENGINE_TYPE_NUMERICAL;
if (rt == CITE_ENGINE && !citeStyles(cetype).empty()) if (rt == CITE_ENGINE && !getCiteStyles(cetype).empty())
// The cite engines are not supposed to overwrite // The cite engines are not supposed to overwrite
// CiteStyle defined by the class or a module. // CiteStyle defined by the class or a module.
return true; return true;
@ -1163,7 +1163,7 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
} }
// Stop here if we do AddToCiteEngine, // Stop here if we do AddToCiteEngine,
// except if we have already a style to add something to // except if we have already a style to add something to
if (add && citeStyles(cetype).empty()) if (add && getCiteStyles(cetype).empty())
return getout; return getout;
// Add the styles from AddToCiteEngine to the class' styles // Add the styles from AddToCiteEngine to the class' styles
@ -1175,7 +1175,7 @@ bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add)
for (auto const ciss : cis.second) { for (auto const ciss : cis.second) {
bool defined = false; bool defined = false;
// Check if the style "name" is already def'ed // Check if the style "name" is already def'ed
for (auto const av : citeStyles(cis.first)) for (auto const av : getCiteStyles(cis.first))
if (av.name == ciss.name) if (av.name == ciss.name)
defined = true; defined = true;
if (!defined) if (!defined)

2
src/TextClass.h
View File

@ -382,7 +382,7 @@ private:
/// ///
bool readFloat(Lexer &); bool readFloat(Lexer &);
/// ///
std::vector<CitationStyle> const & citeStyles(CiteEngineType const &) const; std::vector<CitationStyle> const & getCiteStyles(CiteEngineType const &) const;
/// ///
bool readCiteEngine(Lexer &, ReadType, bool const add = false); bool readCiteEngine(Lexer &, ReadType, bool const add = false);
/// ///