Cleanup.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22996 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 25d86616fc160bd20d0d821cd964ebb3ac3bac6f..20c0dff1586c75e52b07a143e0526c94459ae2df 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -106,9 +106,9 @@ public:
        docstring & operator[](docstring const & f) 
                { return bimap_[f]; }
        ///
-       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; }
        ///
        docstring entryType() const { return entryType_; }
 private:

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 1c6499586fa4240fa24b88da4145dde3cf85df40..5b668f0b34c337c6c8537a21869f104924be2ed5 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -376,15 +376,15 @@ void GuiCitation::findText(QString const & text, bool reset)
        //"All Entry Types" is first.
        index = entriesCO->currentIndex() - 1; 
        vector<docstring> const & entries = availableEntries();
-       docstring entryType;
+       docstring entry_type;
        if (index < 0 || index >= int(entries.size()))
-               entryType = from_ascii("");
+               entry_type = from_ascii("");
        else 
-               entryType = entries[index];
+               entry_type = entries[index];
        
        bool const case_sentitive = caseCB->checkState();
        bool const reg_exp = regexCB->checkState();
-       findKey(text, onlyKeys, field, entryType, 
+       findKey(text, onlyKeys, field, entry_type, 
                       case_sentitive, reg_exp, reset);
        //FIXME
        //It'd be nice to save and restore the current selection in 
@@ -505,7 +505,7 @@ void GuiCitation::init()
 
 
 void GuiCitation::findKey(QString const & str, bool only_keys,
-       docstring field, docstring entryType,
+       docstring field, docstring entry_type,
        bool case_sensitive, bool reg_exp, bool reset)
 {
        // Used for optimisation: store last searched string.
@@ -541,10 +541,10 @@ void GuiCitation::findKey(QString const & str, bool only_keys,
 
        QStringList result;
        
-       // First, filter by entryType, which will be faster than 
+       // First, filter by entry_type, which will be faster than 
        // what follows, so we may get to do that on less.
        vector<docstring> keyVector = to_docstring_vector(keys);
-       filterByEntryType(keyVector, entryType);
+       filterByEntryType(keyVector, entry_type);
        
        if (str.isEmpty())
                result = to_qstring_list(keyVector);
@@ -627,9 +627,9 @@ vector<docstring> const GuiCitation::availableEntries() const
 
 
 void GuiCitation::filterByEntryType(
-       vector<docstring> & keyVector, docstring entryType) 
+       vector<docstring> & keyVector, docstring entry_type) 
 {
-       if (entryType.empty())
+       if (entry_type.empty())
                return;
        
        vector<docstring>::iterator it = keyVector.begin();
@@ -641,7 +641,7 @@ void GuiCitation::filterByEntryType(
                BiblioInfo::const_iterator cit = bibkeysInfo_.find(key);
                if (cit == bibkeysInfo_.end())
                        continue;
-               if (cit->second.entryType() == entryType)
+               if (cit->second.entryType() == entry_type)
                        result.push_back(key);
        }
        keyVector = result;

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 999781b26b95354f5e251e012d14801867af9f1e..704cedeb0c21a3b308f9d78fd1a8781ca9ddd9d3 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -772,7 +772,7 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
 
                                // add the new entry
                                keylist.addEntryType(entryType);
-                               keyvalmap.allData(data);
+                               keyvalmap.setAllData(data);
                                keylist[key] = keyvalmap;
                        }
                } //< searching '@'