From: Takashi Sawanaka Date: Sat, 6 Mar 2021 14:01:49 +0000 (+0900) Subject: Reduce the number of #include and . X-Git-Tag: v2.16.11~36 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=941cea264b9c4c9375dc5f4b19c2b6b31856cc63;p=winmerge-jp%2Fwinmerge-jp.git Reduce the number of #include and . --- diff --git a/Externals/crystaledit/editlib/utils/icu.hpp b/Externals/crystaledit/editlib/utils/icu.hpp index bc3776d2d..faddaf459 100644 --- a/Externals/crystaledit/editlib/utils/icu.hpp +++ b/Externals/crystaledit/editlib/utils/icu.hpp @@ -3,6 +3,7 @@ #include #include #include "string_util.h" +#include #ifndef ICU_EXTERN #define ICU_EXTERN extern diff --git a/Src/Common/RegOptionsMgr.cpp b/Src/Common/RegOptionsMgr.cpp index 19614e6c5..531eb4ea9 100644 --- a/Src/Common/RegOptionsMgr.cpp +++ b/Src/Common/RegOptionsMgr.cpp @@ -9,7 +9,6 @@ #include "RegOptionsMgr.h" #include #include -#include #include #include "varprop.h" #include "OptionsMgr.h" diff --git a/Src/Common/ShellFileOperations.cpp b/Src/Common/ShellFileOperations.cpp index 216ac7997..9e1d46099 100644 --- a/Src/Common/ShellFileOperations.cpp +++ b/Src/Common/ShellFileOperations.cpp @@ -8,7 +8,6 @@ #include "pch.h" #include "ShellFileOperations.h" #include -#include #include #include #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 5ef5b61cb..932ff379c 100644 --- 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 -#include #include #include #include diff --git a/Src/Constants.h b/Src/Constants.h index 9be0a26fc..964449662 100644 --- a/Src/Constants.h +++ b/Src/Constants.h @@ -6,6 +6,8 @@ */ #pragma once +#include "UnicodeString.h" + /** @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 bc7ba5a28..83623b664 100644 --- a/Src/DirTravel.cpp +++ b/Src/DirTravel.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include "TFile.h" #include "UnicodeString.h" #include "DirItem.h" diff --git a/Src/StdAfx.h b/Src/StdAfx.h index fad1f0278..5c6181e76 100644 --- a/Src/StdAfx.h +++ b/Src/StdAfx.h @@ -57,7 +57,6 @@ #include #include #include -#include /** * @name User-defined Windows-messages diff --git a/Src/pch.h b/Src/pch.h index c9fb56d55..3ab74ec14 100644 --- a/Src/pch.h +++ b/Src/pch.h @@ -14,4 +14,3 @@ #include #include #include -#include diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp index 2a06f60d1..40b9c6e53 100644 --- a/Src/stringdiffs.cpp +++ b/Src/stringdiffs.cpp @@ -8,8 +8,6 @@ #include "pch.h" #include "stringdiffs.h" #define NOMINMAX -#include -#include #include #include "CompareOptions.h" #include "stringdiffsi.h" diff --git a/Testing/FolderCompare/misc.cpp b/Testing/FolderCompare/misc.cpp index 4cf97633e..7cc1a6f38 100644 --- a/Testing/FolderCompare/misc.cpp +++ b/Testing/FolderCompare/misc.cpp @@ -4,7 +4,6 @@ #include "unicoder.h" #include "OptionsMgr.h" #include "RegOptionsMgr.h" -#include CRegOptionsMgr m_optionsMgr; diff --git a/Testing/FolderCompare/pch.h b/Testing/FolderCompare/pch.h index 0e6fd02f8..aed60ff33 100644 --- a/Testing/FolderCompare/pch.h +++ b/Testing/FolderCompare/pch.h @@ -11,4 +11,3 @@ #include #include #include -#include diff --git a/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp b/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp index 1fc7ad1e1..d5eaf5226 100644 --- a/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp +++ b/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "Constants.h" // FFILEOPEN_* flags #include "UnicodeString.h" @@ -53,7 +51,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -78,7 +76,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe ")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -103,7 +101,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\t")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -128,7 +126,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\n")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -154,7 +152,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -180,7 +178,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -206,7 +204,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -232,7 +230,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe\tC:\\Temp\\")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -258,7 +256,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\ ")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -284,7 +282,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:\\Temp\\\t")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -311,7 +309,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -338,7 +336,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -366,7 +364,7 @@ namespace EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -394,7 +392,7 @@ namespace EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -421,7 +419,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -448,7 +446,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -475,7 +473,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -502,7 +500,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -528,7 +526,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp/")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -554,7 +552,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe C:/Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -581,7 +579,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -608,7 +606,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -636,7 +634,7 @@ namespace EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -664,7 +662,7 @@ namespace EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Temp3"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -690,7 +688,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Temp\\\"")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -716,7 +714,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe \"C:\\Program Files\\\"")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -743,7 +741,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -770,7 +768,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -797,7 +795,7 @@ namespace EXPECT_EQ(2, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -825,7 +823,7 @@ namespace EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -853,7 +851,7 @@ namespace EXPECT_EQ(_T("C:\\Program Files"), cmdInfo.m_Files[0]); EXPECT_EQ(_T("C:\\Program Files2"), cmdInfo.m_Files[1]); EXPECT_EQ(_T("C:\\Program Files3"), cmdInfo.m_Files[2]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -878,7 +876,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp 1251")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -903,7 +901,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /cp 1251")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -928,7 +926,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp windows1251")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -953,7 +951,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp ")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -978,7 +976,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp ")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1004,7 +1002,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cp C:\\Temp C:\\Temp2")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp2"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1030,7 +1028,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1056,7 +1054,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1081,7 +1079,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\"")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1107,7 +1105,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr First C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1133,7 +1131,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\" C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1158,7 +1156,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dr \"First desc\"")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1184,7 +1182,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm First C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1210,7 +1208,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\" C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1235,7 +1233,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dm \"First desc\"")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1261,7 +1259,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1287,7 +1285,7 @@ namespace MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\" C:\\Temp")); EXPECT_EQ(1, cmdInfo.m_Files.GetSize()); EXPECT_EQ(_T("C:\\Temp"), cmdInfo.m_Files[0]); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1312,7 +1310,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr \"Second text\"")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1337,7 +1335,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr \"Second text\"")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1362,7 +1360,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl \"First desc\" -dr Second")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1387,7 +1385,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dr Second")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1412,7 +1410,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl First -dm Second -dr Third")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1437,7 +1435,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /unpacker CompareMSExcelFiles.sct")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1462,7 +1460,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /prediffer PrediffLineFilter.sct")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); @@ -1554,7 +1552,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -cfg Settings/TreeMode=1 -cfg Settings/ToolbarSize=0")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_EQ(_T("1"), cmdInfo.m_Options[_T("Settings/TreeMode")]); EXPECT_EQ(_T("0"), cmdInfo.m_Options[_T("Settings/ToolbarSize")]); } @@ -1565,7 +1563,7 @@ namespace { MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe -dl -dr Second")); EXPECT_EQ(0, cmdInfo.m_Files.GetSize()); - EXPECT_EQ(SW_SHOWNORMAL, cmdInfo.m_nCmdShow); + EXPECT_EQ(MergeCmdLineInfo::SHOWNORMAL, cmdInfo.m_nCmdShow); EXPECT_FALSE(cmdInfo.m_bEscShutdown); EXPECT_FALSE(cmdInfo.m_bExitIfNoDiff); EXPECT_FALSE(cmdInfo.m_bRecurse); diff --git a/Testing/GoogleTest/DirItem/DirItem_test.cpp b/Testing/GoogleTest/DirItem/DirItem_test.cpp index d3f4bec50..d664cdbdf 100644 --- a/Testing/GoogleTest/DirItem/DirItem_test.cpp +++ b/Testing/GoogleTest/DirItem/DirItem_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include "UnicodeString.h" #include "DirItem.h" diff --git a/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp b/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp index 4e8c02a65..bfc866677 100644 --- a/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp +++ b/Testing/GoogleTest/FileFilter/FileFilterHelper_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "FileFilterHelper.h" #include "Environment.h" diff --git a/Testing/GoogleTest/FileVersion/FileVersion_test.cpp b/Testing/GoogleTest/FileVersion/FileVersion_test.cpp index bc90e66d2..c0bc6c007 100644 --- a/Testing/GoogleTest/FileVersion/FileVersion_test.cpp +++ b/Testing/GoogleTest/FileVersion/FileVersion_test.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include #include -#include #include "FileVersion.h" namespace diff --git a/Testing/GoogleTest/GUITests/pch.h b/Testing/GoogleTest/GUITests/pch.h index 709ed894e..f72d80672 100644 --- a/Testing/GoogleTest/GUITests/pch.h +++ b/Testing/GoogleTest/GUITests/pch.h @@ -16,12 +16,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include "GUITestUtils.h" diff --git a/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp b/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp index ae94fcb79..3e3401215 100644 --- a/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp +++ b/Testing/GoogleTest/OptionsMgr/RegOptionsMgr_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "UnicodeString.h" #include "RegOptionsMgr.h" diff --git a/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp b/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp index ea42740e2..204966234 100644 --- a/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp +++ b/Testing/GoogleTest/OptionsMgr/VariantValue_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include "varprop.h" // NOTE: diff --git a/Testing/GoogleTest/Paths/paths_test.cpp b/Testing/GoogleTest/Paths/paths_test.cpp index 62a6ceefc..a1e0830cf 100644 --- a/Testing/GoogleTest/Paths/paths_test.cpp +++ b/Testing/GoogleTest/Paths/paths_test.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include -#include +#include +#include "Environment.h" #include "paths.h" // Expects that C:\Temp exists for creating temporary testing files. @@ -92,9 +93,8 @@ namespace } TEST_F(PathTest, Exists_files) { - TCHAR path[_MAX_PATH]; const TCHAR path2[] = _T("notfound.txt"); - GetModuleFileName(NULL, path, sizeof(path)); + String path = env::GetProgPath() + _T("../README.md"); EXPECT_EQ(paths::IS_EXISTING_FILE, paths::DoesPathExist(path)); EXPECT_EQ(paths::DOES_NOT_EXIST, paths::DoesPathExist(path2)); } @@ -174,8 +174,7 @@ namespace } TEST_F(PathTest, Normalize_abspath3) { - TCHAR curdir[_MAX_PATH]; - GetCurrentDirectory(sizeof(curdir), curdir); + String curdir = std::filesystem::current_path().native(); String path(curdir, 2); String path_orig = curdir; paths::normalize(path); diff --git a/Testing/GoogleTest/Plugins/Plugins_test.cpp b/Testing/GoogleTest/Plugins/Plugins_test.cpp index 9e5812796..495daf69b 100644 --- a/Testing/GoogleTest/Plugins/Plugins_test.cpp +++ b/Testing/GoogleTest/Plugins/Plugins_test.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include -#include #include #include "FileTransform.h" #include "PluginManager.h" diff --git a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp index 3b3a17c5e..636ea52c0 100644 --- a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp +++ b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "UnicodeString.h" #include "ShellFileOperations.h" diff --git a/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp b/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp index 4286fe8dd..b41c5a40a 100644 --- a/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp +++ b/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "stringdiffs.h" diff --git a/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp b/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp index d361e7e37..12f06bfd9 100644 --- a/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp +++ b/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "stringdiffs.h" diff --git a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp index f4ab4c3da..7f030b057 100644 --- a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp +++ b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "stringdiffs.h" diff --git a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp index ce9202af3..a247ff25a 100644 --- a/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp +++ b/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include -#include -#include #include #include "stringdiffs.h" diff --git a/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp b/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp index 5a7ea6ca0..b30a3c0a0 100644 --- a/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp +++ b/Testing/GoogleTest/UnicodeString/UnicodeString_test.cpp @@ -1,8 +1,5 @@ #include "pch.h" #include -#include -#include - #include "UnicodeString.h" namespace diff --git a/Testing/GoogleTest/UnitTests/test_main.cpp b/Testing/GoogleTest/UnitTests/test_main.cpp index 8d39bbf8b..4918cd7f2 100644 --- a/Testing/GoogleTest/UnitTests/test_main.cpp +++ b/Testing/GoogleTest/UnitTests/test_main.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include -#include #include int _tmain(int argc, TCHAR **argv) diff --git a/Testing/GoogleTest/diffutils/mystat_test.cpp b/Testing/GoogleTest/diffutils/mystat_test.cpp index 46ae2e5d5..bc57c5e94 100644 --- 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 TEST(diffutils, stat) {