clear()->erase() ; lots of using directives for cxx

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

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index 164ff1085b2ab3d07f57bb3b0a53cbf1ef2c09a9..f8d5a20152e21b81e5020f8ea3e49be500417752 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1997 Asger Alstrup
+ *         Copyright 1997 Asger Alstrup
  *
  * ====================================================== */
 
@@ -33,14 +33,16 @@ public:
                /// End of sentence punctuation (\@)
                END_OF_SENTENCE,
                /// Menu separator
-               MENU_SEPARATOR
+               MENU_SEPARATOR,
+               /// Protected Separator
+               PROTECTED_SEPARATOR
        };
 
        ///
        InsetSpecialChar() {}
        ///
+       explicit
        InsetSpecialChar(Kind k);
-#ifdef USE_PAINTER
        ///
        int ascent(Painter &, LyXFont const &) const;
        ///
@@ -49,34 +51,24 @@ public:
        int width(Painter &, LyXFont const &) const;
        ///
        void draw(Painter &, LyXFont const &, int baseline, float & x) const;
-#else
        ///
-       int Ascent(LyXFont const & font) const;
-       ///
-       int Descent(LyXFont const & font) const;
-       ///
-       int Width(LyXFont const & font) const;
-       ///
-       void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
-#endif
-       ///
-       void Write(ostream &);
+       void Write(std::ostream &) const;
        /// Will not be used when lyxf3
        void Read(LyXLex & lex);
        /// 
-       int Latex(ostream &, signed char fragile);
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Latex(string & file, signed char fragile);
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(string & file);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(string & file);
+       int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
        ///  
        Inset::Code LyxCode() const
        {
-               return Inset::NO_CODE;
+               return Inset::SPECIALCHAR_CODE;
        }
        /// We don't need \begin_inset and \end_inset
        bool DirectWrite() const