the spellcheck cleanup

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index e8930f9235ff241bf72f39b26cf9b0453e4e7622..297d9db89d2ebfe762e93a7a6e968e477c893454 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -14,20 +14,18 @@
 #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 "lyxrc.h"
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+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);
 
@@ -193,11 +191,9 @@ TransManager::TransManager()
 {}
 
 
+// For the sake of boost::scoped_ptr.
 TransManager::~TransManager()
-{
-       delete t1_;
-       delete t2_;
-}
+{}
 
 
 int TransManager::SetPrimary(string const & language)
@@ -227,7 +223,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;
 }
@@ -236,7 +232,7 @@ void TransManager::EnablePrimary()
 void TransManager::EnableSecondary()
 {
        if (t2_->IsDefined())
-               active_ = t2_;
+               active_ = t2_.get();
        lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
 }