BUG 3598: display framed and shaded notes in a separate paragraph, require package...

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index eb78e97a5479cdbf898879fc60fb54af83261f79..0a9f0ec6420605aef52f652656d05e3e78ae35b8 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -18,7 +18,7 @@
 #include "insets/RenderPreview.h"
 
 #include "Buffer.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "debug.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
@@ -27,7 +27,7 @@
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LyX.h"
-#include "LyXLex.h"
+#include "Lexer.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -38,7 +38,7 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/convert.h"
-#include "support/translator.h"
+#include "support/Translator.h"
 
 #include <boost/bind.hpp>
 
@@ -239,7 +239,7 @@ void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
 }
 
 
-bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
+bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 {
        enum ExternalTags {
                EX_TEMPLATE = 1,
@@ -277,7 +277,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
                { "width",           EX_WIDTH }
        };
 
-       pushpophelper pph(lex, external_tags, EX_END);
+       PushPopHelper pph(lex, external_tags, EX_END);
 
        bool found_end  = false;
        bool read_error = false;
@@ -337,7 +337,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_HEIGHT:
                        lex.next();
-                       resizedata.height = LyXLength(lex.getString());
+                       resizedata.height = Length(lex.getString());
                        break;
 
                case EX_KEEPASPECTRATIO:
@@ -361,7 +361,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_WIDTH:
                        lex.next();
-                       resizedata.width = LyXLength(lex.getString());
+                       resizedata.width = Length(lex.getString());
                        break;
 
                case EX_END:
@@ -400,16 +400,16 @@ InsetExternal::InsetExternal()
 
 
 InsetExternal::InsetExternal(InsetExternal const & other)
-       : InsetOld(other),
+       : Inset(other),
          boost::signals::trackable(),
          params_(other.params_),
          renderer_(other.renderer_->clone(this))
 {}
 
 
-auto_ptr<InsetBase> InsetExternal::doClone() const
+auto_ptr<Inset> InsetExternal::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetExternal(*this));
+       return auto_ptr<Inset>(new InsetExternal(*this));
 }
 
 
@@ -425,7 +425,7 @@ void InsetExternal::statusChanged() const
 }
 
 
-void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -454,12 +454,12 @@ void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
        }
 }
 
 
-bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
@@ -471,12 +471,12 @@ bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetBase::getStatus(cur, cmd, flag);
+               return Inset::getStatus(cur, cmd, flag);
        }
 }
 
 
-void InsetExternal::edit(LCursor & cur, bool)
+void InsetExternal::edit(Cursor & cur, bool)
 {
        InsetExternalMailer(*this).showDialog(&cur.bv());
 }
@@ -665,7 +665,7 @@ void InsetExternal::write(Buffer const & buffer, ostream & os) const
 }
 
 
-void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
+void InsetExternal::read(Buffer const & buffer, Lexer & lex)
 {
        InsetExternalParams params;
        if (params.read(buffer, lex))
@@ -868,7 +868,7 @@ void InsetExternalMailer::string2params(string const & in,
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;
@@ -877,7 +877,7 @@ void InsetExternalMailer::string2params(string const & in,
                return print_mailer_error("InsetExternalMailer", 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 != "External")