Format and reversion code for new counter inset.

[lyx.git] / src / support / unicode.cpp

diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index b5839827403ba688987636a2ebc523d5932a7902..5ea21aad0520cf231abf81c9b7eeb64e26f8e192 100644 (file)
--- a/src/support/unicode.cpp
+++ b/src/support/unicode.cpp
@@ -19,9 +19,8 @@
 
 #include <iconv.h>
 
-#include <boost/cstdint.hpp>
-
 #include <cerrno>
+#include <cstdint>
 #include <map>
 #include <ostream>
 //Needed in MSVC
@@ -52,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 << ')');
@@ -66,13 +65,6 @@ IconvProcessor::IconvProcessor(string tocode, string fromcode)
 {}
 
 
-// for gcc 4.6
-IconvProcessor::IconvProcessor(IconvProcessor && other)
-       : tocode_(move(other.tocode_)), fromcode_(move(other.fromcode_)),
-         h_(move(other.h_))
-{}
-
-
 bool IconvProcessor::init()
 {
        if (h_)
@@ -115,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;
@@ -143,7 +135,7 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
                        for (size_t i = 0; i < buflen; ++i) {
                                // char may be signed, avoid output of
                                // something like 0xffffffc2
-                               boost::uint32_t const b =
+                               uint32_t const b =
                                        *reinterpret_cast<unsigned char const *>(buf + i);
                                lyxerr << " 0x" << (unsigned int)b;
                        }