Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 137cc76a5f5437fadd00e1640f936b7dd06f9e3f..47638eb847749a9f618c5a6099996f25ad0735aa 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -3,8 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -22,12 +22,12 @@
 #include "FuncStatus.h"
 #include "Language.h"
 #include "Layout.h"
-#include "LyXAction.h"
 #include "Lexer.h"
-#include "TextClass.h"
+#include "LyXAction.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
 #include "Paragraph.h"
+#include "TextClass.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -44,8 +44,10 @@ using namespace lyx::support;
 namespace lyx {
 
 InsetERT::InsetERT(Buffer const & buf, CollapseStatus status)
-       : InsetCollapsable(buf, status)
-{}
+       : InsetCollapsable(buf)
+{
+       status_ = status;
+}
 
 
 InsetERT::~InsetERT()
@@ -103,16 +105,10 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       BufferParams const & bp = cur.buffer().params();
-       Layout const layout = bp.documentClass().emptyLayout();
+       BufferParams const & bp = cur.buffer()->params();
+       Layout const layout = bp.documentClass().plainLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
-       case LFUN_QUOTE_INSERT: {
-               // We need to bypass the fancy quotes in Text
-               FuncRequest f(LFUN_SELF_INSERT, "\"");
-               dispatch(cur, f);
-               break;
-       }
        case LFUN_INSET_MODIFY: {
                setStatus(cur, string2params(to_utf8(cmd.argument())));
                break;
@@ -141,7 +137,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_PASTE:
                case LFUN_PRIMARY_SELECTION_PASTE:
                case LFUN_QUOTE_INSERT:
-                       status.enabled(true);
+                       status.setEnabled(true);
                        return true;
 
                // this one is difficult to get right. As a half-baked
@@ -160,12 +156,12 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetERT::setButtonLabel()
+docstring const InsetERT::buttonLabel(BufferView const & bv) const
 {
-       if (decoration() == InsetLayout::Classic)
-               setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
+       if (decoration() == InsetLayout::CLASSIC)
+               return isOpen(bv) ? _("ERT") : getNewLabel(_("ERT"));
        else
-               setLabel(getNewLabel(_("ERT")));
+               return getNewLabel(_("ERT"));
 }
 
 
@@ -175,16 +171,9 @@ bool InsetERT::insetAllowed(InsetCode /* code */) const
 }
 
 
-void InsetERT::draw(PainterInfo & pi, int x, int y) const
-{
-       const_cast<InsetERT &>(*this).setButtonLabel();
-       InsetCollapsable::draw(pi, x, y);
-}
-
-
 bool InsetERT::showInsetDialog(BufferView * bv) const
 {
-       bv->showDialog("ert", params2string(status()), 
+       bv->showDialog("ert", params2string(status(*bv)), 
                const_cast<InsetERT *>(this));
        return true;
 }
@@ -192,26 +181,16 @@ bool InsetERT::showInsetDialog(BufferView * bv) const
 
 InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
-       CollapseStatus status = Collapsed;
        if (in.empty())
-               return status;
-
+               return Collapsed;
        istringstream data(in);
        Lexer lex;
        lex.setStream(data);
-
-       string name;
-       lex >> name;
-       if (name != "ert") {
-               LYXERR0("Expected arg 1 to be \"ert\" in " << in);
-               return status;
-       }
-
+       lex.setContext("InsetERT::string2params");
+       lex >> "ert";
        int s;
        lex >> s;
-       if (lex)
-               status = static_cast<CollapseStatus>(s);
-       return status;
+       return static_cast<CollapseStatus>(s);
 }
 
 
@@ -223,4 +202,9 @@ string InsetERT::params2string(CollapseStatus status)
 }
 
 
+docstring InsetERT::xhtml(odocstream &, OutputParams const &) const
+{
+       return docstring();
+}
+
 } // namespace lyx