Replace coverity annotation by an assertion

And reorganize the code a bit.

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 084377231f170ff164357e154e2a4402874eeba7..4753b2b483d51b35e99ef11aa6fc58e6099671a9 100644 (file)
--- 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) {