X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.h;h=c5a6bba0524e720ff75c7adf2897797f8ab5ad5a;hb=b81c90adeef28a836d9786671849401b747e350b;hp=478d0ad5f1ad5c31aaedb5816d6a33d4dfc79380;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 478d0ad5f1..c5a6bba052 100644
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -28,7 +28,7 @@ class RenderGraphic;
 class LaTeXFeatures;
 
 ///
-class InsetGraphics : public InsetOld, public boost::signals::trackable {
+class InsetGraphics : public Inset, public boost::signals::trackable {
 public:
 	///
 	InsetGraphics();
@@ -41,20 +41,20 @@ public:
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
-	void read(Buffer const &, LyXLex & lex);
+	void read(Buffer const &, Lexer & lex);
 
 	/** returns the number of rows (\n's) of generated tex code.
 	 #fragile == true# means, that the inset should take care about
 	 fragile commands by adding a #\protect# before.
 	 */
 	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;
 
 	/** Tell LyX what the latex features you need i.e. what latex packages
 	    you need to be included.
@@ -62,7 +62,7 @@ public:
 	void validate(LaTeXFeatures & features) const;
 
 	/// returns LyX code associated with the inset. Used for TOC, ...)
-	InsetBase::Code lyxCode() const { return InsetBase::GRAPHICS_CODE; }
+	Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
 
 	/** Set the inset parameters, used by the GUIndependent dialog.
 	    Return true of new params are different from what was so far.
@@ -74,29 +74,29 @@ public:
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void edit(LCursor & cur, bool left);
+	void edit(Cursor & cur, bool left);
 	///
 	void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
 	///
-	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 protected:
 	InsetGraphics(InsetGraphics const &);
 	///
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
 	friend class InsetGraphicsMailer;
 
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual std::auto_ptr<Inset> doClone() const;
 
 	/// Read the inset native format
-	void readInsetGraphics(LyXLex & lex, std::string const & bufpath);
+	void readInsetGraphics(Lexer & lex, std::string const & bufpath);
 
 	/// Get the status message, depends on the image loading status.
 	std::string const statusMessage() const;
 	/// Create the options for the latex command.
 	std::string const createLatexOptions() const;
 	/// Create length values for docbook export.
-	docstring const toDocbookLength(LyXLength const & len) const;
+	docstring const toDocbookLength(Length const & len) const;
 	/// Create the atributes for docbook export.
 	docstring const createDocBookAttributes() const;
 	/// Convert the file if needed, and return the location of the file.
@@ -118,7 +118,7 @@ public:
 	///
 	InsetGraphicsMailer(InsetGraphics & inset);
 	///
-	virtual InsetBase & inset() const { return inset_; }
+	virtual Inset & inset() const { return inset_; }
 	///
 	virtual std::string const & name() const { return name_; }
 	///