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

[lyx.git] / src / mathed / formula.C

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 277b11af3f5c04a2afa3f49713cd36a241d96e57..e36ba7e85ed49de98efdf22a3f28617f61ebad75 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -36,7 +36,7 @@
 #include "lyxtext.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "error.h"
+#include "debug.h"
 #include "lyx_gui_misc.h"
 
 extern void UpdateInset(Inset* inset, bool mark_dirty = true);
@@ -153,7 +153,7 @@ LyXFont WhichFont(short type, int size)
        f.decSize();
        break;
      default:
-       fprintf(stderr, "Mathed Error: wrong font size: %d\n", size);
+            lyxerr << "Mathed Error: wrong font size: " << size << endl;
        break;
     }
     
@@ -589,7 +589,7 @@ void InsetFormula::SetDisplay(bool dspf)
         par->SetType(LM_OT_MIN);
         par->SetStyle(LM_ST_TEXT);
         if (!label.empty() && par->GetType()!=LM_OT_MPARN) {
-                label.erase();
+                label.clear();
         }
       }
       disp_flag = dspf;
@@ -700,7 +700,7 @@ void InsetFormula::InsetMotionNotify(int x, int y, int /*button*/)
 
 void InsetFormula::InsetKeyPress(XKeyEvent *)
 {
-   lyxerr.debug("Used InsetFormula::InsetKeyPress.", Error::MATHED);
+       lyxerr[Debug::MATHED] << "Used InsetFormula::InsetKeyPress." << endl;
 }
 
 // Special Mathed functions
@@ -890,7 +890,7 @@ bool InsetFormula::LocalDispatch(int action, char const *arg)
          if (oldf) {
             type--;
             if (!label.empty()) {
-                    label.erase();
+                    label.clear();
             }
             minibuffer->Set(_("No number"));  
          } else {
@@ -1038,7 +1038,7 @@ bool InsetFormula::LocalDispatch(int action, char const *arg)
          }
          UpdateLocal();
        } else
-              label.erase();
+              label.clear();
               //label = 0;
        break;
     }
@@ -1081,7 +1081,7 @@ bool InsetFormula::LocalDispatch(int action, char const *arg)
             mathcursor->setAccent(0);
         }
         if (c==0) {      // Dead key, do nothing 
-            //fprintf(stderr, "deadkey");
+            //lyxerr << "deadkey" << endl;
             break;
         } 
         if (isalpha(c)) {
@@ -1097,7 +1097,7 @@ bool InsetFormula::LocalDispatch(int action, char const *arg)
               varcode =  MathIsAlphaFont(f) ?  (MathedTextCodes)f:LM_TC_VAR;
            }
 
-//          fprintf(stderr, "Varcode %d ", varcode);
+//          lyxerr << "Varcode << vardoce;
            mathcursor->Insert(c, (greek_kb_flag) ? LM_TC_SYMB: varcode);
            varcode = LM_TC_MIN;
            if (greek_kb_flag<2) greek_kb_flag = 0;
@@ -1170,7 +1170,7 @@ bool InsetFormula::LocalDispatch(int action, char const *arg)
           } 
         UpdateLocal();
       } else {
-       // fprintf(stderr, "Closed by action %d\n", action);
+       // lyxerr << "Closed by action " << action << endl;
        result =  false;
       }
    }