Amend fb7b7e52

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 7e65c4280f0cb7dfd5f2930f246a84c1be9893a1..69194b1fee5fb7e9797d5f9fd4205ce2950ef40d 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -837,7 +837,7 @@ void addSnippet(std::list<TexString> & list, TexString ts, bool allow_dupes)
                            return ts.str == ts2.str;
                    })
            )
-               list.push_back(move(ts));
+               list.push_back(std::move(ts));
 }
 
 
@@ -854,7 +854,7 @@ TexString getSnippets(std::list<TexString> const & list)
 
 void LaTeXFeatures::addPreambleSnippet(TexString snippet, bool allow_dupes)
 {
-       addSnippet(preamble_snippets_, move(snippet), allow_dupes);
+       addSnippet(preamble_snippets_, std::move(snippet), allow_dupes);
 }
 
 
@@ -1161,7 +1161,9 @@ char const * simplefeatures[] = {
        "pict2e",
        "drs",
        "environ",
-       "dsfont"
+       "dsfont",
+       "hepparticles",
+       "hepnames"
 };
 
 char const * bibliofeatures[] = {
@@ -1925,16 +1927,12 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const
 
        tcpreamble << tclass.htmlstyles();
 
-       list<docstring>::const_iterator cit = usedLayouts_.begin();
-       list<docstring>::const_iterator end = usedLayouts_.end();
-       for (; cit != end; ++cit)
-               tcpreamble << tclass[*cit].htmlstyle();
+       for (auto const & c : usedLayouts_)
+               tcpreamble << tclass[c].htmlstyle();
 
-       cit = usedInsetLayouts_.begin();
-       end = usedInsetLayouts_.end();
        TextClass::InsetLayouts const & ils = tclass.insetLayouts();
-       for (; cit != end; ++cit) {
-               TextClass::InsetLayouts::const_iterator it = ils.find(*cit);
+       for (auto const & c : usedInsetLayouts_) {
+               TextClass::InsetLayouts::const_iterator it = ils.find(c);
                if (it == ils.end())
                        continue;
                tcpreamble << it->second.htmlstyle();