more cursor dispatch

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index aeb2d32a0c998cf2d7967af0a0080bcda745e9fe..8c19a3928f1964ee365bb4087dfe25b96af19bd5 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -20,8 +20,8 @@
 #include "lastfiles.h"
 #include "lyx_cb.h"
 #include "lyx_main.h"
+#include "output_latex.h"
 #include "paragraph.h"
-#include "TextCache.h"
 
 #include "frontends/Alert.h"
 
@@ -39,6 +39,9 @@ using lyx::support::OnlyFilename;
 using lyx::support::removeAutosaveFile;
 using lyx::support::prefixIs;
 
+using boost::bind;
+
+using std::auto_ptr;
 using std::endl;
 using std::find;
 using std::find_if;
@@ -119,12 +122,8 @@ void BufferList::release(Buffer * buf)
        BOOST_ASSERT(buf);
        BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf);
        if (it != bstore.end()) {
-               // Make sure that we don't store a LyXText in
-               // the textcache that points to the buffer
-               // we just deleted.
                Buffer * tmp = (*it);
                bstore.erase(it);
-               textcache.removeAllWithBuffer(tmp);
                delete tmp;
        }
 }
@@ -132,21 +131,17 @@ void BufferList::release(Buffer * buf)
 
 Buffer * BufferList::newBuffer(string const & s, bool ronly)
 {
-       Buffer * tmpbuf = new Buffer(s, ronly);
+       auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
        tmpbuf->params().useClassDefaults();
        lyxerr[Debug::INFO] << "Assigning to buffer "
                            << bstore.size() << endl;
-       bstore.push_back(tmpbuf);
-       return tmpbuf;
+       bstore.push_back(tmpbuf.get());
+       return tmpbuf.release();
 }
 
 
 void BufferList::closeAll()
 {
-       // Since we are closing we can just as well delete all
-       // in the textcache this will also speed the closing/quiting up a bit.
-       textcache.clear();
-
        while (!bstore.empty()) {
                close(bstore.front(), false);
        }
@@ -222,7 +217,7 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 
 
 void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
-                                       LatexRunParams const & runparams)
+                                       OutputParams const & runparams)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
@@ -242,7 +237,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
 void BufferList::emergencyWriteAll()
 {
        for_each(bstore.begin(), bstore.end(),
-                boost::bind(&BufferList::emergencyWrite, this, _1));
+                bind(&BufferList::emergencyWrite, this, _1));
 }