PATCH: [ 1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 2ee7e52..059f196 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -189,7 +189,7 @@ void CDirDoc::Rescan()
        m_pCtxt->m_hDirFrame = pf->GetSafeHwnd();
        m_pCtxt->m_msgUpdateStatus = MSG_STAT_UPDATE;
        m_pCtxt->m_bGuessEncoding = mf->m_options.GetBool(OPT_CP_DETECT);
-       m_pCtxt->m_nCompMethod = mf->m_nCompMethod;
+       m_pCtxt->m_nCompMethod = mf->m_options.GetInt(OPT_CMP_METHOD);
        UpdateHeaderPath(TRUE);
        UpdateHeaderPath(FALSE);
        // draw the headers as active ones

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 96e182d..6aeaff5 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -210,8 +210,6 @@ CMainFrame::CMainFrame()
        m_options.InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
        m_options.InitOption(OPT_CMP_MOVED_BLOCKS, false);
 
-       m_nCompMethod = m_options.GetInt(OPT_CMP_METHOD);
-
        m_options.InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
        m_options.InitOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
        m_options.InitOption(OPT_CLR_DIFF_DELETED, (int)RGB(192, 192, 192));
@@ -1228,8 +1226,6 @@ void CMainFrame::OnOptions()
                m_options.SaveOption(OPT_CMP_IGNORE_CASE, compage.m_bIgnoreCase == TRUE);
                m_options.SaveOption(OPT_CMP_METHOD, compage.m_compareMethod);
                m_options.SaveOption(OPT_CMP_MOVED_BLOCKS, compage.m_bMovedBlocks == TRUE);
-               
-               m_nCompMethod = compage.m_compareMethod;
 
                m_options.SaveOption(OPT_TAB_SIZE, (int)editor.m_nTabSize);
                m_options.SaveOption(OPT_TAB_TYPE, (int)editor.m_nTabType);

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 502a760..989a51c 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -153,11 +153,6 @@ public:
        BOOL m_bVssSuppressPathCheck; /**< Suppresses VSS int code asking about different path */
        /*@}*/
 
-    // This is ugly hack to workaround problem we don't have any
-       // access to compare options from dirscan() (dirscan.cpp)
-       // Please fixme!
-       int m_nCompMethod; /**< CompareMethod : CPropCompare::BY_CONTENTS or CPropCompare::BY_DATE */
-
        /**
         * @name Textual labels/descriptors
         * These descriptors overwrite dir/filename usually shown in headerbar

diff --git a/Src/readme.txt b/Src/readme.txt
index 61e404b..ed69fa7 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-03-11 Kimmo
+ PATCH: [ 1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)
+  Src: DirDoc.cpp MainFrm.cpp MainFrm.h
+
 2005-03-10 Kimmo
  PATCH: [ 1160064 ] Undo for Copy All
   Src: MergeDoc.cpp MergeDoc.h