#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"
InsetERT::~InsetERT()
{
- if (theApp())
- theApp()->hideDialogs("ert", this);
+ hideDialogs("ert", this);
}
break;
}
case LFUN_INSET_MODIFY: {
- InsetCollapsable::CollapseStatus st;
- InsetERT::string2params(to_utf8(cmd.argument()), st);
- setStatus(cur, st);
+ setStatus(cur, string2params(to_utf8(cmd.argument())));
break;
}
default:
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
}
-void InsetERT::string2params(string const & in, CollapseStatus & status)
+InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
{
- status = InsetCollapsable::Collapsed;
if (in.empty())
- return;
-
+ return Collapsed;
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
-
- string name;
- lex >> name;
- if (name != "ert") {
- LYXERR0("InsetERT::string2params(" << in << ")\n"
- "Expected arg 1 to be \"ert\"\n");
- return;
- }
-
+ lex.setContext("InsetERT::string2params");
+ lex >> "ert";
int s;
lex >> s;
- if (lex)
- status = static_cast<InsetCollapsable::CollapseStatus>(s);
+ return static_cast<CollapseStatus>(s);
}