void LastOpenedSection::write(ostream & os) const
{
os << '\n' << sec_lastopened << '\n';
- for (size_t i = 0; i < lastopened.size(); ++i)
- os << lastopened[i].active << ", " << lastopened[i].file_name << '\n';
+ for (auto const & last : lastopened)
+ os << last.active << ", " << last.file_name << '\n';
}
// currently, we even crash in some cases (see #9483).
// FIXME: Add session support for multiple views of
// the same buffer (split-view etc.).
- for (size_t i = 0; i < lastopened.size(); ++i) {
- if (lastopened[i].file_name == file)
+ for (auto const & last : lastopened) {
+ if (last.file_name == file)
return;
}
lastopened.push_back(lof);
{
// Remove element if it was already present. Iterating should
// not be a problem since the list is small (<100 elements).
- for (FilePosList::const_iterator it = lastfilepos.begin();
+ for (FilePosList::iterator it = lastfilepos.begin();
it != lastfilepos.end(); ++it)
if (it->file == pos.file) {
lastfilepos.erase(it);
LastFilePosSection::FilePos LastFilePosSection::load(FileName const & fname) const
{
- for (auto & fp : lastfilepos)
+ for (auto const & fp : lastfilepos)
if (fp.file == fname)
// Has position information, return it.
return fp;
continue;
FileName const file(fname);
// only load valid bookmarks
- if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
+ if (file.exists() && !file.isDirectory() && idx < bookmarks.size())
bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
else
LYXERR(Debug::INIT, "LyX: Warning: Ignore bookmark of file: " << fname);
void BookmarksSection::write(ostream & os) const
{
os << '\n' << sec_bookmarks << '\n';
- for (size_t i = 0; i <= max_bookmarks; ++i) {
+ for (size_t i = 0; i < bookmarks.size(); ++i) {
if (isValid(i))
os << i << ", "
<< bookmarks[i].bottom_pit << ", "
int top_id, pos_type top_pos, unsigned int idx)
{
// silently ignore bookmarks when idx is out of range
- if (idx <= max_bookmarks)
+ if (idx < bookmarks.size())
bookmarks[idx] = Bookmark(fname, bottom_pit, bottom_pos, top_id, top_pos);
}
bool BookmarksSection::isValid(unsigned int i) const
{
- return i <= max_bookmarks && !bookmarks[i].filename.empty();
+ return i < bookmarks.size() && !bookmarks[i].filename.empty();
}
bool BookmarksSection::hasValid() const
{
- for (size_t i = 1; i <= size(); ++i) {
+ for (size_t i = 1; i < bookmarks.size(); ++i) {
if (isValid(i))
return true;
}
}
+BookmarksSection::BookmarkPosList
+BookmarksSection::bookmarksInPar(FileName const & fn, int const par_id) const
+{
+ // FIXME: we do not consider the case of bottom_pit.
+ // This is probably not a problem.
+ BookmarksSection::BookmarkPosList bip;
+ for (size_t i = 1; i < bookmarks.size(); ++i)
+ if (bookmarks[i].filename == fn && bookmarks[i].top_id == par_id)
+ bip.push_back({i, bookmarks[i].top_pos});
+
+ return bip;
+}
+
+
LastCommandsSection::LastCommandsSection(unsigned int num) :
default_num_last_commands(30),
absolute_max_last_commands(100)
}
-void LastCommandsSection::add(std::string const & string)
+void LastCommandsSection::add(std::string const & command)
{
- lastcommands.push_back(string);
+ lastcommands.push_back(command);
}
bool AuthFilesSection::find(string const & name) const
{
- if (auth_files_.find(name) != auth_files_.end())
- return true;
-
- return false;
+ return auth_files_.find(name) != auth_files_.end();
}
bool ShellEscapeSection::findAuth(string const & name) const
{
- if (shellescape_files_.find(name + ",1") != shellescape_files_.end())
- return true;
-
- return false;
+ return shellescape_files_.find(name + ",1") != shellescape_files_.end();
}