]> git.lyx.org Git - lyx.git/blobdiff - src/BufferList.cpp
remove unused code
[lyx.git] / src / BufferList.cpp
index ce7e095e8f6204c5ef1b7cbd5f3ab1b874819b60..c95616907a2f6cb9069eba5f97be1f34fceac521 100644 (file)
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
-#include "gettext.h"
 #include "Session.h"
-#include "callback.h"
 #include "LyX.h"
 #include "output_latex.h"
 #include "ParagraphList.h"
 
 #include "frontends/alert.h"
 
+#include "support/ExceptionMessage.h"
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Package.h"
 
+#include <boost/assert.hpp>
 #include <boost/bind.hpp>
 
 #include <algorithm>
 #include <functional>
 
-
-namespace lyx {
-
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::removeAutosaveFile;
-using support::package;
-using support::prefixIs;
-
 using boost::bind;
 
-using std::auto_ptr;
-using std::endl;
-using std::equal_to;
-using std::find;
-using std::find_if;
-using std::for_each;
-using std::string;
-using std::vector;
-using std::back_inserter;
-using std::transform;
+using namespace std;
+using namespace lyx::support;
+
+namespace lyx {
 
 namespace Alert = lyx::frontend::Alert;
 
@@ -95,76 +79,6 @@ BufferList::const_iterator BufferList::end() const
 }
 
 
-bool BufferList::quitWriteBuffer(Buffer * buf)
-{
-       BOOST_ASSERT(buf);
-
-       docstring file;
-       if (buf->isUnnamed())
-               file = from_utf8(onlyFilename(buf->fileName()));
-       else
-               file = makeDisplayPath(buf->fileName(), 30);
-
-       docstring const text =
-               bformat(_("The document %1$s has unsaved changes.\n\n"
-                                      "Do you want to save the document or discard the changes?"),
-                                          file);
-       int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
-
-       if (ret == 0) {
-               // FIXME: WriteAs can be asynch !
-               // but not right now...maybe we should remove that
-
-               bool succeeded;
-
-               if (buf->isUnnamed())
-                       succeeded = writeAs(buf);
-               else
-                       succeeded = menuWrite(buf);
-
-               if (!succeeded)
-                       return false;
-       } else if (ret == 1) {
-               // if we crash after this we could
-               // have no autosave file but I guess
-               // this is really inprobable (Jug)
-               if (buf->isUnnamed())
-                       removeAutosaveFile(buf->fileName());
-
-       } else {
-               return false;
-       }
-
-       return true;
-}
-
-
-bool BufferList::quitWriteAll()
-{
-       BufferStorage::iterator it = bstore.begin();
-       BufferStorage::iterator end = bstore.end();
-       for (; it != end; ++it) {
-               if ((*it)->isClean())
-                       continue;
-
-               if (!quitWriteBuffer(*it))
-                       return false;
-       }
-       // now, all buffers have been written sucessfully
-       // save file names to .lyx/session
-       it = bstore.begin();
-       for (; it != end; ++it) {
-               // if master/slave are both open, do not save slave since it
-               // will be automatically loaded when the master is loaded
-               if ((*it)->getMasterBuffer() == (*it))
-                       LyX::ref().session().lastOpened().add(FileName((*it)->fileName()));
-       }
-
-       return true;
-}
-
-
 void BufferList::release(Buffer * buf)
 {
        BOOST_ASSERT(buf);
@@ -181,10 +95,20 @@ void BufferList::release(Buffer * buf)
 
 Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
-       auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
+       auto_ptr<Buffer> tmpbuf;
+       try {
+               tmpbuf.reset(new Buffer(s, ronly));
+       } catch (ExceptionMessage const & message) {
+               if (message.type_ == ErrorException) {
+                       Alert::error(message.title_, message.details_);
+                       exit(1);
+               } else if (message.type_ == WarningException) {
+                       Alert::warning(message.title_, message.details_);
+                       return 0;
+               }
+       }
        tmpbuf->params().useClassDefaults();
-       LYXERR(Debug::INFO) << "Assigning to buffer "
-                           << bstore.size() << endl;
+       LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
        bstore.push_back(tmpbuf.get());
        return tmpbuf.release();
 }
@@ -192,51 +116,8 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 
 void BufferList::closeAll()
 {
-       while (!bstore.empty()) {
-               close(bstore.front(), false);
-       }
-}
-
-
-bool BufferList::close(Buffer * buf, bool const ask)
-{
-       BOOST_ASSERT(buf);
-
-       if (!ask || buf->isClean() || buf->paragraphs().empty()) {
-               release(buf);
-               return true;
-       }
-
-       docstring fname;
-       if (buf->isUnnamed())
-               fname = from_utf8(onlyFilename(buf->fileName()));
-       else
-               fname = makeDisplayPath(buf->fileName(), 30);
-
-       docstring const text =
-               bformat(_("The document %1$s has unsaved changes.\n\n"
-                                      "Do you want to save the document or discard the changes?"),
-                                          fname);
-       int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
-
-       if (ret == 0) {
-               if (buf->isUnnamed()) {
-                       if (!writeAs(buf))
-                               return false;
-               } else if (!menuWrite(buf))
-                       return false;
-               else
-                       return false;
-       } else if (ret == 2)
-               return false;
-
-       if (buf->isUnnamed()) {
-               removeAutosaveFile(buf->fileName());
-       }
-
-       release(buf);
-       return true;
+       while (!bstore.empty())
+               release(bstore.front());
 }
 
 
@@ -245,7 +126,7 @@ vector<string> const BufferList::getFileNames() const
        vector<string> nvec;
        transform(bstore.begin(), bstore.end(),
                  back_inserter(nvec),
-                 boost::bind(&Buffer::fileName, _1));
+                 boost::bind(&Buffer::absFileName, _1));
        return nvec;
 }
 
