X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.h;h=6a96843607621adc7519ddee6b8e9a5a80ccc167;hb=dd1a85a2baf0aeb867a634ade47275b952d38354;hp=52bfc95692190fc1aecb6a1be8bf3b3bc9a9fc52;hpb=d6d98ffbe4d4781566beaef83b1b54c36e332195;p=lyx.git

diff --git a/src/Encoding.h b/src/Encoding.h
index 52bfc95692..6a96843607 100644
--- 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;
@@ -76,26 +76,26 @@ public:
 	/// Needed LaTeX preamble (or feature) for math mode
 	std::string mathpreamble() const { return mathpreamble_; }
 	/// Is this a combining character?
-	bool combining() const { return flags_ & CharInfoCombining ? true : false; }
+	bool combining() const { return flags_ & CharInfoCombining; }
 	/// Is \c textpreamble a feature known by LaTeXFeatures, or a raw LaTeX
 	/// command?
-	bool textfeature() const { return flags_ & CharInfoTextFeature ? true : false; }
+	bool textfeature() const { return flags_ & CharInfoTextFeature; }
 	/// Is \c mathpreamble a feature known by LaTeXFeatures, or a raw LaTeX
 	/// command?
-	bool mathfeature() const { return flags_ & CharInfoMathFeature ? true : false; }
+	bool mathfeature() const { return flags_ & CharInfoMathFeature; }
 	/// Always force the LaTeX command, even if the encoding contains
 	/// this character?
-	bool force() const { return flags_ & CharInfoForce ? true : false; }
+	bool force() const { return flags_ & CharInfoForce; }
 	/// Force the LaTeX command for some encodings?
-	bool forceselected() const { return flags_ & CharInfoForceSelected ? true : false; }
+	bool forceselected() const { return flags_ & CharInfoForceSelected; }
 	/// Disable LaTeX command => char_type conversion for this deprecated symbol?
-	bool deprecated() const { return flags_ & CharInfoDeprecated ? true : false; }
+	bool deprecated() const { return flags_ & CharInfoDeprecated; }
 	/// 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,
@@ -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:
 	///