Fix problem with static error list.

It's amazing we haven't seen problems with this before. The basic problem is that buf.errorList("whatever") would always return the same global, static error list, if it did not already exist. So, to a significant extent, there was only one global error list!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38982 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 47c82ccb7ecc0f6d8d53d0778a3910c3beaa02ff..2df65c2a2414ebab3471e4ce22f0f615b262fe18 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3106,9 +3106,9 @@ void Buffer::getSourceCode(odocstream & os, string const format,
 }
 
 
-ErrorList & Buffer::errorList(string const & type) const
+ErrorList const & Buffer::errorList(string const & type) const
 {
-       static ErrorList emptyErrorList;
+       static const ErrorList emptyErrorList;
        map<string, ErrorList>::iterator it = d->errorLists.find(type);
        if (it == d->errorLists.end())
                return emptyErrorList;
@@ -3117,6 +3117,12 @@ ErrorList & Buffer::errorList(string const & type) const
 }
 
 
+ErrorList & Buffer::errorList(string const & type)
+{
+       return d->errorLists[type];
+}
+
+
 void Buffer::updateTocItem(std::string const & type,
        DocIterator const & dit) const
 {

diff --git a/src/Buffer.h b/src/Buffer.h
index 3da4d224dd4744164ce6f5218131657c6c490275..0c99e1feb85afcc84eb7dbd51b06d4f21239304e 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -556,7 +556,8 @@ public:
        /// errors (like parsing or LateX compilation). This method is const
        /// because modifying the returned ErrorList does not touch the document
        /// contents.
-       ErrorList & errorList(std::string const & type) const;
+       ErrorList & errorList(std::string const & type);
+       ErrorList const & errorList(std::string const & type) const;
 
        /// The Toc backend.
        /// This is useful only for screen visualisation of the Buffer. This

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index e5f7fc60291649ca7ce32418ec34ba9c62f8c1a1..298030177696a40d750559dc0dbabfee57af91ca 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1451,13 +1451,13 @@ void GuiView::errors(string const & error_type, bool from_master)
 #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
        // We are called with from_master == false by default, so we
        // have to figure out whether that is the case or not.
-       ErrorList & el = bv->buffer().errorList(error_type);
+       ErrorList & el = const_cast<ErrorList &>(bv->buffer().errorList(error_type));
        if (el.empty()) {
            el = bv->buffer().masterBuffer()->errorList(error_type);
            from_master = true;
        }
 #else
-       ErrorList & el = from_master ?
+       ErrorList const & el = from_master ?
                bv->buffer().masterBuffer()->errorList(error_type) :
                bv->buffer().errorList(error_type);
 #endif

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 628cb00be31b421837ef16d98d0b2dcf6a2f4ca1..94a996a81edf5c16dd607776bc6be1fd8c15c3bb 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -627,7 +627,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                                        "was not exported correctly.\nWarning: "
                                        "LaTeX export is probably incomplete."),
                                        included_file.displayName());
-                       ErrorList & el = tmp->errorList("Export");
+                       ErrorList const & el = tmp->errorList("Export");
                        if (!el.empty())
                                msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"),
                                                msg, el.begin()->error,