*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#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 "lastfiles.h"
+#include "lyx_cb.h"
+#include "lyx_main.h"
+#include "paragraph.h"
#include "TextCache.h"
-#include "lyxlex.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 <boost/bind.hpp>
-#include <cassert>
-#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 namespace lyx::support;
-
-using std::vector;
-using std::find;
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()
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 !
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
Buffer * BufferList::newBuffer(string const & s, bool ronly)
{
Buffer * tmpbuf = new Buffer(s, ronly);
- tmpbuf->params.useClassDefaults();
+ tmpbuf->params().useClassDefaults();
lyxerr[Debug::INFO] << "Assigning to buffer "
<< bstore.size() << endl;
bstore.push_back(tmpbuf);
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;
}
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()) {
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();
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));
}
}