X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=b509ae5874a451a85d11e8a4182482f47dde45a8;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=0a9a3e9f86201fb87eb052dfae1cc54978cb5584;hpb=12a3c703d16d64c5897c228dadc3cb179eafdf87;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 0a9a3e9f86..b509ae5874 100644
--- 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,44 +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
@@ -79,21 +59,6 @@ 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();
@@ -154,7 +119,7 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	BufferParams const & bp = cur.buffer().params();
 	LayoutPtr const layout =
-			bp.getTextClass().defaultLayout();
+			bp.getTextClass().emptyLayout();
 	//lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
 	switch (cmd.action) {
 
@@ -181,7 +146,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
@@ -224,8 +189,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetERT::setButtonLabel()
 {
-	// FIXME UNICODE
-	if (decoration() == Classic)
+	if (decoration() == Deco_Classic)
 		setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
 	else
 		setLabel(getNewLabel(_("ERT")));