anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22996 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-02-14 07:10:12 +00:00
parent 10476b2264
commit 14d7b57487
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BiblioInfo.h
View File

@ -106,9 +106,9 @@ public:
docstring & operator[](docstring const & f) docstring & operator[](docstring const & f)
{ return bimap_[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_; } docstring entryType() const { return entryType_; }
private: private:

20
src/frontends/qt4/GuiCitation.cpp
View File

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

2
src/insets/InsetBibtex.cpp
View File

@ -772,7 +772,7 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
// add the new entry // add the new entry
keylist.addEntryType(entryType); keylist.addEntryType(entryType);
keyvalmap.allData(data); keyvalmap.setAllData(data);
keylist[key] = keyvalmap; keylist[key] = keyvalmap;
} }
} //< searching '@' } //< searching '@'