From ddd35829eb6b6555afae0e9efd917f0b887f2f3d Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:20:01 +0100
Subject: [PATCH 1/6] Fix cppcheck.vcxproj [skip ci]

---
 lib/cppcheck.vcxproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index b77deac42a4..87b91165465 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -141,7 +141,6 @@
     <ClInclude Include="errortypes.h" />
     <ClInclude Include="filesettings.h" />
     <ClInclude Include="findtoken.h" />
-    <ClInclude Include="findtoken.h" />
     <ClInclude Include="forwardanalyzer.h" />
     <ClInclude Include="fwdanalysis.h" />
     <ClInclude Include="importproject.h" />
@@ -404,4 +403,4 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+</Project>

From 97795f2a521291ed60ab9dd6b289fc3047a7a0dd Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:21:32 +0100
Subject: [PATCH 2/6] Update cppcheck.vcxproj


From fd418f5b8d5c21cd86ce255727e0708dcb5ad577 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:59:44 +0100
Subject: [PATCH 3/6] Update dmake.cpp

---
 tools/dmake/dmake.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index df833b6e750..356c6b6f487 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -461,7 +461,7 @@ int main(int argc, char **argv)
     }
 
     // TODO: add files without source via parsing
-    std::vector<std::string> libfiles_h;
+    std::set<std::string> libfiles_h;
     for (const std::string &libfile : libfiles) {
         std::string fname(libfile.substr(4));
         fname.erase(fname.find(".cpp"));

From 7d1998879584f2ff8cc1fb6490f2841fad48c7d7 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:13:29 +0100
Subject: [PATCH 4/6] Update dmake.cpp

---
 tools/dmake/dmake.cpp | 46 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index 356c6b6f487..3e32e788183 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -465,24 +465,23 @@ int main(int argc, char **argv)
     for (const std::string &libfile : libfiles) {
         std::string fname(libfile.substr(4));
         fname.erase(fname.find(".cpp"));
-        libfiles_h.emplace_back(fname + ".h");
+        libfiles_h.emplace(fname + ".h");
     }
-    libfiles_h.emplace_back("analyzer.h");
-    libfiles_h.emplace_back("calculate.h");
-    libfiles_h.emplace_back("config.h");
-    libfiles_h.emplace_back("filesettings.h");
-    libfiles_h.emplace_back("findtoken.h");
-    libfiles_h.emplace_back("json.h");
-    libfiles_h.emplace_back("matchcompiler.h");
-    libfiles_h.emplace_back("precompiled.h");
-    libfiles_h.emplace_back("smallvector.h");
-    libfiles_h.emplace_back("sourcelocation.h");
-    libfiles_h.emplace_back("tokenrange.h");
-    libfiles_h.emplace_back("valueptr.h");
-    libfiles_h.emplace_back("version.h");
-    libfiles_h.emplace_back("vf_analyze.h");
-    libfiles_h.emplace_back("xml.h");
-    std::sort(libfiles_h.begin(), libfiles_h.end());
+    libfiles_h.emplace("analyzer.h");
+    libfiles_h.emplace("calculate.h");
+    libfiles_h.emplace("config.h");
+    libfiles_h.emplace("filesettings.h");
+    libfiles_h.emplace("findtoken.h");
+    libfiles_h.emplace("json.h");
+    libfiles_h.emplace("matchcompiler.h");
+    libfiles_h.emplace("precompiled.h");
+    libfiles_h.emplace("smallvector.h");
+    libfiles_h.emplace("sourcelocation.h");
+    libfiles_h.emplace("tokenrange.h");
+    libfiles_h.emplace("valueptr.h");
+    libfiles_h.emplace("version.h");
+    libfiles_h.emplace("vf_analyze.h");
+    libfiles_h.emplace("xml.h");
 
     std::vector<std::string> clifiles_h;
     for (const std::string &clifile : clifiles) {
@@ -493,13 +492,12 @@ int main(int argc, char **argv)
         clifiles_h.emplace_back(fname + ".h");
     }
 
-    std::vector<std::string> testfiles_h;
-    testfiles_h.emplace_back("fixture.h");
-    testfiles_h.emplace_back("helpers.h");
-    testfiles_h.emplace_back("options.h");
-    testfiles_h.emplace_back("precompiled.h");
-    testfiles_h.emplace_back("redirect.h");
-    std::sort(testfiles_h.begin(), testfiles_h.end());
+    std::set<std::string> testfiles_h;
+    testfiles_h.emplace("fixture.h");
+    testfiles_h.emplace("helpers.h");
+    testfiles_h.emplace("options.h");
+    testfiles_h.emplace("precompiled.h");
+    testfiles_h.emplace("redirect.h");
 
     // TODO: write filter files
     // Visual Studio projects

From 82e80f62d4cf7e3563fbc9ea428f3364fc574869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:39:34 +0100
Subject: [PATCH 5/6] Update cppcheck.vcxproj


From 9fb417b082019bc2202c6bbddc2d679bbd0d4c85 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:45:24 +0100
Subject: [PATCH 6/6] dmake

---
 lib/cppcheck.vcxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index 87b91165465..a19b770596a 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -403,4 +403,4 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
\ No newline at end of file