Fix text frame drawing.

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 2a6663561bf91e42a576e5387681ed52b2b38c7c..b1adabbf7937a21b0e802a5ef015f7713e919472 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -16,34 +16,24 @@
 #include "BufferView.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "InsetList.h"
 #include "Text.h"
-#include "Paragraph.h"
-#include "ParIterator.h"
 #include "sgml.h"
 
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
-#include "support/std_ostream.h"
 
 
 namespace lyx {
 
-using support::escape;
-
-using std::string;
-using std::ostream;
-using std::vector;
-
 
 InsetLabel::InsetLabel(InsetCommandParams const & p)
        : InsetCommand(p, "label")
 {}
 
 
-std::auto_ptr<Inset> InsetLabel::doClone() const
+Inset * InsetLabel::clone() const
 {
-       return std::auto_ptr<Inset>(new InsetLabel(params()));
+       return new InsetLabel(params());
 }
 
 
@@ -72,7 +62,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
                if (p["name"] != params()["name"])
-                       cur.bv().buffer()->changeRefsIfUnique(params()["name"],
+                       cur.bv().buffer().changeRefsIfUnique(params()["name"],
                                        p["name"], Inset::REF_CODE);
                setParams(p);
                break;
@@ -86,15 +76,15 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 
 int InsetLabel::latex(Buffer const &, odocstream & os,
-                      OutputParams const &) const
+                     OutputParams const &) const
 {
-       os << escape(getCommand());
+       os << support::escape(getCommand());
        return 0;
 }
 
 
 int InsetLabel::plaintext(Buffer const &, odocstream & os,
-                          OutputParams const &) const
+                         OutputParams const &) const
 {
        docstring const str = getParam("name");
        os << '<' << str << '>';
@@ -103,11 +93,11 @@ int InsetLabel::plaintext(Buffer const &, odocstream & os,
 
 
 int InsetLabel::docbook(Buffer const & buf, odocstream & os,
-                        OutputParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        os << "<!-- anchor id=\""
-           << sgml::cleanID(buf, runparams, getParam("name"))
-           << "\" -->";
+          << sgml::cleanID(buf, runparams, getParam("name"))
+          << "\" -->";
        return 0;
 }