Allow removing words from the personal dictionary, that weren't previously added.

[features.git] / src / insets / InsetListings.cpp

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 471605a28ccba6d9ab7cfa5769d99f7fb2f5d416..5afc4327265d28124093c472ada6ee5784ba0498 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -41,6 +41,7 @@
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
+#include <cstring>
 #include <regex>
 #include <sstream>
 
@@ -64,7 +65,7 @@ InsetListings::~InsetListings()
 }
 
 
-Inset::RowFlags InsetListings::rowFlags() const
+int InsetListings::rowFlags() const
 {
        return params().isInline() || params().isFloat() ? Inline : Display | AlignLeft;
 }
@@ -312,9 +313,9 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                        }
                }
                ++par;
-               // Add new line for displayed listing between paragraphs.
+               // Add new line between paragraphs in displayed listings.
                // Exception: merged paragraphs in change tracking mode.
-               // Also, ´for the inline case, if there are multiple paragraphs
+               // Also, for the inline case, if there are multiple paragraphs
                // they are simply joined. Otherwise, expect latex errors.
                if (par != end && !isInline && !captionline && !par->parEndChange().deleted())
                        code += "\n";
@@ -368,7 +369,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                os << '[' << float_placement << "]";
                } else if (captionfirst && !caption.str.empty()) {
                        os << breakln << "\\lyxmintcaption[t]{"
-                          << move(caption) << "}\n";
+                          << std::move(caption) << "}\n";
                }
                os << breakln << "\\begin{minted}";
                if (!param_string.empty())
@@ -377,11 +378,11 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                   << code << breakln << "\\end{minted}\n";
                if (isfloat) {
                        if (!caption.str.empty())
-                               os << "\\caption{" << move(caption) << "}\n";
+                               os << "\\caption{" << std::move(caption) << "}\n";
                        os << "\\end{listing}\n";
                } else if (!captionfirst && !caption.str.empty()) {
                        os << breakln << "\\lyxmintcaption[b]{"
-                          << move(caption) << "}";
+                          << std::move(caption) << "}";
                }
        } else {
                OutputParams rp = runparams;
@@ -395,7 +396,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                os << safebreakln;
                        os << "[";
                        if (!caption.str.empty()) {
-                               os << "caption={" << move(caption) << '}';
+                               os << "caption={" << std::move(caption) << '}';
                                if (!param_string.empty())
                                        os << ',';
                        }