pos=string::npos for regex not found, use handcoded transform in lstring.C, fix the...

[lyx.git] / src / insets / inseterror.C

diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C
index 1d4bd36a1d0d3420390fede4ed4d2e76092828d1..74c0cc7c793e953d00f6ba05b5fcd0af1f5a4562 100644 (file)
--- a/src/insets/inseterror.C
+++ b/src/insets/inseterror.C
@@ -6,7 +6,7 @@
  *         Copyright 1995 Matthias Ettrich
  *          Copyright 1995-1999 The LyX Team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 
@@ -14,7 +14,6 @@
 #pragma implementation
 #endif
 
-#include "definitions.h"
 #include "inseterror.h"
 #include "lyxdraw.h"
 #include "gettext.h"
@@ -27,6 +26,7 @@ InsetError::InsetError()
        form = 0;
 }
 
+
 InsetError::InsetError(string const & str)
        : contents(str)
 {
@@ -79,7 +79,7 @@ void InsetError::Draw(LyXFont font, LyXScreen & scr,
        x += 1;
        scr.fillRectangle(gc_lighted,
                          int(x), baseline - Ascent(font)+1,
-                         Width(font)-2,Ascent(font)+ Descent(font)-2);
+                         Width(font)-2, Ascent(font)+ Descent(font)-2);
        scr.drawRectangle(gc_foot,
                          int(x), baseline-Ascent(font)+1,
                          Width(font)-2, Ascent(font)+Descent(font)-2); 
@@ -89,16 +89,17 @@ void InsetError::Draw(LyXFont font, LyXScreen & scr,
 }
 
 
-void InsetError::Write(FILE *)
+void InsetError::Write(ostream &)
 {
 }
 
+
 void InsetError::Read(LyXLex &)
 {
 }
 
 
-int InsetError::Latex(FILE *, signed char /*fragile*/)
+int InsetError::Latex(ostream &, signed char /*fragile*/)
 {
        return 0;
 }
@@ -159,10 +160,11 @@ void InsetError::Edit(int, int)
        if (!form) {
                FL_OBJECT * obj;
                form = fl_bgn_form(FL_UP_BOX, ow, oh);
-               strobj = fl_add_box(FL_FRAME_BOX,10,10,380,180,"");
-               fl_set_object_color(strobj,FL_MCOL,FL_MCOL);
+               strobj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
+               fl_set_object_color(strobj, FL_MCOL, FL_MCOL);
                fl_set_object_gravity(strobj, FL_NorthWest, FL_SouthEast);
-               obj = fl_add_button(FL_RETURN_BUTTON,140,200,120,30,_("Close"));
+               obj = fl_add_button(FL_RETURN_BUTTON, 140, 200, 120, 30,
+                                   _("Close"));
                fl_set_object_callback(obj, C_InsetError_CloseErrorCB, 0);
                obj->u_vdata = this;
                fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
@@ -174,15 +176,14 @@ void InsetError::Edit(int, int)
        if (form->visible) {
                fl_raise_form(form);
        } else {
-               fl_show_form(form,FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER, 
-                            _("LaTeX Error"));
+               fl_show_form(form, FL_PLACE_MOUSE | FL_FREE_SIZE,
+                            FL_FULLBORDER, _("LaTeX Error"));
                fl_set_form_minsize(form, ow, oh);
        }
 }
 
 
-Inset* InsetError::Clone()
+Inset * InsetError::Clone() const
 {
-       InsetError * result = new InsetError(contents);
-       return result;
+       return new InsetError(contents);
 }