OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
354a3f7
)
Reduce the number of #include <Windows.h> and <tchar.h>.
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 6 Mar 2021 14:01:49 +0000
(23:01 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 6 Mar 2021 14:01:49 +0000
(23:01 +0900)
28 files changed:
Externals/crystaledit/editlib/utils/icu.hpp
patch
|
blob
|
history
Src/Common/RegOptionsMgr.cpp
patch
|
blob
|
history
Src/Common/ShellFileOperations.cpp
patch
|
blob
|
history
Src/Common/unicoder.cpp
patch
|
blob
|
history
Src/Constants.h
patch
|
blob
|
history
Src/DirTravel.cpp
patch
|
blob
|
history
Src/StdAfx.h
patch
|
blob
|
history
Src/pch.h
patch
|
blob
|
history
Src/stringdiffs.cpp
patch
|
blob
|
history
Testing/FolderCompare/misc.cpp
patch
|
blob
|
history
Testing/FolderCompare/pch.h
patch
|
blob
|
history
Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/DirItem/DirItem_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/FileVersion/FileVersion_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/GUITests/pch.h
patch
|
blob
|
history
Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/Paths/paths_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/Plugins/Plugins_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
patch
|
blob
|
history
Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp
patch
|
blob
|
history
Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp
patch
|
blob
|
history
Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp
patch
|
blob
|
history
Testing/GoogleTest/UnitTests/test_main.cpp
patch
|
blob
|
history
Testing/GoogleTest/diffutils/mystat_test.cpp
patch
|
blob
|
history
diff --git
a/Externals/crystaledit/editlib/utils/icu.hpp
b/Externals/crystaledit/editlib/utils/icu.hpp
index
bc3776d
..
faddaf4
100644
(file)
--- a/
Externals/crystaledit/editlib/utils/icu.hpp
+++ b/
Externals/crystaledit/editlib/utils/icu.hpp
@@
-3,6
+3,7
@@
#include <cstdint>
\r
#include <memory>
\r
#include "string_util.h"
\r
#include <cstdint>
\r
#include <memory>
\r
#include "string_util.h"
\r
+#include <Windows.h>
\r
\r
#ifndef ICU_EXTERN
\r
#define ICU_EXTERN extern
\r
\r
#ifndef ICU_EXTERN
\r
#define ICU_EXTERN extern
\r
diff --git
a/Src/Common/RegOptionsMgr.cpp
b/Src/Common/RegOptionsMgr.cpp
index
19614e6
..
531eb4e
100644
(file)
--- a/
Src/Common/RegOptionsMgr.cpp
+++ b/
Src/Common/RegOptionsMgr.cpp
@@
-9,7
+9,6
@@
#include "RegOptionsMgr.h"
#include <windows.h>
#include <Shlwapi.h>
#include "RegOptionsMgr.h"
#include <windows.h>
#include <Shlwapi.h>
-#include <tchar.h>
#include <vector>
#include "varprop.h"
#include "OptionsMgr.h"
#include <vector>
#include "varprop.h"
#include "OptionsMgr.h"
diff --git
a/Src/Common/ShellFileOperations.cpp
b/Src/Common/ShellFileOperations.cpp
index
216ac79
..
9e1d460
100644
(file)
--- a/
Src/Common/ShellFileOperations.cpp
+++ b/
Src/Common/ShellFileOperations.cpp
@@
-8,7
+8,6
@@
#include "pch.h"
#include "ShellFileOperations.h"
#include <windows.h>
#include "pch.h"
#include "ShellFileOperations.h"
#include <windows.h>
-#include <tchar.h>
#include <vector>
#include <shellAPI.h>
#pragma warning (push) // prevent "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared"
#include <vector>
#include <shellAPI.h>
#pragma warning (push) // prevent "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared"
diff --git
a/Src/Common/unicoder.cpp
b/Src/Common/unicoder.cpp
index
5ef5b61
..
932ff37
100644
(file)
--- a/
Src/Common/unicoder.cpp
+++ b/
Src/Common/unicoder.cpp
@@
-17,7
+17,6
@@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#include "pch.h"
#include "unicoder.h"
#include <windows.h>
#include "pch.h"
#include "unicoder.h"
#include <windows.h>
-#include <tchar.h>
#include <cassert>
#include <memory>
#include <Poco/UnicodeConverter.h>
#include <cassert>
#include <memory>
#include <Poco/UnicodeConverter.h>
diff --git
a/Src/Constants.h
b/Src/Constants.h
index
9be0a26
..
9644496
100644
(file)
--- a/
Src/Constants.h
+++ b/
Src/Constants.h
@@
-6,6
+6,8
@@
*/
#pragma once
*/
#pragma once
+#include "UnicodeString.h"
+
/** @brief URL for hyperlink in About-dialog. */
const TCHAR WinMergeURL[] = _T("https://winmerge.org/");
/** @brief URL for hyperlink in About-dialog. */
const TCHAR WinMergeURL[] = _T("https://winmerge.org/");
diff --git
a/Src/DirTravel.cpp
b/Src/DirTravel.cpp
index
bc7ba5a
..
83623b6
100644
(file)
--- a/
Src/DirTravel.cpp
+++ b/
Src/DirTravel.cpp
@@
-11,7
+11,6
@@
#include <Poco/DirectoryIterator.h>
#include <Poco/Timestamp.h>
#include <windows.h>
#include <Poco/DirectoryIterator.h>
#include <Poco/Timestamp.h>
#include <windows.h>
-#include <tchar.h>
#include "TFile.h"
#include "UnicodeString.h"
#include "DirItem.h"
#include "TFile.h"
#include "UnicodeString.h"
#include "DirItem.h"
diff --git
a/Src/StdAfx.h
b/Src/StdAfx.h
index
fad1f02
..
5c6181e
100644
(file)
--- a/
Src/StdAfx.h
+++ b/
Src/StdAfx.h
@@
-57,7
+57,6
@@
#include <functional>
#include <cassert>
#include <ctime>
#include <functional>
#include <cassert>
#include <ctime>
-#include <tchar.h>
/**
* @name User-defined Windows-messages
/**
* @name User-defined Windows-messages
diff --git
a/Src/pch.h
b/Src/pch.h
index
c9fb56d
..
3ab74ec
100644
(file)
--- a/
Src/pch.h
+++ b/
Src/pch.h
@@
-14,4
+14,3
@@
#include <functional>
\r
#include <cassert>
\r
#include <ctime>
\r
#include <functional>
\r
#include <cassert>
\r
#include <ctime>
\r
-#include <tchar.h>
\r
diff --git
a/Src/stringdiffs.cpp
b/Src/stringdiffs.cpp
index
2a06f60
..
40b9c6e
100644
(file)
--- a/
Src/stringdiffs.cpp
+++ b/
Src/stringdiffs.cpp
@@
-8,8
+8,6
@@
#include "pch.h"
#include "stringdiffs.h"
#define NOMINMAX
#include "pch.h"
#include "stringdiffs.h"
#define NOMINMAX
-#include <windows.h>
-#include <tchar.h>
#include <cassert>
#include "CompareOptions.h"
#include "stringdiffsi.h"
#include <cassert>
#include "CompareOptions.h"
#include "stringdiffsi.h"
diff --git
a/Testing/FolderCompare/misc.cpp
b/Testing/FolderCompare/misc.cpp
index
4cf9763
..
7cc1a6f
100644
(file)
--- a/
Testing/FolderCompare/misc.cpp
+++ b/
Testing/FolderCompare/misc.cpp
@@
-4,7
+4,6
@@
#include "unicoder.h"
#include "OptionsMgr.h"
#include "RegOptionsMgr.h"
#include "unicoder.h"
#include "OptionsMgr.h"
#include "RegOptionsMgr.h"
-#include <Windows.h>
CRegOptionsMgr m_optionsMgr;
CRegOptionsMgr m_optionsMgr;
diff --git
a/Testing/FolderCompare/pch.h
b/Testing/FolderCompare/pch.h
index
0e6fd02
..
aed60ff
100644
(file)
--- a/
Testing/FolderCompare/pch.h
+++ b/
Testing/FolderCompare/pch.h
@@
-11,4
+11,3
@@
#include <memory>
\r
#include <cassert>
\r
#include <ctime>
\r
#include <memory>
\r
#include <cassert>
\r
#include <ctime>
\r
-#include <tchar.h>
\r
diff --git
a/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
b/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
index
1fc7ad1
..
d5eaf52
100644
(file)
--- a/
Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
+++ b/
Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
-#include <windows.h>
\r
-#include <tchar.h>
\r
#include <vector>
\r
#include "Constants.h" // FFILEOPEN_* flags
\r
#include "UnicodeString.h"
\r
#include <vector>
\r
#include "Constants.h" // FFILEOPEN_* flags
\r
#include "UnicodeString.h"
\r
@@
-53,7
+51,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-78,7
+76,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-103,7
+101,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\t"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\t"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-128,7
+126,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\n"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\n"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-154,7
+152,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-180,7
+178,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-206,7
+204,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-232,7
+230,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\tC:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\tC:\\Temp\\"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-258,7
+256,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\ "));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\ "));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-284,7
+282,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\\t"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\\t"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-311,7
+309,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-338,7
+336,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-366,7
+364,7
@@
namespace
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-394,7
+392,7
@@
namespace
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-421,7
+419,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-448,7
+446,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-475,7
+473,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-502,7
+500,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-528,7
+526,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp/"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp/"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-554,7
+552,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-581,7
+579,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-608,7
+606,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-636,7
+634,7
@@
namespace
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-664,7
+662,7
@@
namespace
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-690,7
+688,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Temp\\\""));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Temp\\\""));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-716,7
+714,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Program Files\\\""));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Program Files\\\""));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-743,7
+741,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-770,7
+768,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-797,7
+795,7
@@
namespace
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(2, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-825,7
+823,7
@@
namespace
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-853,7
+851,7
@@
namespace
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Program Files3"), cmdInfo.m_Files[2]);
\r
EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]);
\r
EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]);
\r
EXPECT_EQ(_T("C:\\Program Files3"), cmdInfo.m_Files[2]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-878,7
+876,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp 1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp 1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-903,7
+901,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /cp 1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /cp 1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-928,7
+926,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp windows1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp windows1251"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-953,7
+951,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-978,7
+976,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp "));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1004,7
+1002,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp C:\\Temp2"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp C:\\Temp2"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1030,7
+1028,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1056,7
+1054,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1081,7
+1079,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1107,7
+1105,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1133,7
+1131,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1158,7
+1156,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1184,7
+1182,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm First C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1210,7
+1208,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1235,7
+1233,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1261,7
+1259,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1287,7
+1285,7
@@
namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\" C:\\Temp"));
\r
EXPECT_EQ(1, cmdInfo.m_Files.GetSize());
\r
EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]);
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1312,7
+1310,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1337,7
+1335,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr \"Second text\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr \"Second text\""));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1362,7
+1360,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1387,7
+1385,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1412,7
+1410,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dm Second -dr Third"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dm Second -dr Third"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1437,7
+1435,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /unpacker CompareMSExcelFiles.sct"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /unpacker CompareMSExcelFiles.sct"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1462,7
+1460,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /prediffer PrediffLineFilter.sct"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /prediffer PrediffLineFilter.sct"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
@@
-1554,7
+1552,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cfg Settings/TreeMode=1 -cfg Settings/ToolbarSize=0"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cfg Settings/TreeMode=1 -cfg Settings/ToolbarSize=0"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_EQ(_T("1"), cmdInfo.m_Options[_T("Settings/TreeMode")]);
\r
EXPECT_EQ(_T("0"), cmdInfo.m_Options[_T("Settings/ToolbarSize")]);
\r
}
\r
EXPECT_EQ(_T("1"), cmdInfo.m_Options[_T("Settings/TreeMode")]);
\r
EXPECT_EQ(_T("0"), cmdInfo.m_Options[_T("Settings/ToolbarSize")]);
\r
}
\r
@@
-1565,7
+1563,7
@@
namespace
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
{
\r
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl -dr Second"));
\r
EXPECT_EQ(0, cmdInfo.m_Files.GetSize());
\r
- EXPECT_EQ(
SW_
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
+ EXPECT_EQ(
MergeCmdLineInfo::
SHOWNORMAL, cmdInfo.m_nCmdShow);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
EXPECT_FALSE(cmdInfo.m_bEscShutdown);
\r
EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff);
\r
EXPECT_FALSE(cmdInfo.m_bRecurse);
\r
diff --git
a/Testing/GoogleTest/DirItem/DirItem_test.cpp
b/Testing/GoogleTest/DirItem/DirItem_test.cpp
index
d3f4bec
..
d664cdb
100644
(file)
--- a/
Testing/GoogleTest/DirItem/DirItem_test.cpp
+++ b/
Testing/GoogleTest/DirItem/DirItem_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include "UnicodeString.h"
#include "DirItem.h"
#include "UnicodeString.h"
#include "DirItem.h"
diff --git
a/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp
b/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp
index
4e8c02a
..
bfc8666
100644
(file)
--- a/
Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp
+++ b/
Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "FileFilterHelper.h"
#include "Environment.h"
#include <vector>
#include "FileFilterHelper.h"
#include "Environment.h"
diff --git
a/Testing/GoogleTest/FileVersion/FileVersion_test.cpp
b/Testing/GoogleTest/FileVersion/FileVersion_test.cpp
index
bc90e66
..
c0bc6c0
100644
(file)
--- a/
Testing/GoogleTest/FileVersion/FileVersion_test.cpp
+++ b/
Testing/GoogleTest/FileVersion/FileVersion_test.cpp
@@
-1,7
+1,6
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include <windows.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include <windows.h>
\r
-#include <tchar.h>
\r
#include "FileVersion.h"
\r
\r
namespace
\r
#include "FileVersion.h"
\r
\r
namespace
\r
diff --git
a/Testing/GoogleTest/GUITests/pch.h
b/Testing/GoogleTest/GUITests/pch.h
index
709ed89
..
f72d806
100644
(file)
--- a/
Testing/GoogleTest/GUITests/pch.h
+++ b/
Testing/GoogleTest/GUITests/pch.h
@@
-16,12
+16,10
@@
#include <ctime>
\r
#include <filesystem>
\r
#include <regex>
\r
#include <ctime>
\r
#include <filesystem>
\r
#include <regex>
\r
-#include <tchar.h>
\r
#include <gtest/gtest.h>
\r
#include <gtest/gtest-param-test.h>
\r
#include <windows.h>
\r
#include <CommCtrl.h>
\r
#include <gtest/gtest.h>
\r
#include <gtest/gtest-param-test.h>
\r
#include <windows.h>
\r
#include <CommCtrl.h>
\r
-#include <tchar.h>
\r
#include <afxres.h>
\r
#include <atlimage.h>
\r
#include "GUITestUtils.h"
\r
#include <afxres.h>
\r
#include <atlimage.h>
\r
#include "GUITestUtils.h"
\r
diff --git
a/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp
b/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp
index
ae94fcb
..
3e34012
100644
(file)
--- a/
Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp
+++ b/
Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
-#include <windows.h>
\r
-#include <tchar.h>
\r
#include <vector>
\r
#include "UnicodeString.h"
\r
#include "RegOptionsMgr.h"
\r
#include <vector>
\r
#include "UnicodeString.h"
\r
#include "RegOptionsMgr.h"
\r
diff --git
a/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp
b/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp
index
ea42740
..
2049662
100644
(file)
--- a/
Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp
+++ b/
Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
-#include <windows.h>
\r
-#include <tchar.h>
\r
#include "varprop.h"
\r
\r
// NOTE:
\r
#include "varprop.h"
\r
\r
// NOTE:
\r
diff --git
a/Testing/GoogleTest/Paths/paths_test.cpp
b/Testing/GoogleTest/Paths/paths_test.cpp
index
62a6cee
..
a1e0830
100644
(file)
--- a/
Testing/GoogleTest/Paths/paths_test.cpp
+++ b/
Testing/GoogleTest/Paths/paths_test.cpp
@@
-1,6
+1,7
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
-#include <windows.h>
\r
+#include <filesystem>
\r
+#include "Environment.h"
\r
#include "paths.h"
\r
\r
// Expects that C:\Temp exists for creating temporary testing files.
\r
#include "paths.h"
\r
\r
// Expects that C:\Temp exists for creating temporary testing files.
\r
@@
-92,9
+93,8
@@
namespace
}
\r
TEST_F(PathTest, Exists_files)
\r
{
\r
}
\r
TEST_F(PathTest, Exists_files)
\r
{
\r
- TCHAR path[_MAX_PATH];
\r
const TCHAR path2[] = _T("notfound.txt");
\r
const TCHAR path2[] = _T("notfound.txt");
\r
-
GetModuleFileName(NULL, path, sizeof(path)
);
\r
+
String path = env::GetProgPath() + _T("../README.md"
);
\r
EXPECT_EQ(paths::IS_EXISTING_FILE, paths::DoesPathExist(path));
\r
EXPECT_EQ(paths::DOES_NOT_EXIST, paths::DoesPathExist(path2));
\r
}
\r
EXPECT_EQ(paths::IS_EXISTING_FILE, paths::DoesPathExist(path));
\r
EXPECT_EQ(paths::DOES_NOT_EXIST, paths::DoesPathExist(path2));
\r
}
\r
@@
-174,8
+174,7
@@
namespace
}
\r
TEST_F(PathTest, Normalize_abspath3)
\r
{
\r
}
\r
TEST_F(PathTest, Normalize_abspath3)
\r
{
\r
- TCHAR curdir[_MAX_PATH];
\r
- GetCurrentDirectory(sizeof(curdir), curdir);
\r
+ String curdir = std::filesystem::current_path().native();
\r
String path(curdir, 2);
\r
String path_orig = curdir;
\r
paths::normalize(path);
\r
String path(curdir, 2);
\r
String path_orig = curdir;
\r
paths::normalize(path);
\r
diff --git
a/Testing/GoogleTest/Plugins/Plugins_test.cpp
b/Testing/GoogleTest/Plugins/Plugins_test.cpp
index
9e58127
..
495daf6
100644
(file)
--- a/
Testing/GoogleTest/Plugins/Plugins_test.cpp
+++ b/
Testing/GoogleTest/Plugins/Plugins_test.cpp
@@
-1,6
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <tchar.h>
#include <vector>
#include "FileTransform.h"
#include "PluginManager.h"
#include <vector>
#include "FileTransform.h"
#include "PluginManager.h"
diff --git
a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
index
3b3a17c
..
636ea52
100644
(file)
--- a/
Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
+++ b/
Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "UnicodeString.h"
#include "ShellFileOperations.h"
#include <vector>
#include "UnicodeString.h"
#include "ShellFileOperations.h"
diff --git
a/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp
b/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp
index
4286fe8
..
b41c5a4
100644
(file)
--- a/
Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp
+++ b/
Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "stringdiffs.h"
#include <vector>
#include "stringdiffs.h"
diff --git
a/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
b/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
index
d361e7e
..
12f06bf
100644
(file)
--- a/
Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
+++ b/
Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "stringdiffs.h"
#include <vector>
#include "stringdiffs.h"
diff --git
a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp
b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp
index
f4ab4c3
..
7f030b0
100644
(file)
--- a/
Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp
+++ b/
Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "stringdiffs.h"
#include <vector>
#include "stringdiffs.h"
diff --git
a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp
b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp
index
ce9202a
..
a247ff2
100644
(file)
--- a/
Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp
+++ b/
Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp
@@
-1,7
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
-#include <tchar.h>
#include <vector>
#include "stringdiffs.h"
#include <vector>
#include "stringdiffs.h"
diff --git
a/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp
b/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp
index
5a7ea6c
..
b30a3c0
100644
(file)
--- a/
Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp
+++ b/
Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp
@@
-1,8
+1,5
@@
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
#include "pch.h"
\r
#include <gtest/gtest.h>
\r
-#include <windows.h>
\r
-#include <tchar.h>
\r
-
\r
#include "UnicodeString.h"
\r
\r
namespace
\r
#include "UnicodeString.h"
\r
\r
namespace
\r
diff --git
a/Testing/GoogleTest/UnitTests/test_main.cpp
b/Testing/GoogleTest/UnitTests/test_main.cpp
index
8d39bbf
..
4918cd7
100644
(file)
--- a/
Testing/GoogleTest/UnitTests/test_main.cpp
+++ b/
Testing/GoogleTest/UnitTests/test_main.cpp
@@
-1,6
+1,5
@@
#include "pch.h"
#include <gtest/gtest.h>
#include "pch.h"
#include <gtest/gtest.h>
-#include <windows.h>
#include <tchar.h>
int _tmain(int argc, TCHAR **argv)
#include <tchar.h>
int _tmain(int argc, TCHAR **argv)
diff --git
a/Testing/GoogleTest/diffutils/mystat_test.cpp
b/Testing/GoogleTest/diffutils/mystat_test.cpp
index
46ae2e5
..
bc57c5e
100644
(file)
--- a/
Testing/GoogleTest/diffutils/mystat_test.cpp
+++ b/
Testing/GoogleTest/diffutils/mystat_test.cpp
@@
-4,7
+4,6
@@
#include "Environment.h"
#include "paths.h"
#include "diff.h"
#include "Environment.h"
#include "paths.h"
#include "diff.h"
-#include <Windows.h>
TEST(diffutils, stat)
{
TEST(diffutils, stat)
{