[EMAIL PROTECTED] wrote:
Author: rgheck
Date: Thu Feb 14 06:00:54 2008
New Revision: 22993
URL: http://www.lyx.org/trac/changeset/22993
Log:
Do not inherit from std::map.
code rules comments below.
Modified: lyx-devel/trunk/src/BiblioInfo.h
> + ///
> + docstring allData() const { return allData_; }
docstring const & allData() const { return allData_; }
> + ///
> + void allData(docstring const & d) { allData_ = d; }
void setAllData(docstring const & d) { allData_ = d; }
+private:
/// the BibTeX key for this entry
- docstring bibKey;
+ docstring bibKey_;
bib_key_
/// a single string containing all BibTeX data associated with this key
- docstring allData;
+ docstring allData_;
all_data_
/// the BibTeX entry type (article, book, incollection, ...)
- docstring entryType;
+ docstring entryType_;
entry_type_
/// true if from BibTeX; false if from bibliography environment
- bool isBibTeX;
+ bool isBibTeX_;
is_bibtex_
+ /// our map: <field, value>
+ std::map <docstring, docstring> bimap_;
container_ ?
Modified: lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp?rev=22993
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp (original)
+++ lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp Thu Feb 14 06:00:54 2008
@@ -641,7 +641,7 @@
BiblioInfo::const_iterator cit = bibkeysInfo_.find(key);
if (cit == bibkeysInfo_.end())
continue;
- if (cit->second.entryType == entryType)
+ if (cit->second.entryType() == entryType)
if 'entryType' is a local variable then 'entry_type'.
Modified: lyx-devel/trunk/src/insets/InsetBibitem.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/InsetBibitem.cpp?rev=22993
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBibitem.cpp (original)
+++ lyx-devel/trunk/src/insets/InsetBibitem.cpp Thu Feb 14 06:00:54 2008
@@ -198,12 +198,11 @@
BiblioInfo & keys, InsetIterator const & it) const
{
docstring const key = getParam("key");
- BibTeXInfo keyvalmap;
+ BibTeXInfo keyvalmap(false);
BibTeXInfo keyvalmap = false;
