From b67605814738d17484e508d037b8b1f09c27cab6 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sun, 21 Jul 2019 02:06:00 -0500 Subject: Visual C++ compiler warning fixes. Mostly signed/unsigned/size_t mismatches, except for one case treating a bool as an integer. --- alphabetparameters.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'alphabetparameters.cpp') diff --git a/alphabetparameters.cpp b/alphabetparameters.cpp index e695f7b..34c4d14 100644 --- a/alphabetparameters.cpp +++ b/alphabetparameters.cpp @@ -118,7 +118,7 @@ void AlphabetParameters::setAlphabet(const Alphabet &alphabet) Alphabet::const_iterator alphabetIt; for (alphabetIt = m_alphabet.begin(); alphabetIt != alphabetEnd; ++alphabetIt) { assert(m_letterLookup.find(alphabetIt->text()) == m_letterLookup.end()); - m_letterLookup[alphabetIt->text()] = alphabetIt - m_alphabet.begin(); + m_letterLookup[alphabetIt->text()] = int(alphabetIt - m_alphabet.begin()); } } @@ -138,7 +138,7 @@ void AlphabetParameters::setLetterParameter(Letter letter, const LetterParameter void AlphabetParameters::updateLength() { - m_length = m_alphabet.size() - QUACKLE_FIRST_LETTER; + m_length = int(m_alphabet.size() - QUACKLE_FIRST_LETTER); } Alphabet AlphabetParameters::emptyAlphabet() @@ -317,7 +317,7 @@ EnglishAlphabetParameters::EnglishAlphabetParameters() UVString letterString; UVString lowerLetterString; letterString += charIndex; - lowerLetterString += towlower(charIndex); + lowerLetterString += (UVChar)towlower(charIndex); const bool isVowel = (charIndex == MARK_UV('A')) || (charIndex == MARK_UV('E')) || (charIndex == MARK_UV('I')) || (charIndex == MARK_UV('O')) || (charIndex == MARK_UV('U')); -- cgit v1.2.3