Unify naming of menu items

[features.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 05d6bc28c359b3bb0afc8330fd9abcce1db04dd6..cf2d701e7fb1af73d0e3a4fd03087bd9699d83c4 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -18,18 +18,15 @@
 #include "Text.h"
 
 #include "BranchList.h"
-#include "FloatList.h"
-#include "FuncStatus.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
-#include "ErrorList.h"
 #include "factory.h"
+#include "FloatList.h"
+#include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
 #include "Intl.h"
@@ -75,9 +72,6 @@
 #include "support/lassert.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
-#include "support/lyxtime.h"
-#include "support/os.h"
 #include "support/regex.h"
 
 #include "mathed/InsetMathHull.h"
@@ -369,7 +363,7 @@ enum OutlineOp {
 };
 
 
-static void insertSeparator(Cursor & cur, depth_type const depth)
+static void insertSeparator(Cursor const & cur, depth_type const depth)
 {
        Buffer & buf = *cur.buffer();
        lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK));
@@ -1276,7 +1270,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                Paragraph const & nextpar = lastpar ? par : pars_[pit + 1];
                pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
                if (prev < pit && cur.pos() == par.beginOfBody()
-                   && !par.size() && !par.isEnvSeparator(cur.pos())
+                   && par.empty() && !par.isEnvSeparator(cur.pos())
                    && !par.layout().keepempty
                    && !par.layout().isCommand()
                    && pars_[prev].layout() != par.layout()
@@ -1959,8 +1953,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                // "auto_region_delete", which defaults to
                // true (on).
 
-               if (lyxrc.auto_region_delete && cur.selection())
+               if (lyxrc.auto_region_delete && cur.selection()) {
                        cutSelection(cur, false);
+                       cur.setCurrentFont();
+               }
                cur.clearSelection();
 
                for (char_type c : cmd.argument())
@@ -3683,9 +3679,9 @@ void Text::pasteString(Cursor & cur, docstring const & clip,
 
 
 // FIXME: an item inset would make things much easier.
-bool Text::inDescriptionItem(Cursor & cur) const
+bool Text::inDescriptionItem(Cursor const & cur) const
 {
-       Paragraph & par = cur.paragraph();
+       Paragraph const & par = cur.paragraph();
        pos_type const pos = cur.pos();
        pos_type const body_pos = par.beginOfBody();