X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextCache.h;h=b18aabf3ca7ebebc2abc03fea2e52588538c989e;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=457108540b9bf481aa73f66feb4403bebc2ae8d6;hpb=9ce32d63e5ff1dbf4c04e3d8263b2649ef3ac595;p=lyx.git

diff --git a/src/TextCache.h b/src/TextCache.h
index 457108540b..b18aabf3ca 100644
--- a/src/TextCache.h
+++ b/src/TextCache.h
@@ -18,11 +18,12 @@
 #pragma interface
 #endif
 
+#include <iosfwd>
+#include <map>
+
 #include "LString.h"
-#include "support/LOstream.h"
 #include "lyxtext.h"
-
-class Buffer;
+#include "buffer.h"
 
 // This is only the very first implemetation and use of the TextCache,
 // operations on it needs to be put into a class or a namespace, that part
@@ -111,21 +112,22 @@ class Buffer;
 class TextCache {
 public:
 	///
-	typedef vector<LyXText*> Cache;
+	typedef std::map<Buffer *, std::pair<int,LyXText *> > Cache;
+	
 	///
-	typedef LyXText * value_type;
+	typedef Cache::value_type value_type;
 
 	/** Returns a pointer to a LyXText that fits the provided buffer
 	    and width. Of there is no match 0 is returned. */
-	LyXText * findFit(Buffer * b, unsigned short p);
+	LyXText * findFit(Buffer * b, int p);
 	/** Lists all the LyXText's currently in the cache.
 	    Uses msg as header for the list. */
-	void show(ostream & o, string const & msg);
+	void show(std::ostream & o, string const & msg);
 	/// Gives info on a single LyXText (buffer and width)
-	static void show(ostream & o, LyXText const *);
+	static void show(std::ostream & o, value_type const &);
 	/** Adds a LyXText to the cache iff its buffer is
 	    present in bufferlist. */
-	void add(LyXText *);
+	void add(Buffer *, int witdth, LyXText *);
 	/** Clears the cache. Deletes all LyXText's and releases
 	    the allocated memory. */
 	void clear();
@@ -136,6 +138,6 @@ private:
 	Cache cache;
 };
 
-// bla bla
+///
 extern TextCache textcache;
 #endif