X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Ffiginset.h;h=178ddf4acf9bd6446d429d2c92284570dc16b8b9;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=3b0a2b3ab6b2f79003658df26b14bed7cd64cc7d;hpb=def72111a5ac739cf8c5377a67adeee64c37e1ab;p=lyx.git

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index 3b0a2b3ab6..178ddf4acf 100644
--- 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,33 +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;
-#ifndef USE_OSTREAM_ONLY
-	///
-	int Latex(string & file, signed char fragile) const;
+	int Latex(std::ostream &, bool fragile, bool free_space) const;
 	///
-	int Linuxdoc(string & file) const;
+	int Ascii(std::ostream &) const;
 	///
-	int DocBook(string & file) const;
-#else
+	int Linuxdoc(std::ostream &) const;
 	///
-	int Linuxdoc(ostream &) const;
-	///
-	int DocBook(ostream &) const;
-#endif
+	int DocBook(std::ostream &) const;
 	/// Updates needed features for this inset.
 	void Validate(LaTeXFeatures & features) const;
 
 	/// what appears in the minibuffer when opening
-	const char * EditMessage() const { return _("Opened figure"); }
+	char const * EditMessage() const;
+	
 	///
 	void Edit(BufferView *, int, int, unsigned int);
 	///
-	unsigned char Editable() const;
+	EDITABLE Editable() const;
 	///
 	bool Deletable() const;
 	///
@@ -131,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:
 
 	///