Additional low-level cleanups (3)

diff --git a/Externals/crystaledit/editlib/ccrystaleditview.cpp b/Externals/crystaledit/editlib/ccrystaleditview.cpp
index bebcd4d..db4c035 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystaleditview.cpp
+++ b/Externals/crystaledit/editlib/ccrystaleditview.cpp
@@ -1664,7 +1664,7 @@ ReplaceSelection (LPCTSTR pszNewText, size_t cchNewText, DWORD dwFlags)
       if (m_pszMatched && !RxReplace(pszNewText, m_pszMatched, m_nLastFindWhatLen, m_rxmatch, &lpszNewStr, &m_nLastReplaceLen))
         {
           CString text;
-          if (lpszNewStr && m_nLastReplaceLen > 0)
+          if (lpszNewStr != nullptr && m_nLastReplaceLen > 0)
             {
               LPTSTR buf = text.GetBuffer (m_nLastReplaceLen + 1);
               _tcsncpy_s (buf, m_nLastReplaceLen+1, lpszNewStr, m_nLastReplaceLen);

diff --git a/Externals/crystaledit/editlib/memcombo.cpp b/Externals/crystaledit/editlib/memcombo.cpp
index c2199d5..1213671 100644 (file)
--- a/Externals/crystaledit/editlib/memcombo.cpp
+++ b/Externals/crystaledit/editlib/memcombo.cpp
@@ -90,7 +90,7 @@ void SetComboBoxWidth(CComboBox &Control, LPCTSTR lpszText = nullptr)
   _tcscpy_s(info.lfMenuFont.lfFaceName, _T("MS Sans Serif"));
   oFont.CreateFontIndirect(&info.lfMenuFont);
   oldFont = dc.SelectObject(&oFont);
-  if(lpszText && *lpszText) {
+  if(lpszText != nullptr && *lpszText != 0) {
     size = dc.GetTextExtent(lpszText);
     width = size.cx;
   } else {

diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp
index 93299e2..a7befe4 100644 (file)
--- a/Src/FileOrFolderSelect.cpp
+++ b/Src/FileOrFolderSelect.cpp
@@ -176,7 +176,7 @@ static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam,
        // Look for BFFM_INITIALIZED
        if (uMsg == BFFM_INITIALIZED)
        {
-               if (lpData)
+               if (lpData != NULL)
                        SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);
                else
                        SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)LastSelectedFolder.c_str());

diff --git a/Src/LocationBar.h b/Src/LocationBar.h
index 450906b..9e79e80 100644 (file)
--- a/Src/LocationBar.h
+++ b/Src/LocationBar.h
@@ -26,7 +26,7 @@ public:
        virtual ~CLocationBar();
        virtual BOOL Create(
                CWnd* pParentWnd,                       // mandatory
-               LPCTSTR lpszWindowName = NULL,
+               LPCTSTR lpszWindowName = nullptr,
                DWORD dwStyle = WS_CHILD | WS_VISIBLE | CBRS_TOP,
                UINT nID = AFX_IDW_PANE_FIRST);