Leave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*

[winmerge-jp/winmerge-jp.git] / Src / OptionsDiffOptions.cpp

diff --git a/Src/OptionsDiffOptions.cpp b/Src/OptionsDiffOptions.cpp
index a4819aa..522f807 100644 (file)
--- a/Src/OptionsDiffOptions.cpp
+++ b/Src/OptionsDiffOptions.cpp
@@ -3,6 +3,7 @@
  *
  * @brief Implementation for OptionsDiffOptions class.
  */
+#include "pch.h"
 #include "OptionsDiffOptions.h"
 #include "CompareOptions.h"
 #include "OptionsDef.h"
@@ -20,6 +21,9 @@ void SetDefaults(COptionsMgr *pOptionsMgr)
        pOptionsMgr->InitOption(OPT_CMP_FILTER_COMMENTLINES, false);
        pOptionsMgr->InitOption(OPT_CMP_IGNORE_CASE, false);
        pOptionsMgr->InitOption(OPT_CMP_IGNORE_EOL, false);
+       pOptionsMgr->InitOption(OPT_CMP_DIFF_ALGORITHM, (int)0);
+       pOptionsMgr->InitOption(OPT_CMP_INDENT_HEURISTIC, true);
+       pOptionsMgr->InitOption(OPT_CMP_COMPLETELY_BLANK_OUT_IGNORED_CHANGES, false);
 }
 
 void Load(const COptionsMgr *pOptionsMgr, DIFFOPTIONS& options)
@@ -29,6 +33,9 @@ void Load(const COptionsMgr *pOptionsMgr, DIFFOPTIONS& options)
        options.bFilterCommentsLines = pOptionsMgr->GetBool(OPT_CMP_FILTER_COMMENTLINES);
        options.bIgnoreCase = pOptionsMgr->GetBool(OPT_CMP_IGNORE_CASE);
        options.bIgnoreEol = pOptionsMgr->GetBool(OPT_CMP_IGNORE_EOL);
+       options.nDiffAlgorithm = pOptionsMgr->GetInt(OPT_CMP_DIFF_ALGORITHM);
+       options.bIndentHeuristic = pOptionsMgr->GetBool(OPT_CMP_INDENT_HEURISTIC);
+       options.bCompletelyBlankOutIgnoredChanges = pOptionsMgr->GetBool(OPT_CMP_COMPLETELY_BLANK_OUT_IGNORED_CHANGES);
 }
 
 void Save(COptionsMgr *pOptionsMgr, const DIFFOPTIONS& options)
@@ -38,6 +45,9 @@ void Save(COptionsMgr *pOptionsMgr, const DIFFOPTIONS& options)
        pOptionsMgr->SaveOption(OPT_CMP_FILTER_COMMENTLINES, options.bFilterCommentsLines);
        pOptionsMgr->SaveOption(OPT_CMP_IGNORE_CASE, options.bIgnoreCase);
        pOptionsMgr->SaveOption(OPT_CMP_IGNORE_EOL, options.bIgnoreEol);
+       pOptionsMgr->SaveOption(OPT_CMP_DIFF_ALGORITHM, options.nDiffAlgorithm);
+       pOptionsMgr->SaveOption(OPT_CMP_INDENT_HEURISTIC, options.bIndentHeuristic);
+       pOptionsMgr->SaveOption(OPT_CMP_COMPLETELY_BLANK_OUT_IGNORED_CHANGES, options.bCompletelyBlankOutIgnoredChanges);
 }
 
 }