X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1ccb263014651595f417bb099d9ea820c8a4b522;hb=bea9d2f3f774d62aa48fe83ebbefdd0e7d5f85b9;hp=2ef57687712da88e5871325f721f4c57e0063968;hpb=da67bde61af6dfecef7a237b72b878fe30638a81;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2ef5768771..1ccb263014 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -664,7 +664,6 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const
 		buffer_clone->setChild(dit, child_clone);
 	}
 	buffer_clone->d->macro_lock = false;
-	return;
 }
 
 
@@ -1549,9 +1548,8 @@ bool Buffer::save() const
 		// time stamp is invalidated by copying/moving
 		saveCheckSum();
 		markClean();
-		if (d->file_format != LYX_FORMAT)
-			// the file associated with this buffer is now in the current format
-			d->file_format = LYX_FORMAT;
+		// the file associated with this buffer is now in the current format
+		d->file_format = LYX_FORMAT;
 		return true;
 	}
 	// else we saved the file, but failed to move it to the right location.
@@ -1905,9 +1903,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 			docstring uncodable_glyphs;
 			Encoding const * const enc = runparams.encoding;
 			if (enc) {
-				for (size_t n = 0; n < inputpath.size(); ++n) {
-					if (!enc->encodable(inputpath[n])) {
-						docstring const glyph(1, inputpath[n]);
+				for (char_type n : inputpath) {
+					if (!enc->encodable(n)) {
+						docstring const glyph(1, n);
 						LYXERR0("Uncodable character '"
 							<< glyph
 							<< "' in input path!");
@@ -4011,10 +4009,7 @@ InsetLabel const * Buffer::insetLabel(docstring const & label,
 
 bool Buffer::activeLabel(docstring const & label) const
 {
-	if (!insetLabel(label, true))
-		return false;
-
-	return true;
+	return insetLabel(label, true) != nullptr;
 }
 
 
@@ -4469,7 +4464,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	// DocBook backend
 	else if (backend_format == "docbook5") {
 		runparams.flavor = OutputParams::DOCBOOK5;
-		runparams.nice = !put_in_tempdir;
+		runparams.nice = false;
 		if (makeDocBookFile(FileName(filename), runparams) == ExportKilled)
 			return ExportKilled;
 	}