Remove MFC dependency from MergeCmdLineInfo. Also comment out code to support some...

diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj
index b186014..10d51ef 100644 (file)
--- a/Src/Merge.vcproj
+++ b/Src/Merge.vcproj
@@ -3242,7 +3242,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="UnicodeDebug|Win32">
@@ -3251,6 +3254,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -3260,6 +3266,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -3268,7 +3277,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                        </File>
                        <File

diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp
index a0444d8..ab41b2b 100644 (file)
--- a/Src/MergeCmdLineInfo.cpp
+++ b/Src/MergeCmdLineInfo.cpp
@@ -29,13 +29,11 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "StdAfx.h"
-
+#include <windows.h>
+#include <tchar.h>
 #include <shlwapi.h> // Required for PathFindFileName
 #include "Constants.h"
 #include "Paths.h"
-#include "Merge.h"
-#include "MainFrm.h"
 #include "MergeCmdLineInfo.h"
 #include "OptionsDef.h"
 
@@ -94,7 +92,7 @@ LPCTSTR MergeCmdLineInfo::SetOption(LPCTSTR q, LPCTSTR key, LPCTSTR value)
                q = EatParam(q, s);
                value = s.c_str() + 1;
        }
-       GetOptionsMgr()->SaveOption(key, value);
+//     GetOptionsMgr()->SaveOption(key, value);
        return q;
 }
 
@@ -267,9 +265,9 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(LPCTSTR q)
                {
                        // -noprefs means do not load or remember options (preferences)
                        // Turn off serializing to registry.
-                       GetOptionsMgr()->SetSerializing(false);
+//                     GetOptionsMgr()->SetSerializing(false);
                        // Load all default settings.
-                       theApp.ResetOptions();
+//                     theApp.ResetOptions();
                }
                else if (param == _T("minimize"))
                {

diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index 7d09527..f1623ea 100644 (file)
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -18,20 +18,21 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 /////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
-#define _MERGE_CMD_LINE_INFO_INCLUDED_
-
 /** 
  * @file  MergeCmdLineInfo.h
  *
  * @brief MergeCmdLineInfo class declaration.
  *
  */
-
 // ID line follows -- this is updated by SVN
 // $Id$
 
+#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
+#define _MERGE_CMD_LINE_INFO_INCLUDED_
+
+#include <vector>
+#include "UnicodeString.h"
+
 /** 
  * @brief WinMerge's command line handler.
  * This class calls command line parser(s) and allows reading parsed values