[Winmerge-svn] SF.net SVN: winmerge:[5906] trunk/Src

[<mar...@us...>]

Revision: 5906
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5906&view=rev
Author:   marcelgosselin
Date:     2008-09-07 02:56:58 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Use bool instead of BOOL for m_bStopAfterFirstDiff

Modified Paths:
--------------
    trunk/Src/CompareEngines/ByteCompare.cpp
    trunk/Src/CompareEngines/ByteCompare.h
    trunk/Src/CompareOptions.cpp
    trunk/Src/CompareOptions.h
    trunk/Src/DiffContext.cpp
    trunk/Src/DiffContext.h

Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/CompareEngines/ByteCompare.cpp	2008-09-07 02:56:58 UTC (rev 5906)
@@ -6,7 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include <io.h>
 #include "FileLocation.h"
 #include "UnicodeString.h"
@@ -15,7 +15,7 @@
 #include "FilterList.h"
 #include "DiffContext.h"
 #include "FileTransform.h"
-#include "diff.h"
+#include "DIFF.H"
 #include "ByteComparator.h"
 #include "ByteCompare.h"
 #include "DiffFileData.h"
@@ -77,7 +77,7 @@
  * @brief Set compare-type specific options.
  * @param [in] stopAfterFirstDiff Do we stop compare after first found diff.
  */
-void ByteCompare::SetAdditionalOptions(BOOL stopAfterFirstDiff)
+void ByteCompare::SetAdditionalOptions(bool stopAfterFirstDiff)
 {
 	m_pOptions->m_bStopAfterFirstDiff = stopAfterFirstDiff;
 }

Modified: trunk/Src/CompareEngines/ByteCompare.h
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.h	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/CompareEngines/ByteCompare.h	2008-09-07 02:56:58 UTC (rev 5906)
@@ -27,7 +27,7 @@
 
 	bool SetCompareOptions(const CompareOptions & options);
 	void ClearCompareOptions();
-	void SetAdditionalOptions(BOOL stopAfterFirstDiff);
+	void SetAdditionalOptions(bool stopAfterFirstDiff);
 	void SetAbortable(const IAbortable * piAbortable);
 	void SetFileData(int items, file_data *data);
 	int CompareFiles(FileLocation *location);

Modified: trunk/Src/CompareOptions.cpp
===================================================================
--- trunk/Src/CompareOptions.cpp	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/CompareOptions.cpp	2008-09-07 02:56:58 UTC (rev 5906)
@@ -6,8 +6,8 @@
 // ID line follows -- this is updated by SVN
 // $Id: ByteComparator.h 3397 2006-07-27 10:41:24Z kimmov $
 
-#include "stdafx.h"
-#include "Diff.h"
+#include "StdAfx.h"
+#include "DIFF.H"
 #include "CompareOptions.h"
 
 // Global defined in diffutils code
@@ -65,7 +65,7 @@
  * @brief Default constructor.
  */
 QuickCompareOptions::QuickCompareOptions()
-: m_bStopAfterFirstDiff(FALSE)
+: m_bStopAfterFirstDiff(false)
 {
 
 }
@@ -202,6 +202,6 @@
 
 QuickCompareOptions::QuickCompareOptions(const CompareOptions& options)
 : CompareOptions(options)
-, m_bStopAfterFirstDiff(FALSE)
+, m_bStopAfterFirstDiff(false)
 {
 }

Modified: trunk/Src/CompareOptions.h
===================================================================
--- trunk/Src/CompareOptions.h	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/CompareOptions.h	2008-09-07 02:56:58 UTC (rev 5906)
@@ -124,7 +124,7 @@
 	QuickCompareOptions();
 	QuickCompareOptions(const CompareOptions& options);
 
-	BOOL m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
+	bool m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
 };
 
 #endif // CompareOptions_h_included

Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/DiffContext.cpp	2008-09-07 02:56:58 UTC (rev 5906)
@@ -27,7 +27,7 @@
 // $Id$
 //////////////////////////////////////////////////////////////////////
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include <shlwapi.h>
 #include "UnicodeString.h"
 #include "Merge.h"
@@ -66,7 +66,7 @@
 , m_bIgnoreSmallTimeDiff(FALSE)
 , m_pCompareStats(NULL)
 , m_piAbortable(NULL)
-, m_bStopAfterFirstDiff(FALSE)
+, m_bStopAfterFirstDiff(false)
 , m_pFilterList(NULL)
 , m_pCompareOptions(NULL)
 , m_pOptions(NULL)

Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h	2008-09-06 07:14:09 UTC (rev 5905)
+++ trunk/Src/DiffContext.h	2008-09-07 02:56:58 UTC (rev 5906)
@@ -143,7 +143,7 @@
 	 * compare right after finding the first difference. This speeds up the
 	 * compare, but also causes compare statistics to be inaccurate.
 	 */
-	BOOL m_bStopAfterFirstDiff;
+	bool m_bStopAfterFirstDiff;
 
 	/**
 	 * Threshold size for switching to quick compare.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.