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

Small cleanup to LayoutBox and CategorizedCombo

Browse Source 
Coverity does not find it obvious that p is never negative. Normally
it is the case (because the items have been filtered), but it is
better to play safe.
This commit is contained in:
Jean-Marc Lasgouttes 2017-03-10 15:54:27 +01:00
parent c99e2f1fad
commit 0f220503ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/CategorizedCombo.cpp
View File

@ -271,10 +271,10 @@ QString CCItemDelegate::underlineFilter(QString const & s) const
// step through data item and put "(x)" for every matching character // step through data item and put "(x)" for every matching character
QString r; QString r;
int lastp = -1; int lastp = -1;
cc_->filter();
for (int i = 0; i < f.length(); ++i) { for (int i = 0; i < f.length(); ++i) {
int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive); int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive);
LASSERT(p != -1, /**/); if (p < 0)
continue;
if (lastp == p - 1 && lastp != -1) { if (lastp == p - 1 && lastp != -1) {
// remove ")" and append "x)" // remove ")" and append "x)"
r = r.left(r.length() - 4) + s[p] + "</u>"; r = r.left(r.length() - 4) + s[p] + "</u>";

4
src/frontends/qt4/LayoutBox.cpp
View File

@ -320,10 +320,10 @@ QString LayoutItemDelegate::underlineFilter(QString const & s) const
// step through data item and put "(x)" for every matching character // step through data item and put "(x)" for every matching character
QString r; QString r;
int lastp = -1; int lastp = -1;
layout_->filter();
for (int i = 0; i < f.length(); ++i) { for (int i = 0; i < f.length(); ++i) {
int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive); int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive);
LASSERT(p != -1, continue); if (p < 0)
continue;
if (lastp == p - 1 && lastp != -1) { if (lastp == p - 1 && lastp != -1) {
// remove ")" and append "x)" // remove ")" and append "x)"
r = r.left(r.length() - 4) + s[p] + "</u>"; r = r.left(r.length() - 4) + s[p] + "</u>";