InsetListings: change the interface of diaplay function and allow AlignLeft. Applied...

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 89a4643076f3671ff0d4f66ad9be57d035bd760d..10d12d096703bd0cb4a7a90541e1e33230c89c94 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -15,7 +15,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
@@ -24,8 +24,8 @@
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
-#include "LyXLex.h"
+#include "Color.h"
+#include "Lexer.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "TocBackend.h"
@@ -44,17 +44,16 @@ using std::ostringstream;
 
 
 InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
-       : InsetCollapsable(bp)
+       : InsetCollapsable(bp), name_(from_utf8(type))
 {
        setLabel(_("wrap: ") + floatName(type, bp));
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
-       font.setColor(LColor::collapsable);
+       font.setColor(Color::collapsable);
        setLabelFont(font);
        params_.type = type;
-       params_.width = LyXLength(50, LyXLength::PCW);
-       setInsetName(from_utf8(type));
+       params_.width = Length(50, Length::PCW);
 }
 
 
@@ -64,7 +63,7 @@ InsetWrap::~InsetWrap()
 }
 
 
-void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
@@ -95,7 +94,7 @@ void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
@@ -121,7 +120,7 @@ void InsetWrapParams::write(ostream & os) const
 }
 
 
-void InsetWrapParams::read(LyXLex & lex)
+void InsetWrapParams::read(Lexer & lex)
 {
        string token;
        lex >> token;
@@ -136,7 +135,7 @@ void InsetWrapParams::read(LyXLex & lex)
        lex >> token;
        if (token == "width") {
                lex.next();
-               width = LyXLength(lex.getString());
+               width = Length(lex.getString());
        } else {
                lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
                        << endl;
@@ -153,7 +152,7 @@ void InsetWrap::write(Buffer const & buf, ostream & os) const
 }
 
 
-void InsetWrap::read(Buffer const & buf, LyXLex & lex)
+void InsetWrap::read(Buffer const & buf, Lexer & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -167,9 +166,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-auto_ptr<InsetBase> InsetWrap::doClone() const
+auto_ptr<Inset> InsetWrap::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetWrap(*this));
+       return auto_ptr<Inset>(new InsetWrap(*this));
 }
 
 
@@ -195,7 +194,7 @@ int InsetWrap::latex(Buffer const & buf, odocstream & os,
 int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
                          OutputParams const & runparams) const
 {
-       os << '[' << _("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
+       os << '[' << buf.B_("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
 
@@ -214,7 +213,7 @@ int InsetWrap::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-bool InsetWrap::insetAllowed(InsetBase::Code code) const
+bool InsetWrap::insetAllowed(Inset::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -262,7 +261,7 @@ void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params)
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;
@@ -271,7 +270,7 @@ void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params)
                return print_mailer_error("InsetWrapMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "Wrap")