From 4ffc5e45b1f0aedc83847b56de63a41bb6772cf4 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 5 Jun 2021 10:18:48 +0900 Subject: [PATCH] Reduce compilation warnings --- Src/Common/OptionsMgr.cpp | 4 ++-- Src/Common/SplitterWndEx.cpp | 6 +++--- Src/Common/UniFile.cpp | 2 +- Src/Plugins.cpp | 6 ++++-- Src/SubeditList.cpp | 16 ++++++++-------- Src/stringdiffs.cpp | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Src/Common/OptionsMgr.cpp b/Src/Common/OptionsMgr.cpp index 7e0589b77..af033f952 100644 --- a/Src/Common/OptionsMgr.cpp +++ b/Src/Common/OptionsMgr.cpp @@ -747,7 +747,7 @@ int COptionsMgr::ImportOptions(const String& filename) String COptionsMgr::EscapeValue(const String& text) { String text2; - for (int i = 0; i < text.length(); ++i) + for (size_t i = 0; i < text.length(); ++i) { TCHAR ch = text[i]; if (ch == '\0' || ch == '\x1b' || ch == '\r' || ch == '\n') @@ -766,7 +766,7 @@ String COptionsMgr::UnescapeValue(const String& text) if (text.find('\x1b') == String::npos) return text; String text2; - for (int i = 0; i < text.length(); ++i) + for (size_t i = 0; i < text.length(); ++i) { if (text[i] == '\x1b' && i < text.length() - 1) { diff --git a/Src/Common/SplitterWndEx.cpp b/Src/Common/SplitterWndEx.cpp index 89f07c8ba..6a0a4e758 100644 --- a/Src/Common/SplitterWndEx.cpp +++ b/Src/Common/SplitterWndEx.cpp @@ -183,7 +183,7 @@ static void initializeRatios(std::vector& ratios, int n) static void updateRatios(CSplitterWnd& wnd, int pane, int newpos, std::vector& ratios, bool horizontal) { const int n = horizontal ? wnd.GetColumnCount(): wnd.GetRowCount(); - if (n != ratios.size()) + if (static_cast(n) != ratios.size()) initializeRatios(ratios, n); int sum = 0; @@ -221,7 +221,7 @@ void CSplitterWndEx::EqualizeRows() if (m_nRows < 2) return; - if (m_nRows != m_rowRatios.size()) + if (static_cast(m_nRows) != m_rowRatios.size()) initializeRatios(m_rowRatios, m_nRows); int i; @@ -252,7 +252,7 @@ void CSplitterWndEx::EqualizeCols() if (m_nCols < 2) return; - if (m_nCols != m_colRatios.size()) + if (static_cast(m_nCols) != m_colRatios.size()) initializeRatios(m_colRatios, m_nCols); int i; diff --git a/Src/Common/UniFile.cpp b/Src/Common/UniFile.cpp index 9fbd377fc..c9f73dcb6 100644 --- a/Src/Common/UniFile.cpp +++ b/Src/Common/UniFile.cpp @@ -335,7 +335,7 @@ bool UniMemFile::ReadStringAll(String& text) { text.clear(); bool lossy = false, lossytmp = false; - text.reserve(m_filesize); + text.reserve(static_cast(m_filesize)); bool last = false; do { diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp index 82a659b33..8129ae7c3 100644 --- a/Src/Plugins.cpp +++ b/Src/Plugins.cpp @@ -404,9 +404,11 @@ public: if (!file.HasBom()) { int iGuessEncodingType = GetOptionsMgr()->GetInt(OPT_CP_DETECT); + int64_t fileSize = file.GetFileSize(); FileTextEncoding encoding = codepage_detect::Guess( - paths::FindExtension(path), file.GetBase(), - file.GetFileSize() < codepage_detect::BufSize ? file.GetFileSize() : codepage_detect::BufSize, + paths::FindExtension(path), file.GetBase(), static_cast( + fileSize < static_cast(codepage_detect::BufSize) ? + fileSize : static_cast(codepage_detect::BufSize)), iGuessEncodingType); file.SetCodepage(encoding.m_codepage); } diff --git a/Src/SubeditList.cpp b/Src/SubeditList.cpp index 3f79ab653..1b414f203 100644 --- a/Src/SubeditList.cpp +++ b/Src/SubeditList.cpp @@ -55,7 +55,7 @@ CSubeditList::EditStyle CSubeditList::GetEditStyle(int nCol) const if (nCol < 0 || nCol >= nColumnCount) return EditStyle::EDIT_BOX; - if (nCol >= m_editStyle.size()) + if (static_cast(nCol) >= m_editStyle.size()) return EditStyle::EDIT_BOX; return m_editStyle.at(nCol); @@ -73,7 +73,7 @@ void CSubeditList::SetEditStyle(int nCol, EditStyle style) if (nCol < 0 || nCol >= nColumnCount) return; - for (size_t i = m_editStyle.size(); i <= nCol; i++) + for (size_t i = m_editStyle.size(); i <= static_cast(nCol); i++) m_editStyle.push_back(EditStyle::EDIT_BOX); m_editStyle[nCol] = style; @@ -97,7 +97,7 @@ int CSubeditList::GetLimitTextSize(int nCol) const if (GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST) return 0; - if (nCol >= m_limitTextSize.size()) + if (static_cast(nCol) >= m_limitTextSize.size()) return 0; return m_limitTextSize.at(nCol); @@ -120,7 +120,7 @@ void CSubeditList::SetLimitTextSize(int nCol, int nLimitTextSize) if (GetEditStyle(nCol) != EditStyle::WILDCARD_DROP_LIST) return; - for (size_t i = m_limitTextSize.size(); i <= nCol; i++) + for (size_t i = m_limitTextSize.size(); i <= static_cast(nCol); i++) m_limitTextSize.push_back(0); m_limitTextSize[nCol] = nLimitTextSize; @@ -147,8 +147,8 @@ String CSubeditList::GetDropListFixedPattern(int nItem, int nSubItem) const if (GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST) return _T(""); - if (nItem < m_dropListFixedPattern.size()) - if (nSubItem < m_dropListFixedPattern[nItem].size()) + if (static_cast(nItem) < m_dropListFixedPattern.size()) + if (static_cast(nSubItem) < m_dropListFixedPattern[nItem].size()) return m_dropListFixedPattern[nItem][nSubItem]; return _T(""); @@ -175,10 +175,10 @@ void CSubeditList::SetDropListFixedPattern(int nItem, int nSubItem, const String if (GetEditStyle(nSubItem) != EditStyle::WILDCARD_DROP_LIST) return; - for (size_t i = m_dropListFixedPattern.size(); i <= nItem; i++) + for (size_t i = m_dropListFixedPattern.size(); i <= static_cast(nItem); i++) m_dropListFixedPattern.push_back(std::vector()); - for (size_t i = m_dropListFixedPattern[nItem].size(); i <= nSubItem; i++) + for (size_t i = m_dropListFixedPattern[nItem].size(); i <= static_cast(nSubItem); i++) m_dropListFixedPattern[nItem].push_back(_T("")); m_dropListFixedPattern[nItem][nSubItem] = fixedPattern; diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp index 1a7fe0dba..a95a2d541 100644 --- a/Src/stringdiffs.cpp +++ b/Src/stringdiffs.cpp @@ -650,7 +650,7 @@ stringdiffs::onp(std::vector &edscript) switch (ses[i]) { case '+': - if (i + 1 < ses.size() && ses[i + 1] == '-') + if (static_cast(i + 1) < ses.size() && ses[i + 1] == '-') { edscript.push_back('!'); i++; @@ -663,7 +663,7 @@ stringdiffs::onp(std::vector &edscript) } break; case '-': - if (i + 1 < ses.size() && ses[i + 1] == '+') + if (static_cast(i + 1) < ses.size() && ses[i + 1] == '+') { edscript.push_back('!'); i++; -- 2.11.0