[LyX/master] Simplify boolean expressions

Jean-Marc Lasgouttes lasgouttes at lyx.org
Sat Oct 26 21:54:33 UTC 2019


commit 464d6262b17dfd8c8db6ca32b94ac230668cba52
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Sun Oct 27 00:08:02 2019 +0200

    Simplify boolean expressions
    
    Spottd by cppcheck.
---
 src/Encoding.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Encoding.h b/src/Encoding.h
index 52bfc95..8e97b74 100644
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -76,20 +76,20 @@ 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).


More information about the lyx-cvs mailing list