X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Funicode.cpp;h=5ea21aad0520cf231abf81c9b7eeb64e26f8e192;hb=9a1b26a156c913f484ca2293fb2ec1c4986d2a3e;hp=001ec948ae70cc34c1137df60fcdb0be493a49f9;hpb=5249eaaa60b0f0dae2f59d948758fdcae005e3a0;p=lyx.git

diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index 001ec948ae..5ea21aad05 100644
--- a/src/support/unicode.cpp
+++ b/src/support/unicode.cpp
@@ -51,7 +51,7 @@ namespace lyx {
 
 struct IconvProcessor::Handler {
 	// assumes cd is valid
-	Handler(iconv_t const cd) : cd(cd) {}
+	explicit Handler(iconv_t const cd) : cd(cd) {}
 	~Handler() {
 		if (iconv_close(cd) == -1)
 			LYXERR0("Error returned from iconv_close(" << errno << ')');
@@ -107,7 +107,7 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
 	// flush out remaining data. This is needed because iconv sometimes
 	// holds back chars in the stream, waiting for a combination character
 	// (see e.g. http://sources.redhat.com/bugzilla/show_bug.cgi?id=1124)
-	iconv(h_->cd, NULL, NULL, &outbuf, &outbytesleft);
+	iconv(h_->cd, nullptr, nullptr, &outbuf, &outbytesleft);
 
 	//lyxerr << dec;
 	//lyxerr << "Inbytesleft: " << inbytesleft << endl;