Move <algorithm> from DocIterator.h

[lyx.git] / src / mathed / InsetMathMacroTemplate.cpp

diff --git a/src/mathed/InsetMathMacroTemplate.cpp b/src/mathed/InsetMathMacroTemplate.cpp
index 6c109696a753bc90877bd59c89ced44aa430a680..a152222cb6ce1a4232ccc494903e5b86fe1dea37 100644 (file)
--- a/src/mathed/InsetMathMacroTemplate.cpp
+++ b/src/mathed/InsetMathMacroTemplate.cpp
@@ -67,15 +67,15 @@ public:
        InsetLabelBox(Buffer * buf, docstring label, InsetMathMacroTemplate const & parent,
                      bool frame = false);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
 
 protected:
        ///
        InsetMathMacroTemplate const & parent_;
        ///
-       Inset * clone() const;
+       Inset * clone() const override;
        ///
        docstring const label_;
        ///
@@ -190,15 +190,15 @@ public:
                        InsetMathMacroTemplate const & parent);
 
        ///
-       marker_type marker(BufferView const *) const;
+       marker_type marker(BufferView const *) const override;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
 
 protected:
        ///
-       Inset * clone() const;
+       Inset * clone() const override;
 };
 
 
@@ -252,13 +252,13 @@ public:
        ///
        explicit InsetMathWrapper(MathData const * value) : value_(value) {}
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
 
 private:
        ///
-       Inset * clone() const;
+       Inset * clone() const override;
        ///
        MathData const * value_;
 };
@@ -290,13 +290,13 @@ public:
        ///
        InsetColoredCell(Buffer * buf, ColorCode blend, MathAtom const & atom);
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
 
 protected:
        ///
-       Inset * clone() const;
+       Inset * clone() const override;
        ///
        ColorCode blend_;
 };
@@ -342,15 +342,15 @@ public:
        ///
        InsetNameWrapper(MathData const * value, InsetMathMacroTemplate const & parent);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
 
 private:
        ///
        InsetMathMacroTemplate const & parent_;
        ///
-       Inset * clone() const;
+       Inset * clone() const override;
 };
 
 
@@ -1293,10 +1293,10 @@ bool InsetMathMacroTemplate::validName() const
 
        // valid characters?
        if (n.size() > 1) {
-               for (size_t i = 0; i < n.size(); ++i) {
-                       if (!(n[i] >= 'a' && n[i] <= 'z')
-                           && !(n[i] >= 'A' && n[i] <= 'Z')
-                           && n[i] != '*')
+               for (char_type c : n) {
+                       if (!(c >= 'a' && c <= 'z')
+                           && !(c >= 'A' && c <= 'Z')
+                           && c != '*')
                                return false;
                }
        }