This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index bca76ee44c72ee18230786f63d0d7de563da5348..b0cf6dfcf55e00d05c2c85f55666c8d897b606f5 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -22,27 +22,33 @@
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::escape;
-
-using std::string;
-using std::vector;
-
 
 InsetLabel::InsetLabel(InsetCommandParams const & p)
        : InsetCommand(p, "label")
 {}
 
 
-std::auto_ptr<Inset> InsetLabel::doClone() const
+CommandInfo const * InsetLabel::findInfo(string const & /* cmdName */)
+{
+       static const char * const paramnames[] = {"name", ""};
+       static const bool isoptional[] = {false};
+       static const CommandInfo info = {1, paramnames, isoptional};
+       return &info;
+}
+
+
+Inset * InsetLabel::clone() const
 {
-       return std::auto_ptr<Inset>(new InsetLabel(params()));
+       return new InsetLabel(params());
 }
 
 
-void InsetLabel::getLabelList(Buffer const &, std::vector<docstring> & list) const
+void InsetLabel::getLabelList(Buffer const &, vector<docstring> & list) const
 {
        list.push_back(getParam("name"));
 }
@@ -59,7 +65,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p("label");
+               InsetCommandParams p(LABEL_CODE);
                // FIXME UNICODE
                InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
@@ -67,8 +73,8 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
                if (p["name"] != params()["name"])
-                       cur.bv().buffer()->changeRefsIfUnique(params()["name"],
-                                       p["name"], Inset::REF_CODE);
+                       cur.bv().buffer().changeRefsIfUnique(params()["name"],
+                                       p["name"], REF_CODE);
                setParams(p);
                break;
        }