#include <config.h>
#include "trans_mgr.h"
-#include "trans.h"
-#include "lyxtext.h"
+
+#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
-#include "insets/insetlatexaccent.h"
#include "lyxrc.h"
+#include "lyxtext.h"
+#include "trans.h"
+
+#include "insets/insetlatexaccent.h"
+
#include "support/lstrings.h"
using lyx::support::split;
{}
+// For the sake of boost::scoped_ptr.
TransManager::~TransManager()
-{
- delete t1_;
- delete t2_;
-}
+{}
int TransManager::SetPrimary(string const & language)
void TransManager::EnablePrimary()
{
if (t1_->IsDefined())
- active_ = t1_;
+ active_ = t1_.get();
lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
}
void TransManager::EnableSecondary()
{
if (t2_->IsDefined())
- active_ = t2_;
+ active_ = t2_.get();
lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
}
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(str[i]);
- }
+ for (string::size_type i = 0, n = str.size(); i < n; ++i)
+ text->insertChar(text->bv()->cursor(), str[i]);
}
// Could not find an encoding
InsetLatexAccent ins(str);
if (ins.canDisplay()) {
- text->insertInset(
- 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);
}