Reduce compilation warnings

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 4ee887d..35fcd79 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -1423,7 +1423,7 @@ void CDirView::OpenSelection(SELECTIONTYPE selectionType /*= SELECTIONTYPE_NORMA
                FileLocation fileloc[3];
                String strDesc[3];
                const String sUntitled[] = { _("Untitled left"), paths.GetSize() < 3 ? _("Untitled right") : _("untitled middle"), _("Untitled right") };
-               for (int i = 0; i < paths.size(); ++i)
+               for (size_t i = 0; i < paths.size(); ++i)
                {
                        if (!pdi[0]->diffcode.exists(i) &&
                                std::count(pdi, pdi + paths.size(), pdi[0]) == static_cast<ptrdiff_t>(paths.size()))

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 41a4099..db4bf26 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -1042,12 +1042,12 @@ DirViewColItems::GetColRegValueNameBase(int col) const
 {
        if (m_nDirs < 3)
        {
-               assert(col>=0 && col<std::size(f_cols));
+               assert(col>=0 && col<static_cast<int>(std::size(f_cols)));
                return strutils::format(_T("WDirHdr_%s"), f_cols[col].regName);
        }
        else
        {
-               assert(col>=0 && col<std::size(f_cols3));
+               assert(col>=0 && col<static_cast<int>(std::size(f_cols3)));
                return strutils::format(_T("WDirHdr_%s"), f_cols3[col].regName);
        }
 }
@@ -1060,12 +1060,12 @@ DirViewColItems::GetColDefaultOrder(int col) const
 {
        if (m_nDirs < 3)
        {
-               assert(col>=0 && col<std::size(f_cols));
+               assert(col>=0 && col<static_cast<int>(std::size(f_cols)));
                return f_cols[col].physicalIndex;
        }
        else
        {
-               assert(col>=0 && col<std::size(f_cols3));
+               assert(col>=0 && col<static_cast<int>(std::size(f_cols3)));
                return f_cols3[col].physicalIndex;
        }
 }
@@ -1078,7 +1078,7 @@ DirViewColItems::GetDirColInfo(int col) const
 {
        if (m_nDirs < 3)
        {
-               if (col < 0 || col >= std::size(f_cols))
+               if (col < 0 || col >= static_cast<int>(std::size(f_cols)))
                {
                        assert(false); // fix caller, should not ask for nonexistent columns
                        return nullptr;
@@ -1087,7 +1087,7 @@ DirViewColItems::GetDirColInfo(int col) const
        }
        else
        {
-               if (col < 0 || col >= std::size(f_cols3))
+               if (col < 0 || col >= static_cast<int>(std::size(f_cols3)))
                {
                        assert(false); // fix caller, should not ask for nonexistent columns
                        return nullptr;
@@ -1105,7 +1105,7 @@ DirViewColItems::IsColById(int col, const char *idname) const
        int nDirs = m_nDirs;
        if (nDirs < 3)
        {
-               if (col < 0 || col >= std::size(f_cols))
+               if (col < 0 || col >= static_cast<int>(std::size(f_cols)))
                {
                        assert(false); // fix caller, should not ask for nonexistent columns
                        return false;

diff --git a/Src/EditorFilepathBar.cpp b/Src/EditorFilepathBar.cpp
index 02249d2..7d3d819 100644 (file)
--- a/Src/EditorFilepathBar.cpp
+++ b/Src/EditorFilepathBar.cpp
@@ -211,7 +211,7 @@ void CEditorFilePathBar::OnSetFocusEdit(UINT id)
  */
 String CEditorFilePathBar::GetText(int pane) const
 {
-       ASSERT (pane >= 0 && pane < std::size(m_Edit));
+       ASSERT (pane >= 0 && pane < static_cast<int>(std::size(m_Edit)));
 
        // Check for `nullptr` since window may be closing..
        if (m_hWnd == nullptr)
@@ -230,7 +230,7 @@ String CEditorFilePathBar::GetText(int pane) const
  */
 void CEditorFilePathBar::SetText(int pane, const String& sString)
 {
-       ASSERT (pane >= 0 && pane < std::size(m_Edit));
+       ASSERT (pane >= 0 && pane < static_cast<int>(std::size(m_Edit)));
 
        // Check for `nullptr` since window may be closing..
        if (m_hWnd == nullptr)
@@ -247,7 +247,7 @@ void CEditorFilePathBar::SetText(int pane, const String& sString)
  */
 void CEditorFilePathBar::SetActive(int pane, bool bActive)
 {
-       ASSERT (pane >= 0 && pane < std::size(m_Edit));
+       ASSERT (pane >= 0 && pane < static_cast<int>(std::size(m_Edit)));
 
        // Check for `nullptr` since window may be closing..
        if (m_hWnd == nullptr)

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index c550577..d354ccf 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -421,7 +421,7 @@ HMENU CMainFrame::GetPrediffersSubmenu(HMENU mainMenu)
  */
 HMENU CMainFrame::NewMenu(int view, int ID)
 {
-       int menu_view, index;
+       int menu_view;
        if (m_pMenus[view] == nullptr)
        {
                m_pMenus[view].reset(new BCMenu());
@@ -457,11 +457,11 @@ HMENU CMainFrame::NewMenu(int view, int ID)
        }
 
        // Load bitmaps to menuitems
-       for (index = 0; index < std::size(m_MenuIcons); index ++)
+       for (auto& menu_icon: m_MenuIcons)
        {
-               if (menu_view == (m_MenuIcons[index].menusToApply & menu_view))
+               if (menu_view == (menu_icon.menusToApply & menu_view))
                {
-                       m_pMenus[view]->ModifyODMenu(nullptr, m_MenuIcons[index].menuitemID, m_MenuIcons[index].iconResID);
+                       m_pMenus[view]->ModifyODMenu(nullptr, menu_icon.menuitemID, menu_icon.iconResID);
                }
        }
 

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 649c166..d4ee9cb 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -1128,7 +1128,7 @@ bool CMergeApp::LoadAndOpenProjectFile(const String& sProject, const String& sRe
        for (auto& projItem : project.Items())
        {
                projItem.GetPaths(tFiles, bRecursive);
-               for (int i = 0; i < tFiles.size(); ++i)
+               for (size_t i = 0; i < tFiles.size(); ++i)
                {
                        if (!paths::IsPathAbsolute(tFiles[i]))
                                tFiles[i] = paths::ConcatPath(paths::GetParentPath(sProject), tFiles[i]);

diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp
index 13d4ded..17add1f 100644 (file)
--- a/Src/OpenView.cpp
+++ b/Src/OpenView.cpp
@@ -238,9 +238,9 @@ void COpenView::OnInitialUpdate()
        LoadComboboxStates();
 
        bool bDoUpdateData = true;
-       for (int index = 0; index < std::size(m_strPath); index++)
+       for (auto& strPath: m_strPath)
        {
-               if (!m_strPath[index].empty())
+               if (!strPath.empty())
                        bDoUpdateData = false;
        }
        UpdateData(bDoUpdateData);
@@ -557,16 +557,15 @@ void COpenView::OnOK()
        UpdateData(TRUE);
        TrimPaths();
 
-       int index;
        int nFiles = 0;
-       for (index = 0; index < std::size(m_strPath); index++)
+       for (auto& strPath: m_strPath)
        {
-               if (index == 2 && m_strPath[index].empty())
+               if (nFiles == 2 && strPath.empty())
                        break;
                m_files.SetSize(nFiles + 1);
-               m_files[nFiles] = m_strPath[index];
+               m_files[nFiles] = strPath;
                m_dwFlags[nFiles] &= ~FFILEOPEN_READONLY;
-               m_dwFlags[nFiles] |= m_bReadOnly[index] ? FFILEOPEN_READONLY : 0;
+               m_dwFlags[nFiles] |= m_bReadOnly[nFiles] ? FFILEOPEN_READONLY : 0;
                nFiles++;
        }
        // If left path is a project-file, load it
@@ -583,7 +582,7 @@ void COpenView::OnOK()
                return;
        }
 
-       for (index = 0; index < nFiles; index++)
+       for (int index = 0; index < nFiles; index++)
        {
                // If user has edited path by hand, expand environment variables
                bool bExpand = false;
@@ -1078,14 +1077,13 @@ void COpenView::OnSelectUnpacker()
        paths::PATH_EXISTENCE pathsType;
        UpdateData(TRUE);
 
-       int index;
        int nFiles = 0;
-       for (index = 0; index < std::size(m_strPath); index++)
+       for (auto& strPath: m_strPath)
        {
-               if (index == 2 && m_strPath[index].empty())
+               if (nFiles == 2 && strPath.empty())
                        break;
                m_files.SetSize(nFiles + 1);
-               m_files[nFiles] = m_strPath[index];
+               m_files[nFiles] = strPath;
                nFiles++;
        }
        pathsType = paths::GetPairComparability(m_files);
@@ -1253,8 +1251,8 @@ bool COpenView::LoadProjectFile(const String &path)
  */
 void COpenView::TrimPaths()
 {
-       for (int index = 0; index < std::size(m_strPath); index++)
-               m_strPath[index] = strutils::trim_ws(m_strPath[index]);
+       for (auto& strPath: m_strPath)
+               strPath = strutils::trim_ws(strPath);
 }
 
 /**