X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.h;h=449d0f19ed2e01e35decdb75918c5829dbd68df3;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=c271b9f331c85cd096162ae4e04fbb64d002eef3;hpb=cfdd73ea94c3cc0058459d67b1c62fabd31fbeb1;p=lyx.git

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index c271b9f331..449d0f19ed 100644
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -30,9 +30,9 @@ public:
 	///
 	InsetCommand();
 	///
+	explicit
 	InsetCommand(string const & name, string const & arg = string(), 
 		     string const & opt = string());
-#ifdef USE_PAINTER
 	///
 	int ascent(Painter &, LyXFont const &) const;
 	///
@@ -41,30 +41,21 @@ 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;
 	/// Parse the command.
 	void scanCommand(string const & cmd);
 	/// Will not be used when lyxf3
 	void Read(LyXLex & lex);
 	/// 
-	virtual int Latex(ostream &, signed char fragile);
+	virtual int Latex(std::ostream &,
+			  bool fragile, bool free_spc) const;
 	///
-	virtual int Latex(string & file, signed char fragile);
+	int Ascii(std::ostream &) const;
 	///
-	virtual int Linuxdoc(string & file);
+	virtual int Linuxdoc(std::ostream &) const;
 	///
-	virtual int DocBook(string & file);
+	virtual int DocBook(std::ostream &) const;
 	///
 	Inset * Clone() const;
 	///