Revert 23154.

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 9f00a3753d53fbe3b9b5d80b7914dd69b1ce0737..2c21aa9d4492926cb6f291b2415d5680f2900396 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -42,8 +42,13 @@ namespace lyx {
 //
 //////////////////////////////////////////////////////////////////////
 
-BibTeXInfo::BibTeXInfo()
-       : isBibTeX(true)
+BibTeXInfo::BibTeXInfo(bool ib)
+       : is_bibtex_(ib)
+{}
+
+       
+BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type)
+       : is_bibtex_(true), bib_key_(key), entry_type_(type)
 {}
 
        
@@ -97,7 +102,7 @@ static docstring familyName(docstring const & name)
 
 docstring const BibTeXInfo::getAbbreviatedAuthor() const
 {
-       if (!isBibTeX) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring author = getValueForField("author");
@@ -105,7 +110,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
        if (author.empty()) {
                author = getValueForField("editor");
                if (author.empty())
-                       return bibKey;
+                       return bib_key_;
        }
 
        // OK, we've got some names. Let's format them.
@@ -126,7 +131,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
 
 docstring const BibTeXInfo::getYear() const
 {
-       if (!isBibTeX) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring year = getValueForField("year");
@@ -138,7 +143,7 @@ docstring const BibTeXInfo::getYear() const
 
 docstring const BibTeXInfo::getInfo() const
 {
-       if (!isBibTeX) {
+       if (!is_bibtex_) {
                BibTeXInfo::const_iterator it = find(from_ascii("ref"));
                return it->second;
        }
@@ -227,8 +232,8 @@ vector<docstring> const BiblioInfo::getKeys() const
 vector<docstring> const BiblioInfo::getFields() const
 {
        vector<docstring> bibfields;
-       set<docstring>::const_iterator it = fieldNames.begin();
-       set<docstring>::const_iterator end = fieldNames.end();
+       set<docstring>::const_iterator it = field_names_.begin();
+       set<docstring>::const_iterator end = field_names_.end();
        for (; it != end; ++it)
                bibfields.push_back(*it);
        sort(bibfields.begin(), bibfields.end());
@@ -239,8 +244,8 @@ vector<docstring> const BiblioInfo::getFields() const
 vector<docstring> const BiblioInfo::getEntries() const
 {
        vector<docstring> bibentries;
-       set<docstring>::const_iterator it = entryTypes.begin();
-       set<docstring>::const_iterator end = entryTypes.end();
+       set<docstring>::const_iterator it = entry_types_.begin();
+       set<docstring>::const_iterator end = entry_types_.end();
        for (; it != end; ++it)
                bibentries.push_back(*it);
        sort(bibentries.begin(), bibentries.end());