MathML: more consistency between DocBook and XHTML.

[lyx.git] / src / Encoding.h

diff --git a/src/Encoding.h b/src/Encoding.h
index df900b343b92058f8a43d3a32a205da083a94e8f..6a96843607621adc7519ddee6b8e9a5a80ccc167 100644 (file)
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -28,8 +28,8 @@ namespace support { class FileName; }
 class EncodingException : public std::exception {
 public:
        EncodingException(char_type c);
-       virtual ~EncodingException() throw() {}
-       virtual const char * what() const throw();
+       virtual ~EncodingException() noexcept {}
+       virtual const char * what() const noexcept override;
 
        char_type failed_char;
        int par_id;
@@ -130,7 +130,7 @@ public:
        /// Represent any of the above packages
        static int const any;
        ///
-       Encoding() : fixedwidth_(true), unsafe_(false), forced_(0),
+       Encoding() : fixedwidth_(true), unsafe_(false), forced_(nullptr),
                     start_encodable_(0), package_(none), complete_(false) {}
        ///
        Encoding(std::string const & n, std::string const & l,
@@ -255,10 +255,10 @@ public:
        fromLyXName(std::string const & name, bool allowUnsafe = false) const;
        /// Get encoding from LaTeX name \p name and package \p package
        Encoding const * fromLaTeXName(std::string const & name,
-               int const & package = Encoding::any, bool allowUnsafe = false) const;
+               int package = Encoding::any, bool allowUnsafe = false) const;
        /// Get encoding from iconv name \p name and package \p package
        Encoding const * fromIconvName(std::string const & name,
-               int const & package = Encoding::any, bool allowUnsafe = false) const;
+               int package = Encoding::any, bool allowUnsafe = false) const;
 
        ///
        const_iterator begin() const { return encodinglist.begin(); }
@@ -333,7 +333,7 @@ public:
         */
        static char_type fromLaTeXCommand(docstring const & cmd, int cmdtype,
                        bool & combining, bool & needsTermination,
-                       std::set<std::string> * req = 0);
+                       std::set<std::string> * req = nullptr);
        ///
        enum LatexCmd {
                ///
@@ -353,7 +353,7 @@ public:
         */
        static docstring fromLaTeXCommand(docstring const & cmd, int cmdtype,
                        bool & needsTermination, docstring & rem,
-                       std::set<std::string> * req = 0);
+                       std::set<std::string> * req = nullptr);
 
 protected:
        ///