[LyX/master] Fix warning

Richard Kimberly Heck rikiheck at lyx.org
Sun Apr 19 14:50:22 UTC 2020


commit d509d85c682699f94071b3dd04b405efed6c93d2
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Sun Apr 19 11:10:52 2020 -0400

    Fix warning
---
 src/Trans.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 8a74b9a..b73b884 100644
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -98,7 +98,7 @@ TeXAccent get_accent(FuncCode action)
 		++i;
 	}
 	struct TeXAccent temp = { static_cast<tex_accent>(0), 0,
-					  0, static_cast<FuncCode>(0)};
+					  nullptr, static_cast<FuncCode>(0)};
 	return temp;
 }
 
@@ -303,7 +303,7 @@ int Trans::load(Lexer & lex)
 			if (!lex.next(true))
 				return -1;
 
-			key_from = lex.getString()[0];
+			key_from = static_cast<unsigned char>(lex.getString()[0]);
 			LYXERR(Debug::KBMAP, "\t`" << lex.getString() << '\'');
 
 			if (!lex.next(true))
@@ -433,8 +433,8 @@ tex_accent getkeymod(string const & p)
 
 
 // TransFSMData
-TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(0),
-	deadkey_state_(0), combined_state_(0), currentState(0)
+TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(nullptr),
+	deadkey_state_(nullptr), combined_state_(nullptr), currentState(nullptr)
 {
 }
 


More information about the lyx-cvs mailing list