Rename function

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 1292ef3303f90f3158635c7371d87c05869ff26c..d70de5d1698dafb148513a0c8f7f4ad37122d650 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -1603,7 +1603,7 @@ BiblioInfo::CiteStringMap const BiblioInfo::getCiteStrings(
        vector<CitationStyle> realStyles;
        for (size_t i = 0; i != styles.size(); ++i) {
                // exclude variants that are not supported in the current style
-               if (buf.masterParams().isActiveBiblatexCiteStyle(styles[i]))
+               if (buf.masterParams().isActiveCiteStyle(styles[i]))
                        realStyles.push_back(styles[i]);
        }
 

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index aa538e6d6113689d94d756e2719e4a498ee41db4..a5215f6fc85ef874e870836b3d34e14e13f2cd1e 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -3759,7 +3759,7 @@ string BufferParams::getCiteAlias(string const & s) const
        vector<CitationStyle> const styles = citeStyles();
        for (size_t i = 0; i != styles.size(); ++i) {
                // only include variants that are supported in the current style
-               if (styles[i].name == s && isActiveBiblatexCiteStyle(styles[i])) {
+               if (styles[i].name == s && isActiveCiteStyle(styles[i])) {
                        realcmd = true;
                        break;
                }
@@ -3796,7 +3796,7 @@ vector<CitationStyle> BufferParams::citeStyles() const
 }
 
 
-bool BufferParams::isActiveBiblatexCiteStyle(CitationStyle const & cs) const
+bool BufferParams::isActiveCiteStyle(CitationStyle const & cs) const
 {
        if (!useBiblatex())
                // outside biblatex, all cite styles are active

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 2178d65677c3f65c08ca95c66d846c02931e5dc7..9bfd16d492b13a195bc3cf9b1fba3b139323929b 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -527,8 +527,8 @@ public:
        std::vector<std::string> citeCommands() const;
        /// the available citation styles
        std::vector<CitationStyle> citeStyles() const;
-       /// is the biblatex citestyle active in the current context?
-       bool isActiveBiblatexCiteStyle(CitationStyle const & cs) const;
+       /// is the citestyle active in the current context?
+       bool isActiveCiteStyle(CitationStyle const & cs) const;
 
        /// Return the actual bibtex command (lyxrc or buffer param)
        std::string const bibtexCommand(bool const warn = false) const;

diff --git a/src/frontends/qt/GuiCitation.cpp b/src/frontends/qt/GuiCitation.cpp
index ea10d171e442309fd2c460a293411343643c1ab3..e9f9ec99373e422a2dab7e778143d6c0348a9e74 100644 (file)
--- a/src/frontends/qt/GuiCitation.cpp
+++ b/src/frontends/qt/GuiCitation.cpp
@@ -945,7 +945,7 @@ bool GuiCitation::initialiseParams(string const & sdata)
        vector<CitationStyle> const styles = documentBuffer().params().citeStyles();
        for (size_t i = 0; i != styles.size(); ++i) {
                // only include variants that are supported in the current style
-               if (documentBuffer().params().isActiveBiblatexCiteStyle(styles[i])) {
+               if (documentBuffer().params().isActiveCiteStyle(styles[i])) {
                        citeStyles_.push_back(styles[i]);
                        citeCmds_.push_back(cmds[i]);
                }

diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp
index 30575bb2eba594f4195de4a19af8461497218942..abd625509cad90195beae66c089f2a3dbec39e02 100644 (file)
--- a/src/frontends/qt/Menus.cpp
+++ b/src/frontends/qt/Menus.cpp
@@ -1750,7 +1750,7 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
                docstring label = cit->second;
                CitationStyle ccs = citeStyleList[ii - 1];
                // exclude variants that are not supported in the current style
-               while (!bp.isActiveBiblatexCiteStyle(ccs)) {
+               while (!bp.isActiveCiteStyle(ccs)) {
                        ++ii;
                        ccs = citeStyleList[ii - 1];
                }

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index bf5f3526e52a87e37233c0f48834694bc0e916b3..87130462e0e0998959969d12ccbbdca7de041dd8 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -381,7 +381,7 @@ CitationStyle asValidLatexCommand(BufferParams const & bp, string const & input,
                CitationStyle this_cs = *it;
                if (this_cs.name == normalized_input) {
                        // exclude variants that are not supported in the current style
-                       if (!bp.isActiveBiblatexCiteStyle(this_cs)) {
+                       if (!bp.isActiveCiteStyle(this_cs)) {
                                // citation not supported with current style
                                // reset to \cite
                                normalized_input = "cite";