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

Make some code that handle authors more readable

Browse Source 
Create accssors authodmap() in BufferParams.

Use [] operator instead of find().

Hopefully this will avoid to confuse Coverity scan.
This commit is contained in:
Jean-Marc Lasgouttes 2024-09-10 15:29:36 +02:00
parent 54601b5578
commit 3f5b836aa9
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BufferParams.cpp
View File

@ -341,6 +341,7 @@ public:
Impl(); Impl();
AuthorList authorlist; AuthorList authorlist;
AuthorMap authormap;
BranchList branchlist; BranchList branchlist;
WordLangTable spellignore; WordLangTable spellignore;
Bullet temp_bullets[4]; Bullet temp_bullets[4];
@ -494,7 +495,7 @@ BufferParams::BufferParams()
use_lineno = false; use_lineno = false;
// map current author // map current author
author_map_[pimpl_->authorlist.get(0).bufferId()] = 0; pimpl_->authormap[pimpl_->authorlist.get(0).bufferId()] = 0;
} }
@ -578,9 +579,21 @@ AuthorList const & BufferParams::authors() const
} }
BufferParams::AuthorMap & BufferParams::authormap()
{
return pimpl_->authormap;
}
BufferParams::AuthorMap const & BufferParams::authormap() const
{
return pimpl_->authormap;
}
void BufferParams::addAuthor(Author const & a) void BufferParams::addAuthor(Author const & a)
{ {
author_map_[a.bufferId()] = pimpl_->authorlist.record(a); pimpl_->authormap[a.bufferId()] = pimpl_->authorlist.record(a);
} }

3
src/BufferParams.h
View File

@ -494,7 +494,8 @@ public:
/// map of the file's author IDs to AuthorList indexes /// map of the file's author IDs to AuthorList indexes
typedef std::map<int, int> AuthorMap; typedef std::map<int, int> AuthorMap;
AuthorMap author_map_; AuthorMap & authormap();
AuthorMap const & authormap() const;
/// the buffer's active font encoding /// the buffer's active font encoding
std::string const main_font_encoding() const; std::string const main_font_encoding() const;

6
src/Text.cpp
View File

@ -594,7 +594,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
int aid; int aid;
time_t ct; time_t ct;
is >> aid >> ct; is >> aid >> ct;
BufferParams::AuthorMap const & am = bp.author_map_; BufferParams::AuthorMap & am = bp.authormap();
if (am.find(aid) == am.end()) { if (am.find(aid) == am.end()) {
errorList.push_back(ErrorItem( errorList.push_back(ErrorItem(
_("Change tracking author index missing"), _("Change tracking author index missing"),
@ -609,9 +609,9 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
bp.addAuthor(Author(aid)); bp.addAuthor(Author(aid));
} }
if (token == "\\change_inserted") if (token == "\\change_inserted")
change = Change(Change::INSERTED, am.find(aid)->second, ct); change = Change(Change::INSERTED, am[aid], ct);
else else
change = Change(Change::DELETED, am.find(aid)->second, ct); change = Change(Change::DELETED, am[aid], ct);
} else { } else {
lex.eatLine(); lex.eatLine();
errorList.push_back(ErrorItem(_("Unknown token"), errorList.push_back(ErrorItem(_("Unknown token"),

6
src/insets/InsetTabular.cpp
View File

@ -470,7 +470,7 @@ bool getTokenValue(string const & str, char const * token, Change & change, Buff
"is incomplete. I will ignore this.")); "is incomplete. I will ignore this."));
return false; return false;
} }
BufferParams::AuthorMap const & am = bp.author_map_; BufferParams::AuthorMap & am = bp.authormap();
int aid = convert<int>(changedata[1]); int aid = convert<int>(changedata[1]);
if (am.find(aid) == am.end()) { if (am.find(aid) == am.end()) {
// FIXME Use ErrorList // FIXME Use ErrorList
@ -488,10 +488,10 @@ bool getTokenValue(string const & str, char const * token, Change & change, Buff
time_t ct; time_t ct;
is >> ct; is >> ct;
if (changedata[0] == "inserted") { if (changedata[0] == "inserted") {
change = Change(Change::INSERTED, am.find(aid)->second, ct); change = Change(Change::INSERTED, am[aid], ct);
return true; return true;
} else if (changedata[0] == "deleted") { } else if (changedata[0] == "deleted") {
change = Change(Change::DELETED, am.find(aid)->second, ct); change = Change(Change::DELETED, am[aid], ct);
return true; return true;
} }
} }