add nls.m4

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 36ca2e4143c593eb9c99387ef08a99e4c35233bb..29fabe9d84753de981221b0a90ce7bc0ca59c88e 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -12,6 +12,7 @@
 
 #include "bufferlist.h"
 
+#include "author.h"
 #include "buffer.h"
 #include "bufferparams.h"
 #include "debug.h"
@@ -19,24 +20,34 @@
 #include "lastfiles.h"
 #include "lyx_cb.h"
 #include "lyx_main.h"
+#include "output_latex.h"
 #include "paragraph.h"
-#include "TextCache.h"
+#include "ParagraphList_fwd.h"
 
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
-#include "support/LAssert.h"
 #include "support/lyxfunctional.h"
 
 #include <boost/bind.hpp>
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::GetEnvPath;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+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;
 using std::for_each;
-
+using std::string;
 using std::vector;
 
 
@@ -109,15 +120,11 @@ bool BufferList::quitWriteAll()
 
 void BufferList::release(Buffer * buf)
 {
-       Assert(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;
        }
 }
@@ -125,21 +132,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);
        }
@@ -148,7 +151,7 @@ void BufferList::closeAll()
 
 bool BufferList::close(Buffer * buf, bool ask)
 {
-       Assert(buf);
+       BOOST_ASSERT(buf);
 
        // FIXME: is the quitting check still necessary ?
        if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) {
@@ -172,7 +175,7 @@ bool BufferList::close(Buffer * buf, bool ask)
                        if (!WriteAs(buf))
                                return false;
                } else if (buf->save()) {
-                       lastfiles->newFile(buf->fileName());
+                       LyX::ref().lastfiles().newFile(buf->fileName());
                } else {
                        return false;
                }
@@ -215,7 +218,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();
@@ -235,7 +238,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));
 }
 
 
@@ -307,8 +310,7 @@ bool BufferList::exists(string const & s) const
 
 bool BufferList::isLoaded(Buffer const * b) const
 {
-       Assert(b);
-       
+       BOOST_ASSERT(b);
        BufferStorage::const_iterator cit =
                find(bstore.begin(), bstore.end(), b);
        return cit != bstore.end();
@@ -324,11 +326,22 @@ Buffer * BufferList::getBuffer(string const & s)
 }
 
 
+Buffer * BufferList::getBufferFromTmp(string const & s)
+{
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it < end; ++it)
+               if (prefixIs(s, (*it)->temppath()))
+                       return *it;
+       return 0;
+}
+
+
 void BufferList::setCurrentAuthor(string const & name, string const & email)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it) {
-               (*it)->authors().record(0, Author(name, email));
+               (*it)->params().authors().record(0, Author(name, email));
        }
 }