Move <QTimer> from TocWidget.h

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 32547ed5e3eeaa5457ac023dd1c188d7afcb1802..d69fa55bb539459b0760adc24d19724a6da75ec3 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -66,6 +66,7 @@
 #include "support/textutils.h"
 #include "output_docbook.h"
 
+#include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <vector>
@@ -1103,7 +1104,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
                // add location information and throw again.
                e.par_id = id_;
                e.pos = i;
-               throw(e);
+               throw;
        }
 
        if (close)
@@ -2878,7 +2879,7 @@ void Paragraph::latex(BufferParams const & bparams,
                                        // add location information and throw again.
                                        e.par_id = id();
                                        e.pos = i;
-                                       throw(e);
+                                       throw;
                                }
                        }
                }
@@ -3430,7 +3431,7 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
                        }
                } else {
                        char_type c = getUChar(buf.masterBuffer()->params(), runparams, i);
-                       if (std::isspace(c) && !ignore_fonts)
+                       if (lyx::isSpace(c) && !ignore_fonts)
                                delayedChars.push_back(c);
                        else
                                *xs << c;
@@ -4368,10 +4369,8 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
                }
 
                int erasePos = pos - changes.size();
-               for (size_t i = 0; i < changes.size(); i++) {
-                       insertChar(pos, changes[i].first,
-                                  changes[i].second,
-                                  trackChanges);
+               for (auto const & change : changes) {
+                       insertChar(pos, change.first, change.second, trackChanges);
                        if (!eraseChar(erasePos, trackChanges)) {
                                ++erasePos;
                                ++pos; // advance