Updates from Bennett and myself.

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 7ee22c652f07677b17417820512a245210bab9c3..ed824f93c4cacfd173e2f5d75cc533e39b40281a 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -34,15 +34,17 @@
 #include <algorithm>
 #include <functional>
 
-using lyx::docstring;
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::removeAutosaveFile;
-using lyx::support::package;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
 
 using boost::bind;
 
@@ -70,13 +72,37 @@ bool BufferList::empty() const
 }
 
 
+BufferList::iterator BufferList::begin()
+{
+       return bstore.begin();
+}
+
+
+BufferList::const_iterator BufferList::begin() const
+{
+       return bstore.begin();
+}
+
+
+BufferList::iterator BufferList::end()
+{
+       return bstore.end();
+}
+
+
+BufferList::const_iterator BufferList::end() const
+{
+       return bstore.end();
+}
+
+
 bool BufferList::quitWriteBuffer(Buffer * buf)
 {
        BOOST_ASSERT(buf);
 
        docstring file;
        if (buf->isUnnamed())
-               file = lyx::from_utf8(onlyFilename(buf->fileName()));
+               file = from_utf8(onlyFilename(buf->fileName()));
        else
                file = makeDisplayPath(buf->fileName(), 30);
 
@@ -133,7 +159,7 @@ bool BufferList::quitWriteAll()
                // 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().addLastOpenedFile((*it)->fileName());
+                       LyX::ref().session().lastOpened().add((*it)->fileName());
        }
 
        return true;
@@ -184,7 +210,7 @@ bool BufferList::close(Buffer * buf, bool const ask)
 
        docstring fname;
        if (buf->isUnnamed())
-               fname = lyx::from_utf8(onlyFilename(buf->fileName()));
+               fname = from_utf8(onlyFilename(buf->fileName()));
        else
                fname = makeDisplayPath(buf->fileName(), 30);
 
@@ -233,6 +259,14 @@ Buffer * BufferList::first()
 }
 
 
+Buffer * BufferList::last()
+{
+       if (bstore.empty())
+               return 0;
+       return bstore.back();
+}
+
+
 Buffer * BufferList::getBuffer(unsigned int const choice)
 {
        if (choice >= bstore.size())
@@ -312,8 +346,8 @@ void BufferList::emergencyWrite(Buffer * buf)
        string const doc = buf->isUnnamed()
                ? onlyFilename(buf->fileName()) : buf->fileName();
 
-       lyxerr << lyx::to_utf8(
-               bformat(_("LyX: Attempting to save document %1$s"), lyx::from_utf8(doc)))
+       lyxerr << to_utf8(
+               bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
                << endl;
 
        // We try to save three places:
@@ -324,10 +358,10 @@ void BufferList::emergencyWrite(Buffer * buf)
                lyxerr << "  " << s << endl;
                if (buf->writeFile(s)) {
                        buf->markClean();
-                       lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+                       lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                        return;
                } else {
-                       lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
+                       lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
                }
        }
 
@@ -337,11 +371,11 @@ void BufferList::emergencyWrite(Buffer * buf)
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(s)) {
                buf->markClean();
-               lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+               lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
        }
 
-       lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
+       lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
@@ -351,10 +385,10 @@ void BufferList::emergencyWrite(Buffer * buf)
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(s)) {
                buf->markClean();
-               lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+               lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
        }
-       lyxerr << lyx::to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
+       lyxerr << to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
 }
 
 
@@ -408,3 +442,6 @@ void BufferList::setCurrentAuthor(string const & name, string const & email)
                (*it)->params().authors().record(0, Author(name, email));
        }
 }
+
+
+} // namespace lyx