nullptr

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 026c22db91cead550d2b078723203b2477549401..ee2193fbc113eaec7c1a006b99c24d6bff67607d 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -15,10 +15,13 @@
 
 #include "Encoding.h"
 #include "Lexer.h"
+#include "OutputParams.h"
 #include "texstream.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstream.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <sstream>
@@ -159,8 +162,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
        docstring const hs = from_utf8(hyperset);
        bool need_unicode = false;
        if (enc) {
-               for (size_t n = 0; n < hs.size(); ++n) {
-                       if (!enc->encodable(hs[n]))
+               for (char_type h : hs) {
+                       if (!enc->encodable(h))
                                need_unicode = true;
                }
        }
@@ -188,7 +191,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
        // this if the current input encoding does not support a character.
        // FIXME: don't use \inputencoding if "inputenc" is not loaded (#9839).
        if (need_unicode && enc && enc->iconvName() != "UTF-8") {
-           if (runparams.flavor != OutputParams::XETEX)
+           if (runparams.flavor != Flavor::XeTeX)
                        os << "\\inputencoding{utf8}\n";
                os << setEncoding("UTF-8");
        }
@@ -208,7 +211,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                os << from_utf8(opt);
        if (need_unicode && enc && enc->iconvName() != "UTF-8") {
                os << setEncoding(enc->iconvName());
-           if (runparams.flavor != OutputParams::XETEX)
+           if (runparams.flavor != Flavor::XeTeX)
                        os << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
        }
 }