remove unneeded functions

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index fa077ce907cd9284c88f69a83542b812ea8f0fec..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
@@ -70,7 +81,7 @@ TransDeadkeyState::TransDeadkeyState()
 string const TransDeadkeyState::normalkey(char c)
 {
        string res;
-       
+
        KmodException::iterator it = deadkey_info_.exception_list.begin();
        KmodException::iterator end = deadkey_info_.exception_list.end();
 
@@ -91,7 +102,7 @@ string const TransDeadkeyState::normalkey(char c)
 string const TransDeadkeyState::deadkey(char c, KmodInfo d)
 {
        string res;
-       
+
        // Check if the same deadkey was typed twice
        if (deadkey_ == c) {
                res = deadkey_;
@@ -100,7 +111,7 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
                currentState = init_state_;
                return res;
        }
-       
+
        // Check if it is a combination or an exception
        KmodException::const_iterator cit = deadkey_info_.exception_list.begin();
        KmodException::const_iterator end = deadkey_info_.exception_list.end();
@@ -121,9 +132,9 @@ string const TransDeadkeyState::deadkey(char c, KmodInfo d)
                }
        }
 
-       // Not a combination or an exception. 
+       // Not a combination or an exception.
        // Output deadkey1 and keep deadkey2
-       
+
        if (deadkey_!= 0)
                res = deadkey_;
        deadkey_ = c;
@@ -185,18 +196,16 @@ TransManager::TransManager()
 {}
 
 
-TransManager::~TransManager() 
-{ 
-       delete t1_;
-       delete t2_;
-}
+// For the sake of boost::scoped_ptr.
+TransManager::~TransManager()
+{}
 
 
 int TransManager::SetPrimary(string const & language)
 {
-       if (t1_->GetName() == language) 
+       if (t1_->GetName() == language)
                return 0;
-       
+
        return t1_->Load(language);
 }
 
@@ -205,7 +214,7 @@ int TransManager::SetSecondary(string const & language)
 {
        if (t2_->GetName() == language)
                return 0;
-       
+
        return t2_->Load(language);
 }
 
@@ -219,8 +228,8 @@ 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;
 }
 
@@ -243,10 +252,10 @@ void TransManager::DisableKeymap()
 void  TransManager::TranslateAndInsert(char c, LyXText * text)
 {
        string res = active_->process(c, *this);
-       
+
        // Process with tokens
        string temp;
-       
+
        while (res.length() > 0) {
                res = split(res, temp, TransState::TOKEN_SEP);
                insert(temp, text);
@@ -255,38 +264,33 @@ 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]);
 }
 
 
 void TransManager::insert(string const & str, LyXText * text)
 {
-       // Go through the character encoding only if the current 
+       // Go through the character encoding only if the current
        // encoding (chset_->name()) matches the current font_norm
        // (lyrxc->font_norm)
-       
+
        // Is false to speak about "only if" the current encoding will
        // almost always be equal to font_norm.
        pair<bool, int> enc = chset_.encodeString(str);
-       if (chset_.getName() != lyxrc.font_norm || 
+       if (chset_.getName() != lyxrc.font_norm ||
            !enc.first) {
                // 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);
 }
 
@@ -304,7 +308,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                        return;
                }
        }
-       
+
        if (active_ == &default_ || c == 0) {
                KmodInfo i;
                i.accent = accent;