Rename FilterHelper's GetUseMask to IsUsingMask.

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

diff --git a/Src/FileFilterHelper.cpp b/Src/FileFilterHelper.cpp
index fd9f80a..c858b23 100644 (file)
--- a/Src/FileFilterHelper.cpp
+++ b/Src/FileFilterHelper.cpp
@@ -270,7 +270,7 @@ CString FileFilterHelper::ParseExtensions(CString extensions)
 /** 
  * @brief Returns TRUE if active filter is mask.
  */
-BOOL FileFilterHelper::GetUseMask()
+BOOL FileFilterHelper::IsUsingMask()
 {
        return m_bUseMask;
 }
@@ -282,7 +282,7 @@ CString FileFilterHelper::GetFilterNameOrMask()
 {
        CString sFilter;
 
-       if (!GetUseMask())
+       if (!IsUsingMask())
                sFilter = GetFileFilterName(m_sFileFilterPath);
        else
                sFilter = m_sMask;

diff --git a/Src/FileFilterHelper.h b/Src/FileFilterHelper.h
index 60d3ee2..cd8289a 100644 (file)
--- a/Src/FileFilterHelper.h
+++ b/Src/FileFilterHelper.h
@@ -102,7 +102,7 @@ public:
        void UseMask(BOOL bUseMask);
        void SetMask(LPCTSTR strMask);
 
-       BOOL GetUseMask();
+       BOOL IsUsingMask();
        CString GetFilterNameOrMask();
        BOOL SetFilter(CString filter);
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index c2f4477..29d394e 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2649,7 +2649,7 @@ void CMainFrame::OnToolsFilters()
                if (path.Find(strNone) > -1)
                {
                        // Don't overwrite mask we already have
-                       if (!theApp.m_globalFileFilter.GetUseMask())
+                       if (!theApp.m_globalFileFilter.IsUsingMask())
                        {
                                CString sFilter = _T("*.*");
                                theApp.m_globalFileFilter.SetFilter(sFilter);

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index 8fac5c5..2410f94 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -261,7 +261,7 @@ BOOL COpenDlg::OnInitDialog()
        UpdateData(m_strLeft.IsEmpty() && m_strRight.IsEmpty());
        
        CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
-       BOOL bMask = theApp.m_globalFileFilter.GetUseMask();
+       BOOL bMask = theApp.m_globalFileFilter.IsUsingMask();
 
        if (!bMask)
        {
@@ -472,7 +472,7 @@ void COpenDlg::OnSelectFilter()
        CString curFilter;
        VERIFY(filterPrefix.LoadString(IDS_FILTER_PREFIX));
 
-       const BOOL bUseMask = theApp.m_globalFileFilter.GetUseMask();
+       const BOOL bUseMask = theApp.m_globalFileFilter.IsUsingMask();
        GetDlgItemText(IDC_EXT_COMBO, curFilter);
        curFilter.TrimLeft();
        curFilter.TrimRight();
@@ -480,7 +480,7 @@ void COpenDlg::OnSelectFilter()
        mf->SelectFilter();
        
        CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
-       if (theApp.m_globalFileFilter.GetUseMask())
+       if (theApp.m_globalFileFilter.IsUsingMask())
        {
                // If we had filter chosen and now has mask we can overwrite filter
                if (!bUseMask || curFilter[0] != '*')

diff --git a/Src/readme.txt b/Src/readme.txt
index 988e97f..ac083b5 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,8 @@
    Src: DirDoc.cpp DirFrame.cpp DirFrame.h
   More filter clarifying renames
    Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
+  Rename FilterHelper's GetUseMask to IsUsingMask.
+   Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
 
 2005-03-04 Perry
  PATCH: [ 1147039 ] experimental patch for colored word diff