Remove TextClassPtr without losing the type safety it provided.

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index a94d3729c044118c0275c489893671bb6ba4c4c2..937696f0583b639e48d7a7c1010250f9d457d37f 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -17,11 +17,9 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXAction.h"
@@ -33,45 +31,26 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <sstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-
-using std::endl;
-using std::min;
-
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-
-
-void InsetERT::init()
-{
-       setButtonLabel();
-
-       // FIXME: what to do with those?
-       //text_.current_font.setLanguage(latex_language);
-       //text_.real_current_font.setLanguage(latex_language);
-}
-
 
 InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
        : InsetCollapsable(bp, status)
-{
-       setLayout(bp);
-       init();
-}
+{}
 
 
 InsetERT::InsetERT(InsetERT const & in)
        : InsetCollapsable(in)
-{
-       init();
-}
+{}
 
 
 Inset * InsetERT::clone() const
@@ -80,56 +59,38 @@ Inset * InsetERT::clone() const
 }
 
 
-#if 0
-InsetERT::InsetERT(BufferParams const & bp,
-                  Language const *, string const & contents, CollapseStatus status)
-       : InsetCollapsable(bp, status)
-{
-       Font font(FONT_INHERIT, latex_language);
-       paragraphs().begin()->insert(0, contents, font);
-
-       // the init has to be after the initialization of the paragraph
-       // because of the label settings (draw_label for ert insets).
-       init();
-}
-#endif
-
-
 InsetERT::~InsetERT()
 {
        InsetERTMailer(*this).hideDialog();
 }
 
 
-void InsetERT::write(Buffer const & buf, ostream & os) const
+void InsetERT::write(ostream & os) const
 {
        os << "ERT" << "\n";
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-docstring const InsetERT::editMessage() const
+docstring InsetERT::editMessage() const
 {
        return _("Opened ERT Inset");
 }
 
 
-int InsetERT::latex(Buffer const & buf, odocstream & os,
-                   OutputParams const & op) const
+int InsetERT::latex(odocstream & os, OutputParams const & op) const
 {
-       return InsetCollapsable::latex(buf, os, op);
+       return InsetCollapsable::latex(os, op);
 }
 
 
-int InsetERT::plaintext(Buffer const &, odocstream &,
-                       OutputParams const &) const
+int InsetERT::plaintext(odocstream &, OutputParams const &) const
 {
        return 0; // do not output TeX code
 }
 
 
-int InsetERT::docbook(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+int InsetERT::docbook(odocstream & os, OutputParams const &) const
 {
        // FIXME can we do the same thing here as for LaTeX?
        ParagraphList::const_iterator par = paragraphs().begin();
@@ -154,8 +115,7 @@ int InsetERT::docbook(Buffer const &, odocstream & os,
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        BufferParams const & bp = cur.buffer().params();
-       LayoutPtr const layout =
-                       bp.getTextClass().defaultLayout();
+       LayoutPtr const layout = bp.documentClass().emptyLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
 
@@ -182,7 +142,7 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
        }
        default:
                // Force any new text to latex_language
-               // FIXME: This should only be necessary in init(), but
+               // FIXME: This should not be necessary but
                // new paragraphs that are created by pressing enter at the
                // start of an existing paragraph get the buffer language
                // and not latex_language, so we take this brute force
@@ -225,8 +185,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetERT::setButtonLabel()
 {
-       // FIXME UNICODE
-       if (decoration() == Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
        else
                setLabel(getNewLabel(_("ERT")));