remove unneeded functions

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 90afbc1fba149a13cde689fb2439862a05b88bd0..ba9bb1e35fca87a347d251bfef5a8a79436537e3 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -1,27 +1,38 @@
-#include <config.h>
+/**
+ * \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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation "trans_mgr.h"
-#endif
+#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
@@ -185,11 +196,9 @@ TransManager::TransManager()
 {}
 
 
+// For the sake of boost::scoped_ptr.
 TransManager::~TransManager()
-{
-       delete t1_;
-       delete t2_;
-}
+{}
 
 
 int TransManager::SetPrimary(string const & language)
@@ -219,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;
 }
@@ -228,7 +237,7 @@ void TransManager::EnablePrimary()
 void TransManager::EnableSecondary()
 {
        if (t2_->IsDefined())
-               active_ = t2_;
+               active_ = t2_.get();
        lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
 }
 
@@ -256,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]);
 }
 
 
@@ -278,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);
 }