move updateLables to buffer

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 80d46ab750cd52de7a984ebd46a894bce7ce9711..0b671b2c0fd6478ac7eb0967443ae14454587932 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -28,9 +28,9 @@
 #include "frontends/alert.h"
 
 #include "support/convert.h"
-#include "support/lyxalgo.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -43,13 +43,13 @@ InsetLabel::InsetLabel(InsetCommandParams const & p)
 {}
 
 
-void InsetLabel::validate()
+void InsetLabel::initView()
 {
-       update(getParam("name"));
+       updateCommand(getParam("name"));
 }
 
 
-void InsetLabel::update(docstring const & new_label, bool updaterefs)
+void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
 {
        docstring const old_label = getParam("name");
        docstring label = new_label;
@@ -63,41 +63,38 @@ void InsetLabel::update(docstring const & new_label, bool updaterefs)
                // Warn the user that the label has been changed to something else.
                frontend::Alert::warning(_("Label names must be unique!"),
                        bformat(_("The label %1$s already exists,\n"
-                       "it will been changed to %2$s."), new_label, label));
+                       "it will be changed to %2$s."), new_label, label));
        }
 
+       buffer().undo().beginUndoGroup();
        setParam("name", label);
 
        if (updaterefs) {
                Buffer::References & refs = buffer().references(old_label);
                Buffer::References::iterator it = refs.begin();
                Buffer::References::iterator end = refs.end();
-               for (; it != end; ++it)
+               for (; it != end; ++it) {
+                       buffer().undo().recordUndo(it->second);
                        it->first->setParam("reference", label);
+               }
        }
+       buffer().undo().endUndoGroup();
 
        // We need an update of the Buffer reference cache. This is achieved by
-       // updateLabel().
-       lyx::updateLabels(buffer());
+       // updateLabels().
+       buffer().updateLabels();
 }
 
 
 ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */)
 {
        static ParamInfo param_info_;
-       if (param_info_.empty()) {
+       if (param_info_.empty())
                param_info_.add("name", ParamInfo::LATEX_REQUIRED);
-       }
        return param_info_;
 }
 
 
-void InsetLabel::getLabelList(vector<docstring> & list) const
-{
-       list.push_back(getParam("name"));
-}
-
-
 docstring InsetLabel::screenLabel() const
 {
        return screen_label_;
@@ -117,7 +114,7 @@ void InsetLabel::updateLabels(ParIterator const &)
 }
 
 
-void InsetLabel::addToToc(ParConstIterator const & cpit) const
+void InsetLabel::addToToc(DocIterator const & cpit)
 {
        docstring const & label = getParam("name");
        Toc & toc = buffer().tocBackend().toc("label");
@@ -130,7 +127,7 @@ void InsetLabel::addToToc(ParConstIterator const & cpit) const
        Buffer::References::const_iterator it = refs.begin();
        Buffer::References::const_iterator end = refs.end();
        for (; it != end; ++it) {
-               ParConstIterator const ref_pit(it->second);
+               DocIterator const ref_pit(it->second);
                toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel()));
        }
 }
@@ -143,12 +140,13 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(LABEL_CODE);
                // FIXME UNICODE
-               InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
+               InsetCommand::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noUpdate();
                        break;
                }
-               update(p["name"]);
+               if (p["name"] != params()["name"])
+                       updateCommand(p["name"]);
                break;
        }