X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=ba9bb1e35fca87a347d251bfef5a8a79436537e3;hb=7f68b94d8a7fba6942890b7733403192b98b040a;hp=13561a04ffc52c361d41a6345c78bc6609be7f20;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 13561a04ff..ba9bb1e35f 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -1,23 +1,38 @@
+/**
+ * \file trans_mgr.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "trans_mgr.h"
-#include "trans.h"
-#include "lyxtext.h"
-#include "LString.h"
-#include "debug.h"
-#include "chset.h"
-#include "insets/insetlatexaccent.h"
+
 #include "BufferView.h"
-#include "buffer.h"
+#include "cursor.h"
+#include "debug.h"
 #include "lyxrc.h"
+#include "lyxtext.h"
+#include "trans.h"
+
+#include "insets/insetlatexaccent.h"
+
 #include "support/lstrings.h"
 
+using lyx::support::split;
+
 using std::endl;
+using std::string;
 using std::pair;
 
+
 extern string const DoAccent(string const &, tex_accent);
 extern string const DoAccent(char, tex_accent);
-extern BufferView * current_view;
 
 
 // TransFSMData
@@ -181,11 +196,9 @@ TransManager::TransManager()
 {}
 
 
+// For the sake of boost::scoped_ptr.
 TransManager::~TransManager()
-{
-	delete t1_;
-	delete t2_;
-}
+{}
 
 
 int TransManager::SetPrimary(string const & language)
@@ -215,7 +228,7 @@ bool TransManager::setCharset(string const & str)
 void TransManager::EnablePrimary()
 {
 	if (t1_->IsDefined())
-		active_ = t1_;
+		active_ = t1_.get();
 
 	lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
 }
@@ -224,7 +237,7 @@ void TransManager::EnablePrimary()
 void TransManager::EnableSecondary()
 {
 	if (t2_->IsDefined())
-		active_ = t2_;
+		active_ = t2_.get();
 	lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
 }
 
@@ -252,11 +265,8 @@ void  TransManager::TranslateAndInsert(char c, LyXText * text)
 
 void TransManager::insertVerbatim(string const & str, LyXText * text)
 {
-	string::size_type const l = str.length();
-
-	for (string::size_type i = 0; i < l; ++i) {
-		text->insertChar(current_view, str[i]);
-	}
+	for (string::size_type i = 0, n = str.size(); i < n; ++i)
+		text->insertChar(text->bv()->cursor(), str[i]);
 }
 
 
@@ -274,15 +284,13 @@ void TransManager::insert(string const & str, LyXText * text)
 		// Could not find an encoding
 		InsetLatexAccent ins(str);
 		if (ins.canDisplay()) {
-			text->insertInset(current_view,
-					  new InsetLatexAccent(ins));
+			text->bv()->cursor().insert(new InsetLatexAccent(ins));
 		} else {
 			insertVerbatim(str, text);
 		}
 		return;
 	}
-	string tmp;
-	tmp += static_cast<char>(enc.second);
+	string const tmp(1, static_cast<char>(enc.second));
 	insertVerbatim(tmp, text);
 }