From 10476b2264e281820beaa993262849c37bd89e7d Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Thu, 14 Feb 2008 05:28:59 +0000
Subject: [PATCH] Protect our data.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22995 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BiblioInfo.cpp         |  8 ++++----
 src/BiblioInfo.h           | 11 ++++++++---
 src/insets/InsetBibtex.cpp |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 1f76e55af3..cd30909052 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -232,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 = fieldNames_.begin();
+	set<docstring>::const_iterator end = fieldNames_.end();
 	for (; it != end; ++it)
 		bibfields.push_back(*it);
 	sort(bibfields.begin(), bibfields.end());
@@ -244,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 = entryTypes_.begin();
+	set<docstring>::const_iterator end = entryTypes_.end();
 	for (; it != end; ++it)
 		bibentries.push_back(*it);
 	sort(bibentries.begin(), bibentries.end());
diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 837681fa38..25d86616fc 100644
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -192,11 +192,16 @@ public:
 	///
 	BibTeXInfo & operator[](docstring const & f) { return bimap_[f]; }
 	///
-	std::set<docstring> fieldNames;
+	void addFieldName(docstring const & f) { fieldNames_.insert(f); }
 	///
-	std::set<docstring> entryTypes;
+	void addEntryType(docstring const & f) { entryTypes_.insert(f); }
 private:
-	 std::map<docstring, BibTeXInfo> bimap_;
+	///
+	std::set<docstring> fieldNames_;
+	///
+	std::set<docstring> entryTypes_;
+	/// our map: keys --> BibTeXInfo
+	std::map<docstring, BibTeXInfo> bimap_;
 };
 
 } // namespace lyx
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 7d017204ce..999781b26b 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -766,12 +766,12 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
 
 					keyvalmap[name] = value;
 					data += "\n\n" + value;
-					keylist.fieldNames.insert(name);
+					keylist.addFieldName(name);
 					readNext = removeWSAndComma(ifs);
 				}
 
 				// add the new entry
-				keylist.entryTypes.insert(entryType);
+				keylist.addEntryType(entryType);
 				keyvalmap.allData(data);
 				keylist[key] = keyvalmap;
 			}
-- 
2.39.5