X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=0aac272208aa1f14764be006f0d5b766751e6d63;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=1bee03276b0cbdcc92230e6eb622e8a2825fff28;hpb=1447a7bf98fb691e9979fd3c7689adba4ed3f421;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index 1bee03276b..0aac272208 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -24,11 +24,14 @@ #include "support/ExceptionMessage.h" #include "support/debug.h" +#include "support/FileName.h" +#include "support/FileNameList.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" #include "support/Package.h" +#include "support/lassert.h" #include #include @@ -80,12 +83,12 @@ BufferList::const_iterator BufferList::end() const void BufferList::release(Buffer * buf) { - BOOST_ASSERT(buf); + LASSERT(buf, /**/); BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { Buffer * tmp = (*it); - BOOST_ASSERT(tmp); + LASSERT(tmp, /**/); bstore.erase(it); delete tmp; } @@ -95,7 +98,8 @@ void BufferList::release(Buffer * buf) Buffer * BufferList::newBuffer(string const & s, bool const ronly) { auto_ptr tmpbuf; - try { tmpbuf.reset(new Buffer(s, ronly)); + try { + tmpbuf.reset(new Buffer(s, ronly)); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); @@ -119,12 +123,13 @@ void BufferList::closeAll() } -vector const BufferList::getFileNames() const +FileNameList const & BufferList::fileNames() const { - vector nvec; + static FileNameList nvec; + nvec.clear(); transform(bstore.begin(), bstore.end(), back_inserter(nvec), - boost::bind(&Buffer::absFileName, _1)); + boost::bind(&Buffer::fileName, _1)); return nvec; } @@ -155,13 +160,13 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - BOOST_ASSERT(buf); + LASSERT(buf, /**/); if (bstore.empty()) return 0; BufferStorage::const_iterator it = find(bstore.begin(), bstore.end(), buf); - BOOST_ASSERT(it != bstore.end()); + LASSERT(it != bstore.end(), /**/); ++it; if (it == bstore.end()) return bstore.front(); @@ -172,13 +177,13 @@ Buffer * BufferList::next(Buffer const * buf) const Buffer * BufferList::previous(Buffer const * buf) const { - BOOST_ASSERT(buf); + LASSERT(buf, /**/); if (bstore.empty()) return 0; BufferStorage::const_iterator it = find(bstore.begin(), bstore.end(), buf); - BOOST_ASSERT(it != bstore.end()); + LASSERT(it != bstore.end(), /**/); if (it == bstore.begin()) return bstore.back(); else @@ -209,24 +214,23 @@ void BufferList::emergencyWriteAll() } -void BufferList::emergencyWrite(Buffer * buf) +docstring BufferList::emergencyWrite(Buffer * buf) { // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert // compare with 0 to avoid pointer/interger comparison // ::assert(buf != 0); if (!buf) - return; + return _("No file open!"); // No need to save if the buffer has not changed. if (buf->isClean()) - return; + return docstring(); string const doc = buf->isUnnamed() ? onlyFilename(buf->absFileName()) : buf->absFileName(); - lyxerr << to_utf8( - bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc))) - << endl; + docstring user_message = bformat( + _("LyX: Attempting to save document %1$s\n"), from_utf8(doc)); // We try to save three places: // 1) Same place as document. Unless it is an unnamed doc. @@ -236,10 +240,10 @@ void BufferList::emergencyWrite(Buffer * buf) lyxerr << " " << s << endl; if (buf->writeFile(FileName(s))) { buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } else { - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; + user_message += _(" Save failed! Trying...\n"); } } @@ -249,11 +253,11 @@ void BufferList::emergencyWrite(Buffer * buf) lyxerr << ' ' << s << endl; if (buf->writeFile(FileName(s))) { buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } - lyxerr << to_utf8(_(" Save failed! Trying...")) << endl; + user_message += _(" Save failed! Trying...\n"); // 3) In "/tmp" directory. // MakeAbsPath to prepend the current @@ -263,40 +267,34 @@ void BufferList::emergencyWrite(Buffer * buf) lyxerr << ' ' << s << endl; if (buf->writeFile(FileName(s))) { buf->markClean(); - lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl; - return; + user_message += _(" Save seems successful. Phew.\n"); + return user_message; } - lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl; + + user_message += _(" Save failed! Bummer. Document is lost."); + return user_message; } -bool BufferList::exists(string const & s) const +bool BufferList::exists(FileName const & fname) const { - return find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::absFileName, _1), - s)) - != bstore.end(); + return getBuffer(fname) != 0; } bool BufferList::isLoaded(Buffer const * b) const { - BOOST_ASSERT(b); + LASSERT(b, /**/); BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); } -Buffer * BufferList::getBuffer(string const & s) +Buffer * BufferList::getBuffer(support::FileName const & fname) const { - BufferStorage::iterator it = - find_if(bstore.begin(), bstore.end(), - bind(equal_to(), - bind(&Buffer::absFileName, _1), - s)); - + BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), + bind(equal_to(), bind(&Buffer::fileName, _1), fname)); return it != bstore.end() ? (*it) : 0; } @@ -321,15 +319,39 @@ void BufferList::setCurrentAuthor(docstring const & name, docstring const & emai } -int BufferList::bufferNum(string const & name) const +int BufferList::bufferNum(FileName const & fname) const { - vector buffers = getFileNames(); - vector::const_iterator cit = - find(buffers.begin(), buffers.end(), name); + FileNameList const & buffers = fileNames(); + FileNameList::const_iterator cit = + find(buffers.begin(), buffers.end(), fname); if (cit == buffers.end()) return 0; return int(cit - buffers.begin()); } +bool BufferList::releaseChild(Buffer * parent, Buffer * child) +{ + LASSERT(parent, return false); + LASSERT(child, return false); + LASSERT(parent->isChild(child), return false); + + // Child document has a different parent, don't close it. + if (child->parent() != parent) + return false; + + BufferStorage::iterator it = bstore.begin(); + BufferStorage::iterator end = bstore.end(); + for (; it != end; ++it) { + Buffer * buf = *it; + if (buf != parent && buf->isChild(child)) { + child->setParent(0); + return false; + } + } + release(child); + return true; +} + + } // namespace lyx