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

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

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index cba75e4f71861f384e01b118fe5d1fa11d0332c4..178ddf4acf9bd6446d429d2c92284570dc16b8b9 100644 (file)
--- a/src/insets/figinset.h
+++ b/src/insets/figinset.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /*
   figinset.h - Figure inset header - part of LyX project
-  (C)1996 by Ivan Schreter
+  Copyright 1996 by Ivan Schreter
   */
 
 #ifndef FIGINSET_H
@@ -14,7 +14,6 @@
 #include "insets/lyxinset.h"
 /* the rest is figure stuff */
 
-
 struct Figref;
 
 ///
@@ -34,26 +33,27 @@ public:
        void draw(Painter &, LyXFont const & font,
                  int baseline, float & x) const;
        ///
-       void Write(ostream &) const;
+       void Write(std::ostream &) const;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile) const;
+       int Latex(std::ostream &, bool fragile, bool free_space) const;
        ///
-       int Latex(string & file, signed char fragile) const;
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(string & file) const;
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(string & file) const;
+       int DocBook(std::ostream &) const;
        /// Updates needed features for this inset.
        void Validate(LaTeXFeatures & features) const;
 
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const { return _("Opened figure"); }
+       char const * EditMessage() const;
+       
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int, int, unsigned int);
        ///
-       unsigned char Editable() const;
+       EDITABLE Editable() const;
        ///
        bool Deletable() const;
        ///
@@ -124,12 +124,14 @@ public:
 
        /// various flags
        int flags;
-       bool subfigure : 1;
+       ///
+       bool subfigure;
        /// figure reference
        Figref * figure;
        /// temporary flags
        int pflags;
-       bool psubfigure : 1;
+       ///
+       bool psubfigure;
 private:
 
        ///