Make getBibkeyList const.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4001 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-04-16 09:12:36 +00:00
parent 8b0bb92d40
commit f2abe6cb34
3 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,7 @@
2002-04-16 Angus Leeming <a.leeming@ic.ac.uk>
* buffer.[Ch] (getBibkeyList): make it const.
2002-04-12 Juergen Vigna <jug@sad.it>
* BufferView_pimpl.C (workAreaMotionNotify): use new ix() cursor pos.

View File

@ -3687,36 +3687,37 @@ Buffer::Lists const Buffer::getLists() const
// This is also a buffer property (ale)
vector<pair<string, string> > const Buffer::getBibkeyList()
vector<pair<string, string> > const Buffer::getBibkeyList() const
{
typedef pair<string, string> StringPair;
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990412]
if (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
Buffer * tmp = bufferlist.getBuffer(params.parentname);
Buffer const * tmp = bufferlist.getBuffer(params.parentname);
if (tmp)
return tmp->getBibkeyList();
}
vector<pair<string, string> > keys;
vector<StringPair> keys;
Paragraph * par = paragraph;
while (par) {
if (par->bibkey)
keys.push_back(pair<string, string>(par->bibkey->getContents(),
par->asString(this, false)));
keys.push_back(StringPair(par->bibkey->getContents(),
par->asString(this, false)));
par = par->next();
}
// Might be either using bibtex or a child has bibliography
if (keys.empty()) {
for (inset_iterator it = inset_iterator_begin();
it != inset_iterator_end(); ++it) {
for (inset_iterator it = inset_const_iterator_begin();
it != inset_const_iterator_end(); ++it) {
// Search for Bibtex or Include inset
if ((*it)->lyxCode() == Inset::BIBTEX_CODE) {
vector<pair<string,string> > tmp =
vector<StringPair> tmp =
static_cast<InsetBibtex*>(*it)->getKeys(this);
keys.insert(keys.end(), tmp.begin(), tmp.end());
} else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
vector<pair<string,string> > const tmp =
vector<StringPair> const tmp =
static_cast<InsetInclude*>(*it)->getKeys();
keys.insert(keys.end(), tmp.begin(), tmp.end());
}

View File

@ -265,7 +265,7 @@ public:
///
string const getIncludeonlyList(char delim = ',');
///
std::vector<std::pair<string, string> > const getBibkeyList();
std::vector<std::pair<string, string> > const getBibkeyList() const;
///
struct TocItem {
TocItem(Paragraph * p, int d, string const & s)