#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/filetools.h"
-#include "support/lyxfunctional.h"
+#include "support/package.h"
#include <boost/bind.hpp>
+#include <algorithm>
+#include <functional>
+
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::package;
using lyx::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;
BufferList::BufferList()
bool BufferList::quitWriteBuffer(Buffer * buf)
{
+ BOOST_ASSERT(buf);
+
string file;
if (buf->isUnnamed())
file = OnlyFilename(buf->fileName());
else
file = MakeDisplayPath(buf->fileName(), 30);
- string text = bformat(_("The document %1$s has unsaved changes.\n\n"
- "Do you want to save the document or discard the changes?"), file);
+ string 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"));
void BufferList::release(Buffer * buf)
{
BOOST_ASSERT(buf);
- BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf);
+ BufferStorage::iterator const it =
+ find(bstore.begin(), bstore.end(), buf);
if (it != bstore.end()) {
Buffer * tmp = (*it);
+ BOOST_ASSERT(tmp);
bstore.erase(it);
delete tmp;
}
}
-Buffer * BufferList::newBuffer(string const & s, bool ronly)
+Buffer * BufferList::newBuffer(string const & s, bool const 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();
}
}
-bool BufferList::close(Buffer * buf, bool ask)
+bool BufferList::close(Buffer * buf, bool const ask)
{
BOOST_ASSERT(buf);
else
fname = MakeDisplayPath(buf->fileName(), 30);
- string text = bformat(_("The document %1$s has unsaved changes.\n\n"
- "Do you want to save the document or discard the changes?"), fname);
+ string 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"));
vector<string> const BufferList::getFileNames() const
{
vector<string> nvec;
- std::copy(bstore.begin(), bstore.end(),
- lyx::back_inserter_fun(nvec, &Buffer::fileName));
+ transform(bstore.begin(), bstore.end(),
+ back_inserter(nvec),
+ boost::bind(&Buffer::fileName, _1));
return nvec;
}
}
-Buffer * BufferList::getBuffer(unsigned int choice)
+Buffer * BufferList::getBuffer(unsigned int const choice)
{
if (choice >= bstore.size())
return 0;
}
+Buffer * BufferList::next(Buffer const * buf) const
+{
+ BOOST_ASSERT(buf);
+
+ if (bstore.empty())
+ return 0;
+ BufferStorage::const_iterator it = find(bstore.begin(),
+ bstore.end(), buf);
+ BOOST_ASSERT(it != bstore.end());
+ ++it;
+ if (it == bstore.end())
+ return bstore.front();
+ else
+ return *it;
+}
+
+
+Buffer * BufferList::previous(Buffer const * buf) const
+{
+ BOOST_ASSERT(buf);
+
+ if (bstore.empty())
+ return 0;
+ BufferStorage::const_iterator it = find(bstore.begin(),
+ bstore.end(), buf);
+ BOOST_ASSERT(it != bstore.end());
+ if (it == bstore.begin())
+ return bstore.back();
+ else
+ return *(it - 1);
+}
+
+
void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
- LatexRunParams const & runparams)
+ OutputParams const & runparams)
{
BufferStorage::iterator it = bstore.begin();
BufferStorage::iterator end = bstore.end();
void BufferList::emergencyWriteAll()
{
for_each(bstore.begin(), bstore.end(),
- boost::bind(&BufferList::emergencyWrite, this, _1));
+ bind(&BufferList::emergencyWrite, this, _1));
}
void BufferList::emergencyWrite(Buffer * buf)
{
- // assert(buf) // this is not good since C assert takes an int
- // and a pointer is a long (JMarc)
- assert(buf != 0); // use c assert to avoid a loop
-
+ // Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert
+ // compare with 0 to avoid pointer/interger comparison
+ assert(buf != 0);
// No need to save if the buffer has not changed.
if (buf->isClean())
}
// 2) In HOME directory.
- string s = AddName(GetEnvPath("HOME"), buf->fileName());
+ string s = AddName(package().home_dir(), buf->fileName());
s += ".emergency";
lyxerr << ' ' << s << endl;
if (buf->writeFile(s)) {
bool BufferList::exists(string const & s) const
{
return find_if(bstore.begin(), bstore.end(),
- lyx::compare_memfun(&Buffer::fileName, s))
+ bind(equal_to<string>(),
+ bind(&Buffer::fileName, _1),
+ s))
!= bstore.end();
}
{
BufferStorage::iterator it =
find_if(bstore.begin(), bstore.end(),
- lyx::compare_memfun(&Buffer::fileName, s));
+ bind(equal_to<string>(),
+ bind(&Buffer::fileName, _1),
+ s));
+
return it != bstore.end() ? (*it) : 0;
}