X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=2ae3df66871419a7450d8f7a8e690c61e7c547fc;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=174dd2cc6e4ff1b75c7563962ac7d5f5d47fd577;hpb=82dca177a33efe1e8482f31655af9c3c69c39c96;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 174dd2cc6e..2ae3df6687 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -27,7 +27,7 @@
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
-#include "support/os.h"
+#include "support/package.h"
 
 #include <boost/bind.hpp>
 
@@ -40,6 +40,7 @@ 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;
@@ -55,7 +56,6 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
-namespace os = lyx::support::os;
 
 BufferList::BufferList()
 {}
@@ -69,14 +69,17 @@ bool BufferList::empty() const
 
 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"));
 
@@ -127,16 +130,18 @@ bool BufferList::quitWriteAll()
 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)
 {
 	auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
 	tmpbuf->params().useClassDefaults();
@@ -155,7 +160,7 @@ void BufferList::closeAll()
 }
 
 
-bool BufferList::close(Buffer * buf, bool ask)
+bool BufferList::close(Buffer * buf, bool const ask)
 {
 	BOOST_ASSERT(buf);
 
@@ -171,8 +176,9 @@ bool BufferList::close(Buffer * buf, bool ask)
 	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"));
 
@@ -216,7 +222,7 @@ Buffer * BufferList::first()
 }
 
 
-Buffer * BufferList::getBuffer(unsigned int choice)
+Buffer * BufferList::getBuffer(unsigned int const choice)
 {
 	if (choice >= bstore.size())
 		return 0;
@@ -226,6 +232,8 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 
 Buffer * BufferList::next(Buffer const * buf) const
 {
+	BOOST_ASSERT(buf);
+
 	if (bstore.empty())
 		return 0;
 	BufferStorage::const_iterator it = find(bstore.begin(),
@@ -241,6 +249,8 @@ Buffer * BufferList::next(Buffer const * buf) const
 
 Buffer * BufferList::previous(Buffer const * buf) const
 {
+	BOOST_ASSERT(buf);
+
 	if (bstore.empty())
 		return 0;
 	BufferStorage::const_iterator it = find(bstore.begin(),
@@ -280,10 +290,9 @@ void BufferList::emergencyWriteAll()
 
 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())
@@ -310,7 +319,7 @@ void BufferList::emergencyWrite(Buffer * buf)
 	}
 
 	// 2) In HOME directory.
-	string s = AddName(os::homepath(), buf->fileName());
+	string s = AddName(package().home_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {