More filter clarifying renames

   Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index ed58157..2ee7e52 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -201,7 +201,7 @@ void CDirDoc::Rescan()
        m_pCtxt->m_piFilterGlobal = &theApp.m_globalFileFilter;
 
        // Show active filter name in statusbar
-       pf->SetFilterStatusDisplay(theApp.m_globalFileFilter.GetFilter());
+       pf->SetFilterStatusDisplay(theApp.m_globalFileFilter.GetFilterNameOrMask());
 
        // Empty display before new compare
        m_pDirView->DeleteAllDisplayItems();

diff --git a/Src/FileFilterHelper.cpp b/Src/FileFilterHelper.cpp
index 12f235b..fd9f80a 100644 (file)
--- a/Src/FileFilterHelper.cpp
+++ b/Src/FileFilterHelper.cpp
@@ -276,9 +276,9 @@ BOOL FileFilterHelper::GetUseMask()
 }
 
 /** 
- * @brief Returns active filter.
+ * @brief Returns active filter (or mask string)
  */
-CString FileFilterHelper::GetFilter()
+CString FileFilterHelper::GetFilterNameOrMask()
 {
        CString sFilter;
 

diff --git a/Src/FileFilterHelper.h b/Src/FileFilterHelper.h
index 19b2609..60d3ee2 100644 (file)
--- a/Src/FileFilterHelper.h
+++ b/Src/FileFilterHelper.h
@@ -103,7 +103,7 @@ public:
        void SetMask(LPCTSTR strMask);
 
        BOOL GetUseMask();
-       CString GetFilter();
+       CString GetFilterNameOrMask();
        BOOL SetFilter(CString filter);
 
        BOOL includeFile(LPCTSTR szFileName);

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 57a25bc..c2f4477 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1905,7 +1905,7 @@ void CMainFrame::OnClose()
        }
 
        // Save last selected filter
-       CString filter = theApp.m_globalFileFilter.GetFilter();
+       CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
        m_options.SaveOption(OPT_FILEFILTER_CURRENT, filter);
 
        // save main window position
@@ -2660,7 +2660,7 @@ void CMainFrame::OnToolsFilters()
                {
                        theApp.m_globalFileFilter.SetFileFilterPath(path);
                        theApp.m_globalFileFilter.UseMask(FALSE);
-                       CString sFilter = theApp.m_globalFileFilter.GetFilter();
+                       CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
                        m_options.SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
                }
                m_options.SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index a0f12cc..8fac5c5 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -260,22 +260,22 @@ BOOL COpenDlg::OnInitDialog()
        m_ctlExt.LoadState(_T("Files\\Ext"));
        UpdateData(m_strLeft.IsEmpty() && m_strRight.IsEmpty());
        
-       CString filter = theApp.m_globalFileFilter.GetFilter();
+       CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
        BOOL bMask = theApp.m_globalFileFilter.GetUseMask();
 
        if (!bMask)
        {
                CString filterPrefix;
                VERIFY(filterPrefix.LoadString(IDS_FILTER_PREFIX));
-               filter.Insert(0, filterPrefix);
+               FilterNameOrMask.Insert(0, filterPrefix);
        }
 
-       int ind = m_ctlExt.FindStringExact(0, filter);
+       int ind = m_ctlExt.FindStringExact(0, FilterNameOrMask);
        if (ind != CB_ERR)
                m_ctlExt.SetCurSel(ind);
        else
        {
-               ind = m_ctlExt.InsertString(0, filter);
+               ind = m_ctlExt.InsertString(0, FilterNameOrMask);
                if (ind != CB_ERR)
                        m_ctlExt.SetCurSel(ind);
                else
@@ -479,19 +479,19 @@ void COpenDlg::OnSelectFilter()
 
        mf->SelectFilter();
        
-       CString filter = theApp.m_globalFileFilter.GetFilter();
+       CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
        if (theApp.m_globalFileFilter.GetUseMask())
        {
-               // If we had filter choosed and now has mask we can overwrite filter
+               // If we had filter chosen and now has mask we can overwrite filter
                if (!bUseMask || curFilter[0] != '*')
                {
-                       SetDlgItemText(IDC_EXT_COMBO, filter);
+                       SetDlgItemText(IDC_EXT_COMBO, FilterNameOrMask);
                }
        }
        else
        {
-               filter.Insert(0, filterPrefix);
-               SetDlgItemText(IDC_EXT_COMBO, filter);
+               FilterNameOrMask.Insert(0, filterPrefix);
+               SetDlgItemText(IDC_EXT_COMBO, FilterNameOrMask);
        }
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index cfdc264..988e97f 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,8 @@
 2005-03-05 Perry
   Rename CDirFrame::SetFilter to CDirFrame::SetFilterStatusDisplay for easier greps.
    Src: DirDoc.cpp DirFrame.cpp DirFrame.h
+  More filter clarifying renames
+   Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
 
 2005-03-04 Perry
  PATCH: [ 1147039 ] experimental patch for colored word diff