Refactor InsetQuotes.h enums

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index af904041c29ffa04e133a70d0260a0ca3d55ca1f..37eae57af87eb7caca1912ec98df463434231d6d 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,16 +72,13 @@
 #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"
 #include "mathed/InsetMathMacroTemplate.h"
 #include "lyxfind.h"
 
 #include <clocale>
+#include <regex>
 #include <sstream>
 
 using namespace std;
@@ -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));
@@ -1114,7 +1108,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_NEWLINE_INSERT: {
                InsetNewlineParams inp;
-               docstring arg = cmd.argument();
+               docstring const & arg = cmd.argument();
                if (arg == "linebreak")
                        inp.kind = InsetNewlineParams::LINEBREAK;
                else
@@ -1787,8 +1781,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                }
                        }
                }
-               InsetQuotesParams::QuoteLevel const quote_level = inner
-                               ? InsetQuotesParams::SecondaryQuotes : InsetQuotesParams::PrimaryQuotes;
+               QuoteLevel const quote_level = inner
+                               ? QuoteLevel::SecondaryQuotes : QuoteLevel::PrimaryQuotes;
                cur.insert(new InsetQuotes(cur.buffer(), c, quote_level, cmd.getArg(1), cmd.getArg(2)));
                cur.buffer()->updateBuffer();
                cur.posForward();
@@ -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())
@@ -2894,7 +2890,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 
 bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
-                       FuncStatus & flag) const
+                       FuncStatus & status) const
 {
        LBUFERR(this == cur.text());
 
@@ -2917,7 +2913,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                // FIXME We really should not allow this to be put, e.g.,
                // in a footnote, or in ERT. But it would make sense in a
                // branch, so I'm not sure what to do.
-               flag.setOnOff(cur.paragraph().params().startOfAppendix());
+               status.setOnOff(cur.paragraph().params().startOfAppendix());
                break;
 
        case LFUN_DIALOG_SHOW_NEW_INSET:
@@ -3047,7 +3043,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        if (cit == floats.end() ||
                                        // and that we know how to generate a list of them
                            (!cit->second.usesFloatPkg() && cit->second.listCommand().empty())) {
-                               flag.setUnknown(true);
+                               status.setUnknown(true);
                                // probably not necessary, but...
                                enable = false;
                        }
@@ -3231,38 +3227,38 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_FONT_EMPH:
-               flag.setOnOff(fontinfo.emph() == FONT_ON);
+               status.setOnOff(fontinfo.emph() == FONT_ON);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_ITAL:
-               flag.setOnOff(fontinfo.shape() == ITALIC_SHAPE);
+               status.setOnOff(fontinfo.shape() == ITALIC_SHAPE);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_NOUN:
-               flag.setOnOff(fontinfo.noun() == FONT_ON);
+               status.setOnOff(fontinfo.noun() == FONT_ON);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_BOLD:
        case LFUN_FONT_BOLDSYMBOL:
-               flag.setOnOff(fontinfo.series() == BOLD_SERIES);
+               status.setOnOff(fontinfo.series() == BOLD_SERIES);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_SANS:
-               flag.setOnOff(fontinfo.family() == SANS_FAMILY);
+               status.setOnOff(fontinfo.family() == SANS_FAMILY);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_ROMAN:
-               flag.setOnOff(fontinfo.family() == ROMAN_FAMILY);
+               status.setOnOff(fontinfo.family() == ROMAN_FAMILY);
                enable = !cur.paragraph().isPassThru();
                break;
 
        case LFUN_FONT_TYPEWRITER:
-               flag.setOnOff(fontinfo.family() == TYPEWRITER_FAMILY);
+               status.setOnOff(fontinfo.family() == TYPEWRITER_FAMILY);
                enable = !cur.paragraph().isPassThru();
                break;
 
@@ -3418,7 +3414,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (!ins)
                        enable = false;
                else
-                       flag.setOnOff(to_utf8(cmd.argument()) == ins->getParams().groupId);
+                       status.setOnOff(to_utf8(cmd.argument()) == ins->getParams().groupId);
                break;
        }
 
@@ -3430,7 +3426,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
        case LFUN_LANGUAGE:
                enable = !cur.paragraph().isPassThru();
-               flag.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());
+               status.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());
                break;
 
        case LFUN_PARAGRAPH_BREAK:
@@ -3455,7 +3451,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                docstring const layout = resolveLayout(req_layout, cur);
 
                enable = !owner_->forcePlainLayout() && !layout.empty();
-               flag.setOnOff(isAlreadyLayout(layout, cur));
+               status.setOnOff(isAlreadyLayout(layout, cur));
                break;
        }
 
@@ -3664,7 +3660,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                || (cur.paragraph().layout().pass_thru && !allow_in_passthru)))
                enable = false;
 
-       flag.setEnabled(enable);
+       status.setEnabled(enable);
        return true;
 }