From abc0aaec12dfe8c78cb32f28f6455ca9ec4ef6c2 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 5 Apr 2017 10:20:01 +0200 Subject: [PATCH] Replace coverity annotation by an assertion And reorganize the code a bit. --- src/frontends/qt4/GuiWorkArea.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 084377231f..4753b2b483 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -2037,17 +2037,18 @@ void TabWorkArea::updateTabTexts() continue; } - // we found a non-atomic segment segStart <= sit <= it < next. + // We found a non-atomic segment + // We know that segStart <= it < next <= paths.end(). + // The assertion below tells coverity about it. + LATTEST(segStart != paths.end()); + QString dspString = segStart->forecastPathString(); + LYXERR(Debug::GUI, "first forecast found for " + << segStart->abs() << " => " << dspString); + It sit = segStart; + ++sit; // Shift path segments and hope for the best // that it makes the path more unique. somethingChanged = true; - It sit = segStart; - // this is ok for the reason mentioned in the previous comment. - // coverity[INVALIDATE_ITERATOR] - QString dspString = sit->forecastPathString(); - LYXERR(Debug::GUI, "first forecast found for " - << sit->abs() << " => " << dspString); - ++sit; bool moreUnique = false; for (; sit != next; ++sit) { if (sit->forecastPathString() != dspString) { -- 2.39.2