removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / trans_mgr.C

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 68741a44114565528939049b47aa7ea8cd5a9594..b11eb6107a1e57fd5b27032393bb077c92e02921 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -4,12 +4,12 @@
 #pragma implementation "trans_mgr.h"
 #endif
 
-#include <assert.h>
+//#include <cassert>
 #include "trans_mgr.h"
 #include "trans.h"
 #include "lyxtext.h"
 #include "LString.h"
-#include "error.h"
+#include "debug.h"
 #include "chset.h"
 #include "insets/insetlatexaccent.h"
 #include "BufferView.h"
@@ -282,7 +282,7 @@ void TransManager::EnablePrimary()
     if (t1_->IsDefined())
        active_=t1_;
 
-    lyxerr.debug("Enabling primary keymap",Error::KBMAP);
+    lyxerr[Debug::KBMAP] << "Enabling primary keymap" << endl;
 }
 
 
@@ -290,14 +290,14 @@ void TransManager::EnableSecondary()
 {
     if (t2_->IsDefined( ))
        active_=t2_;
-    lyxerr.debug("Enabling secondary keymap",Error::KBMAP);
+    lyxerr[Debug::KBMAP] << "Enabling secondary keymap" << endl;
 }
 
 
 void TransManager::DisableKeymap()
 {
     active_=default_;
-    lyxerr.debug("Disabling keymap",Error::KBMAP);
+    lyxerr[Debug::KBMAP] << "Disabling keymap" << endl;
 }
 
 
@@ -381,7 +381,7 @@ void TransManager::deadkey(char c,tex_accent accent,LyXText *t)
     if (active_==default_ || c==0) {
        i.accent=accent;
        i.allowed=lyx_accent_table[accent].native;
-       i.data.erase();
+       i.data.clear();
        i.exception_list=0;
        
        string res=trans_fsm_.currentState->deadkey(c,i);