X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.h;h=a6f6a05a1b4eee6822098524aa0bf22c7bb17ddd;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=3d75481725e43a59d8bf62c4bc12231027bda3c8;hpb=1eaa3eb913b16f4e6f5991b9c53b0b9ab3f84948;p=lyx.git

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 3d75481725..a6f6a05a1b 100644
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -18,8 +18,10 @@
 #include "insetbase.h"
 #include "dimension.h"
 
+
+namespace lyx {
+
 class LColor_color;
-class UpdatableInset;
 
 
 /// Insets
@@ -28,14 +30,12 @@ public:
 	///
 	enum {
 		///
-		TEXT_TO_INSET_OFFSET = 2
+		TEXT_TO_INSET_OFFSET = 4
 	};
 
 	///
 	InsetOld();
 	///
-	InsetOld(InsetOld const & in);
-	///
 	int ascent() const;
 	///
 	int descent() const;
@@ -43,41 +43,25 @@ public:
 	int width() const;
 
 	///
-	void setInsetName(std::string const & s) { name_ = s; }
-	///
-	std::string const & getInsetName() const { return name_; }
+	void setInsetName(docstring const & s) { name_ = s; }
 	///
-	void setOwner(UpdatableInset * inset) { owner_ = inset; }
-	///
-	UpdatableInset * owner() const { return owner_; }
+	virtual docstring const & getInsetName() const { return name_; }
 	///
 	virtual void setBackgroundColor(LColor_color);
 	///
 	LColor_color backgroundColor() const;
-	///
-	int x() const { return xo_; }
-	///
-	int y() const { return yo_; }
-	/// returns the actual scroll-value
-	virtual int scroll(bool recursive = true) const;
+	/// set x/y drawing position cache
+	void setPosCache(PainterInfo const &, int, int) const;
 
-	///
-	bool forceDefaultParagraphs(InsetBase const * inset) const;
 protected:
 	///
-	mutable int xo_;
-	///
-	mutable int yo_;
-	///
-	mutable int scx;
-	///
-	mutable Dimension dim_;
+	InsetOld(InsetOld const & in);
 
 private:
+	InsetOld & operator=(InsetOld const &) const;
+
 	///
-	UpdatableInset * owner_;
-	///
-	std::string name_;
+	docstring name_;
 	/** We store the LColor::color value as an int to get LColor.h out
 	 *  of the header file.
 	 */
@@ -85,15 +69,18 @@ private:
 };
 
 
-/** \c InsetOld_code is a wrapper for InsetOld::Code.
+/** \c InsetBase_code is a wrapper for InsetBase::Code.
  *  It can be forward-declared and passed as a function argument without
  *  having to expose inset.h.
  */
-class InsetOld_code {
-	InsetOld::Code val_;
+class InsetBase_code {
+	InsetBase::Code val_;
 public:
-	InsetOld_code(InsetOld::Code val) : val_(val) {}
-	operator InsetOld::Code() const { return val_; }
+	InsetBase_code(InsetBase::Code val) : val_(val) {}
+	operator InsetBase::Code() const { return val_; }
 };
 
+
+} // namespace lyx
+
 #endif