X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=29fabe9d84753de981221b0a90ce7bc0ca59c88e;hb=fdc1609e39461a297e092756ddd170c64208e183;hp=0ae822582e6718860291c1a7cacf929b2be2685a;hpb=92d522b7f1be6046adcac062c558bbf0bf021612;p=lyx.git diff --git a/src/bufferlist.C b/src/bufferlist.C index 0ae822582e..29fabe9d84 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -5,50 +5,50 @@ * * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include #include "bufferlist.h" -#include "lyx_main.h" -#include "lastfiles.h" + +#include "author.h" #include "buffer.h" +#include "bufferparams.h" #include "debug.h" -#include "lyxrc.h" -#include "lyxtext.h" -#include "lyx_cb.h" -#include "bufferview_funcs.h" -#include "BufferView.h" #include "gettext.h" -#include "frontends/LyXView.h" -#include "vc-backend.h" -#include "TextCache.h" -#include "lyxlex.h" +#include "lastfiles.h" +#include "lyx_cb.h" +#include "lyx_main.h" +#include "output_latex.h" +#include "paragraph.h" +#include "ParagraphList_fwd.h" #include "frontends/Alert.h" -#include "support/FileInfo.h" #include "support/filetools.h" -#include "support/lyxmanip.h" #include "support/lyxfunctional.h" -#include "support/LAssert.h" #include -#include -#include -#include - +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 namespace lyx::support; +using boost::bind; -using std::vector; -using std::find; +using std::auto_ptr; using std::endl; +using std::find; using std::find_if; using std::for_each; -using std::mem_fun; +using std::string; +using std::vector; BufferList::BufferList() @@ -70,9 +70,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf) file = MakeDisplayPath(buf->fileName(), 30); string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), file); + "Do you want to save the document or discard the changes?"), file); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { // FIXME: WriteAs can be asynch ! @@ -120,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; } } @@ -136,21 +132,17 @@ void BufferList::release(Buffer * buf) Buffer * BufferList::newBuffer(string const & s, bool ronly) { - Buffer * tmpbuf = new Buffer(s, ronly); - tmpbuf->params.useClassDefaults(); + auto_ptr 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); } @@ -159,10 +151,10 @@ 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()) { + if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) { release(buf); return true; } @@ -174,16 +166,16 @@ bool BufferList::close(Buffer * buf, bool ask) fname = MakeDisplayPath(buf->fileName(), 30); string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), fname); + "Do you want to save the document or discard the changes?"), fname); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { if (buf->isUnnamed()) { if (!WriteAs(buf)) return false; } else if (buf->save()) { - lastfiles->newFile(buf->fileName()); + LyX::ref().lastfiles().newFile(buf->fileName()); } else { return false; } @@ -226,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(); @@ -236,7 +228,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir, writefile += '/'; writefile += (*it)->getLatexName(); (*it)->makeLaTeXFile(writefile, mastertmpdir, - runparams, true); + runparams, false); (*it)->markDepClean(mastertmpdir); } } @@ -246,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)); } @@ -318,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(); @@ -335,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)); } }