X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCharStyle.h;h=84e4349a5cf6a2fd2937789bf5815d9fef1241b6;hb=b81c90adeef28a836d9786671849401b747e350b;hp=1bd423cf03b0a7263860ce07e7dbfa4f3cbda66c;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetCharStyle.h b/src/insets/InsetCharStyle.h
index 1bd423cf03..84e4349a5c 100644
--- a/src/insets/InsetCharStyle.h
+++ b/src/insets/InsetCharStyle.h
@@ -14,7 +14,7 @@
 #define INSETCHARSTYLE_H
 
 #include "InsetCollapsable.h"
-#include "lyxtextclass.h"
+#include "TextClass.h"
 
 
 namespace lyx {
@@ -25,7 +25,7 @@ public:
 	///
 	void write(std::ostream & os) const;
 	///
-	void read(LyXLex & lex);
+	void read(Lexer & lex);
 	///
 	std::string type;
 	///
@@ -35,9 +35,9 @@ public:
 	///
 	std::string latexparam;
 	///
-	LyXFont font;
+	Font font;
 	///
-	LyXFont labelfont;
+	Font labelfont;
 	///
 	bool show_label;
 };
@@ -52,6 +52,8 @@ public:
 	InsetCharStyle(BufferParams const &, std::string const);
 	///
 	InsetCharStyle(BufferParams const &, CharStyles::iterator);
+	///
+	docstring name() const { return from_ascii("CharStyle"); }
 	/// Is this character style defined in the document's textclass?
 	/// May be wrong after textclass change or paste from another document
 	bool undefined() const;
@@ -62,28 +64,28 @@ public:
 	///
 	virtual docstring const editMessage() const;
 	///
-	InsetBase::Code lyxCode() const { return InsetBase::CHARSTYLE_CODE; }
+	Inset::Code lyxCode() const { return Inset::CHARSTYLE_CODE; }
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
-	void read(Buffer const & buf, LyXLex & lex);
+	void read(Buffer const & buf, Lexer & lex);
 	///
 	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo &, int, int) const;
 	///
-	void getDrawFont(LyXFont &) const;
+	void getDrawFont(Font &) const;
 	///
 	bool forceDefaultParagraphs(idx_type) const { return true; }
 	///
 	int latex(Buffer const &, odocstream &,
-	          OutputParams const &) const;
+		  OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &,
-	              OutputParams const &) const;
+		      OutputParams const &) const;
 	///
 	int docbook(Buffer const &, odocstream &,
-	            OutputParams const &) const;
+		    OutputParams const &) const;
 	/// the string that is passed to the TOC
 	virtual void textString(Buffer const &, odocstream &) const;
 	///
@@ -97,14 +99,14 @@ public:
 
 protected:
 	InsetCharStyle(InsetCharStyle const &);
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
 private:
 	friend class InsetCharStyleParams;
 
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual std::auto_ptr<Inset> doClone() const;
 
 	/// used by the constructors
 	void init();