ws changes only

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 81466a5f4145c977b719d48fb7c7947414730f6e..7756436ff65314a6b9c6a88f5df61cc3b9c45578 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -11,25 +11,33 @@
 #include <config.h>
 
 #include "insetcaption.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
-#include "BufferView.h"
+#include "insetfloat.h"
+#include "insetwrap.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
+#include "Floating.h"
 #include "FloatList.h"
-#include "insets/insetfloat.h"
-#include "insets/insetwrap.h"
-#include "debug.h"
 #include "gettext.h"
-#include "Lsstream.h"
+#include "LColor.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
 #include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "support/BoostFormat.h"
 
-using namespace lyx::support;
+#include "support/std_sstream.h"
+
+
+using lyx::support::bformat;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::ostream;
+using std::ostringstream;
 
 
 InsetCaption::InsetCaption(BufferParams const & bp)
@@ -41,14 +49,14 @@ InsetCaption::InsetCaption(BufferParams const & bp)
 }
 
 
-void InsetCaption::write(Buffer const * buf, ostream & os) const
+void InsetCaption::write(Buffer const & buf, ostream & os) const
 {
        os << "Caption\n";
        writeParagraphData(buf, os);
 }
 
 
-void InsetCaption::read(Buffer const * buf, LyXLex & lex)
+void InsetCaption::read(Buffer const & buf, LyXLex & lex)
 {
 #if 0
        // We will enably this check again when the compability
@@ -87,10 +95,10 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        else if (i2->lyxCode() == WRAP_CODE)
                type = static_cast<InsetWrap *>(i2)->params().type;
        else
-               Assert(0);
+               BOOST_ASSERT(false);
 
        FloatList const & floats =
-               pi.base.bv->buffer()->params.getLyXTextClass().floats();
+               pi.base.bv->buffer()->params().getLyXTextClass().floats();
        string const fl = i2 ? floats.getType(type).name() : N_("Float");
 
        // Discover the number...
@@ -104,7 +112,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-int InsetCaption::latex(Buffer const * buf, ostream & os,
+int InsetCaption::latex(Buffer const & buf, ostream & os,
                        LatexRunParams const & runparams) const
 {
        // This is a bit too simplistic to take advantage of
@@ -119,7 +127,7 @@ int InsetCaption::latex(Buffer const * buf, ostream & os,
 }
 
 
-int InsetCaption::ascii(Buffer const * /*buf*/,
+int InsetCaption::ascii(Buffer const & /*buf*/,
                        ostream & /*os*/, int /*linelen*/) const
 {
        // FIX: Implement me!
@@ -127,7 +135,7 @@ int InsetCaption::ascii(Buffer const * /*buf*/,
 }
 
 
-int InsetCaption::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetCaption::docbook(Buffer const & buf, ostream & os, bool mixcont) const
 {
        int ret;
        os << "<title>";