Remove unneeded InsetFootlike::metrics/draw() methods

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6505b3b4297fecea5fcd09e0d9932b26e4b57808..fdce444aefa313e43a41cf6ce1766ae0f72b9819 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -21,6 +21,7 @@
 #include "BufferParams.h"
 #include "Bullet.h"
 #include "Chktex.h"
+#include "ColorSet.h"
 #include "Converter.h"
 #include "Counters.h"
 #include "Cursor.h"
@@ -353,6 +354,9 @@ public:
        /// whether the bibinfo cache is valid
        mutable bool bibinfo_cache_valid_;
 
+       ///
+       mutable bool need_update;
+
 private:
        int word_count_;
        int char_count_;
@@ -459,7 +463,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
          internal_buffer(false), read_only(readonly_), file_fully_loaded(false),
          need_format_backup(false), ignore_parent(false), macro_lock(false),
          externally_modified_(false), bibinfo_cache_valid_(false),
-         word_count_(0), char_count_(0), blank_count_(0)
+         need_update(false), word_count_(0), char_count_(0), blank_count_(0)
 {
        refreshFileMonitor();
        if (!cloned_buffer_) {
@@ -623,10 +627,9 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const
        // The clone needs its own DocumentClass, since running updateBuffer() will
        // modify it, and we would otherwise be sharing it with the original Buffer.
        buffer_clone->params().makeDocumentClass(true);
-       ErrorList el;
        cap::switchBetweenClasses(
                        params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
-                       static_cast<InsetText &>(buffer_clone->inset()), el);
+                       static_cast<InsetText &>(buffer_clone->inset()));
 
        bufmap[this] = buffer_clone;
        clones->insert(buffer_clone);
@@ -668,10 +671,9 @@ Buffer * Buffer::cloneBufferOnly() const {
        // The clone needs its own DocumentClass, since running updateBuffer() will
        // modify it, and we would otherwise be sharing it with the original Buffer.
        buffer_clone->params().makeDocumentClass(true);
-       ErrorList el;
        cap::switchBetweenClasses(
                        params().documentClassPtr(), buffer_clone->params().documentClassPtr(),
-                       static_cast<InsetText &>(buffer_clone->inset()), el);
+                       static_cast<InsetText &>(buffer_clone->inset()));
 
        clones->insert(buffer_clone);
        buffer_clone->d->clone_list_ = clones;
@@ -945,7 +947,9 @@ int Buffer::readHeader(Lexer & lex)
        params().fontcolor = RGBColor(0, 0, 0);
        params().isfontcolor = false;
        params().notefontcolor = RGBColor(0xCC, 0xCC, 0xCC);
+       params().isnotefontcolor = false;
        params().boxbgcolor = RGBColor(0xFF, 0, 0);
+       params().isboxbgcolor = false;
        params().html_latex_start.clear();
        params().html_latex_end.clear();
        params().html_math_img_scale = 1.0;
@@ -957,6 +961,7 @@ int Buffer::readHeader(Lexer & lex)
        params().biblatex_citestyle.erase();
        params().multibib.erase();
        params().lineno_opts.clear();
+       params().spellignore().clear();
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -985,7 +990,7 @@ int Buffer::readHeader(Lexer & lex)
                                      << token << '\'');
 
                string const result =
-                       params().readToken(lex, token, d->filename.onlyPath());
+                       params().readToken(lex, token, d->filename);
                if (!result.empty()) {
                        if (token == "\\textclass") {
                                d->layout_position = result;
@@ -1471,7 +1476,7 @@ bool Buffer::save() const
        // proper location once that has been done successfully. that
        // way we preserve the original file if something goes wrong.
        string const justname = fileName().onlyFileNameWithoutExt();
-       auto tempfile = make_unique<TempFile>(fileName().onlyPath(),
+       auto tempfile = lyx::make_unique<TempFile>(fileName().onlyPath(),
                                              justname + "-XXXXXX.lyx");
        bool const symlink = fileName().isSymLink();
        if (!symlink)
@@ -2938,9 +2943,9 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                undo().recordUndoBufferParams(CursorData());
                                branch_list.add(branch_name);
                                branch = branch_list.find(branch_name);
-                               string const x11hexname = X11hexname(branch->color());
-                               docstring const str = branch_name + ' ' + from_ascii(x11hexname);
-                               lyx::dispatch(FuncRequest(LFUN_SET_COLOR, str));
+                               if (branch)
+                                       // needed to update the color table for dark mode
+                                       branch->setColors("background", "background");
                                dr.setError(false);
                                dr.screenUpdate(Update::Force);
                        }
@@ -3532,6 +3537,9 @@ void Buffer::collectChildren(ListOfBuffers & children, bool grand_children) cons
        // loop over children
        for (auto const & p : d->children_positions) {
                Buffer * child = const_cast<Buffer *>(p.first);
+               // This can happen when called during GUI operations
+               if (!theBufferList().isLoaded(child))
+                       continue;
                // No duplicates
                ListOfBuffers::const_iterator bit = find(children.begin(), children.end(), child);
                if (bit != children.end())
@@ -5003,6 +5011,8 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
        cbuf.tocBackend().update(true, utype);
        if (scope == UpdateMaster)
                cbuf.structureChanged();
+
+       d->need_update = false;
 }
 
 
@@ -5285,6 +5295,18 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const dele
 }
 
 
+void Buffer::forceUpdate() const
+{
+       d->need_update = true;
+}
+
+
+bool Buffer::needUpdate() const
+{
+       return d->need_update;
+}
+
+
 int Buffer::spellCheck(DocIterator & from, DocIterator & to,
        WordLangTuple & word_lang, docstring_list & suggestions) const
 {