@@ -266,7 +147,7 @@ Buffer * BufferList::last()
 }
 
 
-Buffer * BufferList::getBuffer(unsigned int const choice)
+Buffer * BufferList::getBuffer(unsigned int choice)
 {
        if (choice >= bstore.size())
                return 0;
@@ -307,17 +188,17 @@ Buffer * BufferList::previous(Buffer const * buf) const
 }
 
 
-void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
+void BufferList::updateIncludedTeXfiles(string const & masterTmpDir,
                                        OutputParams const & runparams)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it) {
-               if (!(*it)->isDepClean(mastertmpdir)) {
-                       string writefile = addName(mastertmpdir, (*it)->getLatexName());
-                       (*it)->makeLaTeXFile(FileName(writefile), mastertmpdir,
+               if (!(*it)->isDepClean(masterTmpDir)) {
+                       string writefile = addName(masterTmpDir, (*it)->latexName());
+                       (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir,
                                             runparams, false);
-                       (*it)->markDepClean(mastertmpdir);
+                       (*it)->markDepClean(masterTmpDir);
                }
        }
 }
@@ -330,62 +211,65 @@ 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);
+       // ::assert(buf != 0);
+       if (!buf)
+               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->fileName()) : buf->fileName();
+               ? 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.
        if (!buf->isUnnamed()) {
-               string s = buf->fileName();
+               string s = buf->absFileName();
                s += ".emergency";
                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");
                }
        }
 
        // 2) In HOME directory.
-       string s = addName(package().home_dir().absFilename(), buf->fileName());
+       string s = addName(package().home_dir().absFilename(), buf->absFileName());
        s += ".emergency";
        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
        // drive letter on OS/2
-       s = addName(package().temp_dir().absFilename(), buf->fileName());
+       s = addName(package().temp_dir().absFilename(), buf->absFileName());
        s += ".emergency";
        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;
 }
 
 
@@ -393,7 +277,7 @@ bool BufferList::exists(string const & s) const
 {
        return find_if(bstore.begin(), bstore.end(),
                       bind(equal_to<string>(),
-                           bind(&Buffer::fileName, _1),
+                           bind(&Buffer::absFileName, _1),
                            s))
                != bstore.end();
 }
@@ -413,7 +297,7 @@ Buffer * BufferList::getBuffer(string const & s)
        BufferStorage::iterator it =
                find_if(bstore.begin(), bstore.end(),
                        bind(equal_to<string>(),
-                            bind(&Buffer::fileName, _1),
+                            bind(&Buffer::absFileName, _1),
                             s));
 
        return it != bstore.end() ? (*it) : 0;
@@ -435,9 +319,19 @@ void BufferList::setCurrentAuthor(docstring const & name, docstring const & emai
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
-       for (; it != end; ++it) {
+       for (; it != end; ++it)
                (*it)->params().authors().record(0, Author(name, email));
-       }
+}
+
+
+int BufferList::bufferNum(string const & name) const
+{
+       vector<string> buffers = getFileNames();
+       vector<string>::const_iterator cit =
+               find(buffers.begin(), buffers.end(), name);
+       if (cit == buffers.end())
+               return 0;
+       return int(cit - buffers.begin());
 }