Correct Right Arrow key processing in Modules list

[lyx.git] / src / Encoding.h

diff --git a/src/Encoding.h b/src/Encoding.h
index 8e97b74138a4c978aef991e20474c129384e8123..6bd90c7b80b94a8c5f984506988a33341f1ff527 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;
 
        char_type failed_char;
        int par_id;
@@ -93,9 +93,9 @@ public:
        /// TIPA shortcut
        std::string const tipashortcut() const { return tipashortcut_; }
        /// \c textcommand needs no termination (such as {} or space).
-       bool textnotermination() const { return flags_ & CharInfoTextNoTermination ? true : false; }
+       bool textnotermination() const { return flags_ & CharInfoTextNoTermination; }
        /// \c mathcommand needs no termination (such as {} or space).
-       bool mathnotermination() const { return flags_ & CharInfoMathNoTermination ? true : false; }
+       bool mathnotermination() const { return flags_ & CharInfoMathNoTermination; }
        ///
 private:
        /// LaTeX command (text mode) for this character
@@ -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,
@@ -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:
        ///