pimpl not needed here

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index a2b6cbf26c6a6cb56a2080875405e00661fe90f0..fe15a64f92a843a08f727817815967d24f76125c 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -18,12 +18,12 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "gettext.h"
-// the following is needed just to get the layout of the enclosing
+#include "Layout.h"
+// FIXME: the following is needed just to get the layout of the enclosing
 // paragraph. This seems a bit too much to me (JMarc)
 #include "OutputParams.h"
 #include "ParIterator.h"
 
-#include "support/convert.h"
 #include "support/std_ostream.h"
 #include "support/lstrings.h"
 
@@ -36,9 +36,7 @@ using std::ostream;
 
 InsetFoot::InsetFoot(BufferParams const & bp)
        : InsetFootlike(bp)
-{
-       setLayout(bp);
-}
+{}
 
 
 InsetFoot::InsetFoot(InsetFoot const & in)
@@ -46,9 +44,9 @@ InsetFoot::InsetFoot(InsetFoot const & in)
 {}
 
 
-auto_ptr<Inset> InsetFoot::doClone() const
+Inset * InsetFoot::clone() const
 {
-       return auto_ptr<Inset>(new InsetFoot(*this));
+       return new InsetFoot(*this);
 }
 
 
@@ -69,12 +67,13 @@ void InsetFoot::updateLabels(Buffer const & buf, ParIterator const & it)
                //FIXME: the counter should format itself.
                setLabel(support::bformat(from_ascii("%1$s %2$s"), 
                                          getLayout(buf.params()).labelstring, 
-                                         convert<docstring>(cnts.value(foot))));
+                                         cnts.theCounter(foot)));
        
        }
        InsetCollapsable::updateLabels(buf, it);
 }
 
+
 int InsetFoot::latex(Buffer const & buf, odocstream & os,
                     OutputParams const & runparams_in) const
 {