From 296006de99eaf45817672dc524b88e6d8199dafd Mon Sep 17 00:00:00 2001 From: Sabine Date: Wed, 24 Aug 2022 15:34:22 +0200 Subject: [PATCH] chore(developer): removed #pragma once from wrong places, edited #includes --- common/windows/cpp/src/registry.cpp | 2 +- common/windows/cpp/src/vkeys.cpp | 2 +- common/windows/cpp/src/xstring.cpp | 2 +- developer/src/kmcmpdll/CasedKeys.cpp | 2 +- developer/src/kmcmpdll/CharToKeyConversion.cpp | 2 +- developer/src/kmcmpdll/CheckFilenameConsistency.cpp | 4 ++-- developer/src/kmcmpdll/CheckFilenameConsistency.h | 3 ++- developer/src/kmcmpdll/CheckForDuplicates.cpp | 11 +++++------ developer/src/kmcmpdll/CheckNCapsConsistency.cpp | 7 +++---- developer/src/kmcmpdll/CheckNCapsConsistency.h | 2 +- developer/src/kmcmpdll/UnreachableRules.cpp | 8 ++++---- developer/src/kmcmpdll/kmcmpdll.h | 4 ++-- developer/src/kmcmpdll/kmx_u16.cpp | 1 - developer/src/kmcmpdll/pch.h | 6 +++--- developer/src/kmcmpdll/versioning.cpp | 2 +- developer/src/kmcmpdll/virtualcharkeys.h | 2 +- 16 files changed, 29 insertions(+), 31 deletions(-) diff --git a/common/windows/cpp/src/registry.cpp b/common/windows/cpp/src/registry.cpp index ca1e2f41ef..880c710366 100644 --- a/common/windows/cpp/src/registry.cpp +++ b/common/windows/cpp/src/registry.cpp @@ -22,7 +22,7 @@ 20 Nov 2012 - mcdurdin - I3584 - V9.0 - IntRecursiveDeleteKey needed a buf len reset after each iteration */ -#include +#include "pch.h" #include "../include/registry.h" RegistryReadOnly::RegistryReadOnly(HKEY AhRootKey) diff --git a/common/windows/cpp/src/vkeys.cpp b/common/windows/cpp/src/vkeys.cpp index 77191533f7..1ff5dd7c42 100644 --- a/common/windows/cpp/src/vkeys.cpp +++ b/common/windows/cpp/src/vkeys.cpp @@ -16,7 +16,7 @@ History: 22 Mar 2010 - mcdurdin - Compiler fixup - tidy up */ -#include +#include "pch.h" #include "../include/vkeys.h" const KMX_UCHAR* VKeyNames[256] = { diff --git a/common/windows/cpp/src/xstring.cpp b/common/windows/cpp/src/xstring.cpp index 3d8e797dcf..3d1807c5be 100644 --- a/common/windows/cpp/src/xstring.cpp +++ b/common/windows/cpp/src/xstring.cpp @@ -15,7 +15,7 @@ Notes: History: 27 Aug 2012 - mcdurdin - I3439 - V9.0 - Refactor xstring support in C++ code */ -#include +#include "pch.h" /* diff --git a/developer/src/kmcmpdll/CasedKeys.cpp b/developer/src/kmcmpdll/CasedKeys.cpp index 8e241c929d..003038146d 100644 --- a/developer/src/kmcmpdll/CasedKeys.cpp +++ b/developer/src/kmcmpdll/CasedKeys.cpp @@ -3,7 +3,7 @@ #include #include -#include <../../../common/windows/cpp/include/vkeys.h> +#include "../../../common/windows/cpp/include/vkeys.h" #include #include "CharToKeyConversion.h" diff --git a/developer/src/kmcmpdll/CharToKeyConversion.cpp b/developer/src/kmcmpdll/CharToKeyConversion.cpp index 93c2384cac..f6adad2c74 100644 --- a/developer/src/kmcmpdll/CharToKeyConversion.cpp +++ b/developer/src/kmcmpdll/CharToKeyConversion.cpp @@ -1,5 +1,5 @@ -#include +#include "pch.h" #include diff --git a/developer/src/kmcmpdll/CheckFilenameConsistency.cpp b/developer/src/kmcmpdll/CheckFilenameConsistency.cpp index d25e614086..b7148abeea 100644 --- a/developer/src/kmcmpdll/CheckFilenameConsistency.cpp +++ b/developer/src/kmcmpdll/CheckFilenameConsistency.cpp @@ -1,7 +1,7 @@ -#include +#include "pch.h" -#include +#include #include #include #include diff --git a/developer/src/kmcmpdll/CheckFilenameConsistency.h b/developer/src/kmcmpdll/CheckFilenameConsistency.h index 97aa922239..98908e919d 100644 --- a/developer/src/kmcmpdll/CheckFilenameConsistency.h +++ b/developer/src/kmcmpdll/CheckFilenameConsistency.h @@ -1,5 +1,6 @@ +#pragma once -#include +//#include #include // _S2 commented out functionality because I have no idea how to change to use with char16_t on non-windows platforms diff --git a/developer/src/kmcmpdll/CheckForDuplicates.cpp b/developer/src/kmcmpdll/CheckForDuplicates.cpp index 47f302d0c2..0c63fb4b3c 100644 --- a/developer/src/kmcmpdll/CheckForDuplicates.cpp +++ b/developer/src/kmcmpdll/CheckForDuplicates.cpp @@ -1,16 +1,15 @@ -#pragma once -#include "pch.h" +#include -#include +#include #include #include -#include "xstring.h" -#include "kmx_u16.h" +#include +#include #include -#include +#include "CheckForDuplicates.h" KMX_DWORD CheckForDuplicateGroup(PFILE_KEYBOARD fk, PFILE_GROUP gp) noexcept { diff --git a/developer/src/kmcmpdll/CheckNCapsConsistency.cpp b/developer/src/kmcmpdll/CheckNCapsConsistency.cpp index 6c17c430e2..8b0f68d595 100644 --- a/developer/src/kmcmpdll/CheckNCapsConsistency.cpp +++ b/developer/src/kmcmpdll/CheckNCapsConsistency.cpp @@ -1,10 +1,9 @@ -#pragma once -#include +#include "pch.h" -#include +#include #include #include -#include +#include "CharToKeyConversion.h" /** * If any rule uses CAPS or NCAPS for a given key, then every rule that diff --git a/developer/src/kmcmpdll/CheckNCapsConsistency.h b/developer/src/kmcmpdll/CheckNCapsConsistency.h index 402fdb6a43..321098653c 100644 --- a/developer/src/kmcmpdll/CheckNCapsConsistency.h +++ b/developer/src/kmcmpdll/CheckNCapsConsistency.h @@ -1,6 +1,6 @@ #pragma once -#include +//#include #include bool CheckNCapsConsistency(PFILE_KEYBOARD fk); diff --git a/developer/src/kmcmpdll/UnreachableRules.cpp b/developer/src/kmcmpdll/UnreachableRules.cpp index 79fdbaf62a..f5834e582e 100644 --- a/developer/src/kmcmpdll/UnreachableRules.cpp +++ b/developer/src/kmcmpdll/UnreachableRules.cpp @@ -1,8 +1,8 @@ -#include -#include +#include "pch.h" +#include #include -#include <../../../common/windows/cpp/include/vkeys.h> +#include "../../../common/windows/cpp/include/vkeys.h" #include #include @@ -10,7 +10,7 @@ #include #include -#include +#include "UnreachableRules.h" std::wstring MakeHashKeyFromFileKey(PFILE_KEY kp) { std::wstringstream key; diff --git a/developer/src/kmcmpdll/kmcmpdll.h b/developer/src/kmcmpdll/kmcmpdll.h index 7e20a9adfd..9b50a8d19e 100644 --- a/developer/src/kmcmpdll/kmcmpdll.h +++ b/developer/src/kmcmpdll/kmcmpdll.h @@ -1,7 +1,7 @@ #pragma once -#include -#include "compfile.h" +//#include +#include KMX_BOOL AddCompileString(LPSTR buf); KMX_BOOL AddCompileMessage(KMX_DWORD msg); diff --git a/developer/src/kmcmpdll/kmx_u16.cpp b/developer/src/kmcmpdll/kmx_u16.cpp index 67ead3f3da..7e3b8cdc2f 100644 --- a/developer/src/kmcmpdll/kmx_u16.cpp +++ b/developer/src/kmcmpdll/kmx_u16.cpp @@ -1,4 +1,3 @@ -#pragma once #include <../../kmcompx/include/kmcompx.h> #include //#include "../../../common/windows/cpp/include/xstring.h" diff --git a/developer/src/kmcmpdll/pch.h b/developer/src/kmcmpdll/pch.h index 9c5cd2c7a6..b864e919f7 100644 --- a/developer/src/kmcmpdll/pch.h +++ b/developer/src/kmcmpdll/pch.h @@ -16,9 +16,9 @@ #include #include -#include <../../../common/windows/cpp/include/registry.h> -#include <../../../common/windows/cpp/include/unicode.h> -#include <../../../common/windows/cpp/include/crc32.h> +#include "../../../common/windows/cpp/include/registry.h" +#include "../../../common/windows/cpp/include/unicode.h" +#include "../../../common/windows/cpp/include/crc32.h" #include #include diff --git a/developer/src/kmcmpdll/versioning.cpp b/developer/src/kmcmpdll/versioning.cpp index 5b8d3a50ba..24a5f2a511 100644 --- a/developer/src/kmcmpdll/versioning.cpp +++ b/developer/src/kmcmpdll/versioning.cpp @@ -1,4 +1,4 @@ -#include +#include "pch.h" #include #include #include diff --git a/developer/src/kmcmpdll/virtualcharkeys.h b/developer/src/kmcmpdll/virtualcharkeys.h index fbb724781f..326e98fb02 100644 --- a/developer/src/kmcmpdll/virtualcharkeys.h +++ b/developer/src/kmcmpdll/virtualcharkeys.h @@ -1,7 +1,7 @@ #ifndef _VIRTUALCHARKEYS_H #define _VIRTUALCHARKEYS_H -#include +//#include extern BOOL VKeyMayBeVCKey[256];