* Painter.h:

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 58a1c1874e7a98b750cb376136a06ab2bf1aea06..88867632e4fb8f0d13410f1983b3158987ccc9e7 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -25,7 +25,10 @@
 
 #include "support/lstrings.h"
 
-using lyx::support::split;
+
+namespace lyx {
+
+using support::split;
 
 using std::endl;
 using std::string;
@@ -202,21 +205,21 @@ TransManager::~TransManager()
 {}
 
 
-int TransManager::SetPrimary(string const & language)
+int TransManager::setPrimary(string const & language)
 {
-       if (t1_->GetName() == language)
+       if (t1_->getName() == language)
                return 0;
 
-       return t1_->Load(language);
+       return t1_->load(language);
 }
 
 
-int TransManager::SetSecondary(string const & language)
+int TransManager::setSecondary(string const & language)
 {
-       if (t2_->GetName() == language)
+       if (t2_->getName() == language)
                return 0;
 
-       return t2_->Load(language);
+       return t2_->load(language);
 }
 
 
@@ -226,31 +229,31 @@ bool TransManager::setCharset(string const & str)
 }
 
 
-void TransManager::EnablePrimary()
+void TransManager::enablePrimary()
 {
-       if (t1_->IsDefined())
+       if (t1_->isDefined())
                active_ = t1_.get();
 
        lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
 }
 
 
-void TransManager::EnableSecondary()
+void TransManager::enableSecondary()
 {
-       if (t2_->IsDefined())
+       if (t2_->isDefined())
                active_ = t2_.get();
        lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
 }
 
 
-void TransManager::DisableKeymap()
+void TransManager::disableKeymap()
 {
        active_ = &default_;
        lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
 }
 
 
-void  TransManager::TranslateAndInsert(char c, LyXText * text)
+void  TransManager::translateAndInsert(char c, LyXText * text)
 {
        string res = active_->process(c, *this);
 
@@ -286,7 +289,7 @@ void TransManager::insert(string const & str, LyXText * text)
                InsetLatexAccent ins(str);
                if (ins.canDisplay()) {
                        LCursor & cur = text->bv()->cursor();
-                       lyx::cap::replaceSelection(cur);
+                       cap::replaceSelection(cur);
                        cur.insert(new InsetLatexAccent(ins));
                        cur.posRight();
                } else {
@@ -321,6 +324,9 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
                insert(res, t);
        } else {
                // Go through the translation
-               TranslateAndInsert(c, t);
+               translateAndInsert(c, t);
        }
 }
+
+
+} // namespace lyx