From 949473b294d71b15c73d76b8ec0b3f2ac323e4dc Mon Sep 17 00:00:00 2001
From: Pierre Wielders <pierre@wielders.net>
Date: Thu, 23 May 2024 14:44:31 +0200
Subject: [PATCH 1/3] [WINDOWS] Make sure the new QA interfaces do not break
 the build.

---
 definitions/Definitions.cpp           | 3 +--
 interfaces/Interfaces.vcxproj         | 3 ---
 interfaces/Interfaces.vcxproj.filters | 9 ---------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
index 313b7d95..eb225869 100644
--- a/definitions/Definitions.cpp
+++ b/definitions/Definitions.cpp
@@ -80,7 +80,6 @@
 #include <interfaces/ISwitchBoard.h>
 #include <interfaces/ISystemCommands.h>
 #include <interfaces/ITextToSpeech.h>
-#include <interfaces/ITestUtility.h>
 #include <interfaces/ITimeSync.h>
 #include <interfaces/ITimeZone.h>
 #include <interfaces/IVoiceHandler.h>
@@ -94,7 +93,7 @@
 #include <interfaces/IZigWave.h>
 #include "ValuePoint.h"
 
-
+#include <qa_interfaces/ITestUtility.h>
 #include <qa_interfaces/ITestController.h>
 #include <qa_interfaces/ITestAutomation.h>
 #endif
diff --git a/interfaces/Interfaces.vcxproj b/interfaces/Interfaces.vcxproj
index 8eae6444..ca5193c1 100644
--- a/interfaces/Interfaces.vcxproj
+++ b/interfaces/Interfaces.vcxproj
@@ -83,8 +83,6 @@
     <ClCompile Include="proxystubs\ProxyStubs_Stream.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_SwitchBoard.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp" />
-    <ClCompile Include="proxystubs\ProxyStubs_TestController.cpp" />
-    <ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_TimeSync.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_TimeZone.cpp" />
@@ -151,7 +149,6 @@
     <ClInclude Include="IStream.h" />
     <ClInclude Include="ISwitchBoard.h" />
     <ClInclude Include="ISystemCommands.h" />
-    <ClInclude Include="ITestController.h" />
     <ClInclude Include="ITextToSpeech.h" />
     <ClInclude Include="ITimeSync.h" />
     <ClInclude Include="ITimeZone.h" />
diff --git a/interfaces/Interfaces.vcxproj.filters b/interfaces/Interfaces.vcxproj.filters
index 3e973338..292688e2 100644
--- a/interfaces/Interfaces.vcxproj.filters
+++ b/interfaces/Interfaces.vcxproj.filters
@@ -181,12 +181,6 @@
     <ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="proxystubs\ProxyStubs_TestController.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
@@ -335,9 +329,6 @@
     <ClInclude Include="ISystemCommands.h">
       <Filter>Interface Files</Filter>
     </ClInclude>
-    <ClInclude Include="ITestController.h">
-      <Filter>Interface Files</Filter>
-    </ClInclude>
     <ClInclude Include="Ids.h">
       <Filter>Header Files</Filter>
     </ClInclude>

From 9f18d87a5ff8b19e3dbe4a2164a10330520e0bfe Mon Sep 17 00:00:00 2001
From: Pierre Wielders <pierre@wielders.net>
Date: Thu, 23 May 2024 16:29:32 +0200
Subject: [PATCH 2/3] Update Definitions.vcxproj

---
 definitions/Definitions.vcxproj | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/definitions/Definitions.vcxproj b/definitions/Definitions.vcxproj
index 32820c98..3270aeb2 100644
--- a/definitions/Definitions.vcxproj
+++ b/definitions/Definitions.vcxproj
@@ -63,8 +63,6 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_Streamer.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_SubsystemControl.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp" />
-    <ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp" />
-    <ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_TimeZone.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_TraceControl.cpp" />
@@ -290,12 +288,6 @@
     <CustomBuild Include="..\jsonrpc\SystemCommands.json">
       <FileType>Document</FileType>
     </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\TestController.json">
-      <FileType>Document</FileType>
-    </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\TestUtility.json">
-      <FileType>Document</FileType>
-    </CustomBuild>
     <CustomBuild Include="..\jsonrpc\TimeSync.json">
       <FileType>Document</FileType>
     </CustomBuild>
@@ -612,4 +604,4 @@
       <UserProperties _1_1_4jsonrpc_4Butler_1json__JsonSchema="&quot;" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>

From d0bf954738fdd39e6e59dee30f2528b9181c0648 Mon Sep 17 00:00:00 2001
From: Pierre Wielders <pierre@wielders.net>
Date: Thu, 23 May 2024 16:30:39 +0200
Subject: [PATCH 3/3] Update Definitions.vcxproj.filters

---
 definitions/Definitions.vcxproj.filters | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/definitions/Definitions.vcxproj.filters b/definitions/Definitions.vcxproj.filters
index d89dd695..0dea7d67 100644
--- a/definitions/Definitions.vcxproj.filters
+++ b/definitions/Definitions.vcxproj.filters
@@ -153,12 +153,6 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
@@ -300,12 +294,6 @@
     <CustomBuild Include="..\jsonrpc\SystemCommands.json">
       <Filter>Contracts</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\TestController.json">
-      <Filter>Contracts</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\TestUtility.json">
-      <Filter>Contracts</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\jsonrpc\TimeSync.json">
       <Filter>Contracts</Filter>
     </CustomBuild>
@@ -349,4 +337,4 @@
       <Filter>Interfaces</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>