X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.h;h=38842be83cb0fa6f2ad81e5920912abf2a170f8e;hb=1cbac6fcb40d6e0803198624c047769adec2fe09;hp=0f876be44e51d471025f88d585e75e30ac2f4636;hpb=c07bd1ab524f3154ba0b549ac7847a0354caf11e;p=lyx.git

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 0f876be44e..38842be83c 100644
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -16,16 +16,12 @@
 
 #include "Dimension.h"
 
-#include "support/types.h"
-
 #include <map>
 
 namespace lyx {
 
 class Inset;
-class Text;
 class MathData;
-class Paragraph;
 
 void lyxbreaker(void const * data, const char * hint, int size);
 
@@ -161,9 +157,6 @@ private:
 
 	typedef std::map<T const *, Geometry> cache_type;
 	cache_type data_;
-
-public:
-	cache_type const & getData() const { return data_; }
 };
 
 /**
@@ -172,10 +165,10 @@ public:
  * All points cached in this cache are only valid between subsequent
  * updates. (x,y) == (0,0) is the upper left screen corner, x increases
  * to the right, y increases downwords.
- * The dimension part is built in BufferView::updateMetrics() and the 
+ * The dimension part is built in BufferView::updateMetrics() and the
  * diverse Inset::metrics() calls.
  * The individual points are added at drawing time in
- * BufferView::updateMetrics(). The math inset position are cached in
+ * BufferView::draw(). The math inset position are cached in
  * the diverse InsetMathXXX::draw() calls and the in-text inset position
  * are cached in RowPainter::paintInset().
  * FIXME: For mathed, it would be nice if the insets did not saves their
@@ -187,19 +180,21 @@ public:
 	void clear();
 
 	/// A map from MathData to position on the screen
-	CoordCacheBase<MathData> & arrays() { return arrays_; }
-	CoordCacheBase<MathData> const & getArrays() const { return arrays_; }
+	typedef CoordCacheBase<MathData> Arrays;
+	Arrays & arrays() { return arrays_; }
+	Arrays const & getArrays() const { return arrays_; }
 	/// A map from insets to positions on the screen
-	CoordCacheBase<Inset> & insets() { return insets_; }
-	CoordCacheBase<Inset> const & getInsets() const { return insets_; }
+	typedef CoordCacheBase<Inset> Insets;
+	Insets & insets() { return insets_; }
+	Insets const & getInsets() const { return insets_; }
 
 	/// Dump the contents of the cache to lyxerr in debugging form
 	void dump() const;
 private:
 	/// MathDatas
-	CoordCacheBase<MathData> arrays_;
+	Arrays arrays_;
 	// All insets
-	CoordCacheBase<Inset> insets_;
+	Insets insets_;
 };
 
 } // namespace lyx