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 888f6bccfd4e99f9c4a2c5ef64953139ad241b59..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.
  */
@@ -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();
+       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;
@@ -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")));
+               return isOpen(bv) ? _("ERT") : getNewLabel(_("ERT"));
        else
-               setLabel(getNewLabel(_("ERT")));
+               return getNewLabel(_("ERT"));
 }
 
 
@@ -177,7 +173,7 @@ bool InsetERT::insetAllowed(InsetCode /* code */) const
 
 bool InsetERT::showInsetDialog(BufferView * bv) const
 {
-       bv->showDialog("ert", params2string(status()), 
+       bv->showDialog("ert", params2string(status(*bv)), 
                const_cast<InsetERT *>(this));
        return true;
 }
@@ -206,4 +202,9 @@ string InsetERT::params2string(CollapseStatus status)
 }
 
 
+docstring InsetERT::xhtml(odocstream &, OutputParams const &) const
+{
+       return docstring();
+}
+
 } // namespace lyx