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

[lyx.git] / src / insets / insetlatexaccent.h

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 1c216479621e99add47b8322d963a6253c3c33e7..024ef9fe991589fec5d620569a5729934a279c80 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -8,8 +8,8 @@
  *
  *======================================================*/
 
-#ifndef _INSET_LATEX_ACCENT_H
-#define _INSET_LATEX_ACCENT_H
+#ifndef INSET_LATEX_ACCENT_H
+#define INSET_LATEX_ACCENT_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -32,7 +32,7 @@ public:
        ///
        InsetLatexAccent(); 
        ///
-       InsetLatexAccent(LString const & string);
+       InsetLatexAccent(string const & string);
        ///
        InsetLatexAccent(InsetLatexAccent const&);
        ///
@@ -55,11 +55,11 @@ public:
        ///
        int Latex(FILE *file, signed char fragile);
        ///
-       int Latex(LString &file, signed char fragile);
+       int Latex(string &file, signed char fragile);
        ///
-       int Linuxdoc(LString &file);
+       int Linuxdoc(string &file);
        ///
-       int DocBook(LString &file);
+       int DocBook(string &file);
        ///
        bool Deletable() const;
        ///
@@ -118,11 +118,12 @@ private:
                ///
                LSLASH
        };
-       
+
+       friend ostream & operator<<(ostream &, ACCENT_TYPES);
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
-       LString contents;
+       string contents;
        /// can display as proper char
        bool  candisp;
        /// modifier type