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 43d29e2173b06d2b0f02393d698fefe87b56c9b3..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;
 
 ///
@@ -25,34 +24,36 @@ public:
        ///
        ~InsetFig();
        ///
-       int Ascent(LyXFont const & font) const;
+       int ascent(Painter &, LyXFont const & font) const;
        ///
-       int Descent(LyXFont const & font) const;
+       int descent(Painter &, LyXFont const & font) const;
        ///
-       int Width(LyXFont const & font) const;
+       int width(Painter &, LyXFont const & font) const;
        ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+       void draw(Painter &, LyXFont const & font,
+                 int baseline, float & x) const;
        ///
-       void Write(ostream &);
+       void Write(std::ostream &) const;
        ///
        void Read(LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile);
+       int Latex(std::ostream &, bool fragile, bool free_space) 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;
        /// 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;
        ///
@@ -116,19 +117,21 @@ public:
        float angle;
        
        /// graphics command, latex version
-       string cmd;
+       mutable string cmd;
        
        /// Caption for subfigure package
        string subcaption;
 
        /// various flags
        int flags;
-       bool subfigure : 1;
+       ///
+       bool subfigure;
        /// figure reference
        Figref * figure;
        /// temporary flags
        int pflags;
-       bool psubfigure : 1;
+       ///
+       bool psubfigure;
 private:
 
        ///
@@ -138,7 +141,7 @@ private:
        /// recompute screen params
        void Recompute();
        /// regenerate \includegraphics{} command
-       void Regenerate();
+       void Regenerate() const;
        /// regenerate \inlcudegraphics{} command in temporary buffer
        void TempRegenerate();
        /// get sizes from .eps file