Harmonize naming

[lyx.git] / src / BiblioInfo.h

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 254338b6e94423c98d625a6fffe9792e69ccbaff..095221da68283b72cb305749a0e4bff64bce266f 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -45,10 +45,10 @@ public:
        /// and the values are the associated field values.
        typedef std::map<docstring, docstring>::const_iterator const_iterator;
        ///
-       BibTeXInfo() : is_bibtex_(true) {}
+       BibTeXInfo() : is_bibtex_(true), modifier_(0) {}
        /// argument sets isBibTeX_, so should be false only if it's coming
        /// from a bibliography environment
-       BibTeXInfo(bool ib) : is_bibtex_(ib) {}
+       BibTeXInfo(bool ib) : is_bibtex_(ib), modifier_(0) {}
        /// constructor that sets the entryType
        BibTeXInfo(docstring const & key, docstring const & type);
        /// \return the short form of an authorlist, used for sorting
@@ -66,7 +66,7 @@ public:
                        Buffer const & buf, bool richtext) const;
        /// \return formatted BibTeX data for a citation label
        docstring const getLabel(BibTeXInfo const * const xref,
-               Buffer const & buf, std::string const & format, bool richtext,
+               Buffer const & buf, docstring const & format, bool richtext,
                docstring before, docstring after, docstring dialog, bool next = false) const;
        ///
        const_iterator find(docstring const & f) const { return bimap_.find(f); }
@@ -131,7 +131,7 @@ private:
        /// "%!key%" are substituted with their definition.
        /// moreover, keys that look like "%_key%" are treated as translatable
        /// so that things like "pp." and "vol." can be translated.
-       docstring expandFormat(std::string const & fmt,
+       docstring expandFormat(docstring const & fmt,
                BibTeXInfo const * const xref, int & counter,
                Buffer const & buf, docstring before = docstring(),
                docstring after = docstring(), docstring dialog = docstring(),