X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.C;h=88b4190e48ee0d3922946376850910e04c3e089b;hb=068e2cfb25bfbab62f80bc0c776ca169032c2219;hp=e6fea7a4f340696d49aa0759b0edee915fc3e159;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index e6fea7a4f3..88b4190e48 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -205,14 +205,15 @@ TransFSM::TransFSM():
 
 // TransManager
 
+// Initialize static member.
+Trans TransManager::default_;
+
+
 TransManager::TransManager()
 	: active_(0), t1_(new Trans), t2_(new Trans)
 {}
 
 
-Trans * TransManager::default_ = new Trans;
-
-
 TransManager::~TransManager() 
 { 
 	delete t1_;
@@ -263,7 +264,7 @@ void TransManager::EnableSecondary()
 
 void TransManager::DisableKeymap()
 {
-	active_ = default_;
+	active_ = &default_;
 	lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
 }
 
@@ -284,9 +285,9 @@ void  TransManager::TranslateAndInsert(char c, LyXText * text)
 
 void TransManager::insertVerbatim(string const & str, LyXText * text)
 {	
-	int l = str.length();
+	string::size_type const l = str.length();
 	
-	for (int i = 0; i < l; ++i){
+	for (string::size_type i = 0; i < l; ++i) {
 		if (str[i] == '\"' 
 		    && text->GetFont(current_view->buffer(),text->cursor.par(),
 				     text->cursor.pos()).latex() == LyXFont::OFF
@@ -326,7 +327,7 @@ void TransManager::insert(string const & str, LyXText * text)
 
 void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
 {
-	if (c == 0 && active_ != default_) {
+	if (c == 0 && active_ != &default_) {
 		// A deadkey was pressed that cannot be printed
 		// or a accent command was typed in the minibuffer
 		KmodInfo i;
@@ -337,7 +338,7 @@ void TransManager::deadkey(char c, tex_accent accent, LyXText * t)
 		}
 	}
 	
-	if (active_ == default_ || c == 0) {
+	if (active_ == &default_ || c == 0) {
 		KmodInfo i;
 		i.accent = accent;
 		i.allowed = lyx_accent_table[accent].native;