rdkcentral · MFransen69 · Jun 3, 2024 · Apr 16, 2024 · Jun 3, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# If not stated otherwise in this file or this component's license file the
+# If not stated otherwise in this file or this component's license file the 
 # following copyright and licenses apply:
 #
 # Copyright 2020 Metrological
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(Interfaces)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 set(INTERFACES_PATTERNS "I*.h" CACHE STRING "Patterns matching files for which stubs should be generated")
 set(JSONRPC_PATTERNS "*.json" CACHE STRING "Patterns matching files for which json stubs should be generated")

diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Definitions)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
@@ -58,7 +58,7 @@ endif()
 JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/")
 JsonGenerator(CODE INPUT ${QA_JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../qa_interfaces/" IFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json")
 JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
-JsonGenerator(CODE NAMESPACE  WPEFramework::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
+JsonGenerator(CODE NAMESPACE  Thunder::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
 
 file(GLOB JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/JsonEnum*.cpp")
 file(GLOB JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/generated/J*.h")

diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
@@ -98,7 +98,7 @@
 #include <qa_interfaces/ITestAutomation.h>
 #endif
 
-namespace WPEFramework {
+namespace Thunder {
 
 struct ScreenResolutionWidthHeight {
     Exchange::IDeviceVideoCapabilities::ScreenResolution resolution;

diff --git a/definitions/ValuePoint.h b/definitions/ValuePoint.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 #include <interfaces/IValuePoint.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     class ValuePoint : public IValuePoint {

diff --git a/definitions/definitions.h b/definitions/definitions.h
@@ -42,7 +42,7 @@
 #include <interfaces/json/ExternalMetadata.h>
 #include <interfaces/IDeviceInfo.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 	ENUM_CONVERSION_HANDLER(Exchange::IComposition::ScreenResolution)
 	ENUM_CONVERSION_HANDLER(Exchange::IStream::streamtype)

diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Marshalling)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 

diff --git a/interfaces/IAVNClient.h b/interfaces/IAVNClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IAVNClient : virtual public Core::IUnknown {

diff --git a/interfaces/IAVSClient.h b/interfaces/IAVSClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
@@ -68,4 +68,4 @@ namespace Exchange {
     };
 
 } // Exchange
-} // WPEFramework
+} // Thunder
diff --git a/interfaces/IAmazonPrime.h b/interfaces/IAmazonPrime.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed

diff --git a/interfaces/IApplication.h b/interfaces/IApplication.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed

diff --git a/interfaces/IBluetooth.h b/interfaces/IBluetooth.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/IBluetoothAudio.h b/interfaces/IBluetoothAudio.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/IBrowser.h b/interfaces/IBrowser.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a Browser to change

diff --git a/interfaces/IButler.h b/interfaces/IButler.h
@@ -25,7 +25,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 	namespace Exchange {
 
 		struct IValuePoint;

diff --git a/interfaces/ICapture.h b/interfaces/ICapture.h
@@ -22,7 +22,7 @@
 
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit

diff --git a/interfaces/ICommand.h b/interfaces/ICommand.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives the possibility to create/defines commmands to be executed by

diff --git a/interfaces/IComposition.h b/interfaces/IComposition.h
@@ -25,7 +25,7 @@
 
 // @insert "IDeviceInfo.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IComposition : virtual public Core::IUnknown {
@@ -82,7 +82,7 @@ namespace Exchange {
                 virtual uint64_t Modifier() = 0;
             };
 
-            virtual WPEFramework::Core::instance_id Native() const { return 0; };
+            virtual Thunder::Core::instance_id Native() const { return 0; };
             virtual string Name() const = 0;
             virtual void Opacity(const uint32_t value) = 0;
             virtual uint32_t Opacity() const { return 0; };
@@ -116,7 +116,7 @@ namespace Exchange {
 
             ~IDisplay() override = default;
 
-            virtual WPEFramework::Core::instance_id Native() const = 0;
+            virtual Thunder::Core::instance_id Native() const = 0;
             virtual string Port() const = 0;
 
             virtual IClient* CreateClient(const string& name, const uint32_t width, const uint32_t height) = 0;

diff --git a/interfaces/ICompositionBuffer.h b/interfaces/ICompositionBuffer.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
@@ -79,4 +79,4 @@ namespace Exchange {
 
 } // namespace Exchange
 
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IConfiguration.h b/interfaces/IConfiguration.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IConfiguration : virtual public Core::IUnknown {

diff --git a/interfaces/IContentDecryption.h b/interfaces/IContentDecryption.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 #include "IDRM.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/ICryptography.h b/interfaces/ICryptography.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     enum CryptographyVault : uint8_t {

diff --git a/interfaces/ICustomerCareOperations.h b/interfaces/ICustomerCareOperations.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0

diff --git a/interfaces/IDIALServer.h b/interfaces/IDIALServer.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDIALServer : virtual public Core::IUnknown {

diff --git a/interfaces/IDNSServer.h b/interfaces/IDNSServer.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives access to DNS Zone information

diff --git a/interfaces/IDRM.h b/interfaces/IDRM.h
@@ -154,7 +154,7 @@ class BufferReader {
     size_t pos_;
 };
 
-namespace WPEFramework
+namespace Thunder
 {
    namespace PluginHost
    {
@@ -518,8 +518,8 @@ struct ISystemFactory {
     virtual IMediaKeys* Instance() = 0;
     virtual const char* KeySystem() const = 0;
     virtual const std::vector<std::string>& MimeTypes() const = 0;
-    virtual void Initialize(const WPEFramework::PluginHost::IShell * shell, const std::string& configline) = 0;
-    virtual void Deinitialize(const WPEFramework::PluginHost::IShell * shell) = 0;
+    virtual void Initialize(const Thunder::PluginHost::IShell * shell, const std::string& configline) = 0;
+    virtual void Deinitialize(const Thunder::PluginHost::IShell * shell) = 0;
     virtual CDMi_RESULT Enable() = 0;
     virtual CDMi_RESULT Disable() = 0;
 };
@@ -553,11 +553,11 @@ class SystemFactoryType : public ISystemFactory {
         return (typeid(IMPLEMENTATION).name());
     }
 
-    void Initialize(const WPEFramework::PluginHost::IShell * shell, const std::string& configline) override
+    void Initialize(const Thunder::PluginHost::IShell * shell, const std::string& configline) override
     {
         Initialize(shell, configline, std::integral_constant<bool, HasOnShellAndSystemInitialize<IMPLEMENTATION>::Has>());
     }
-    void Deinitialize(const WPEFramework::PluginHost::IShell * shell) override
+    void Deinitialize(const Thunder::PluginHost::IShell * shell) override
     {
         Deinitialize(shell, std::integral_constant<bool, HasOnShellAndSystemDeinitialize<IMPLEMENTATION>::Has>());
     }
@@ -574,7 +574,7 @@ class SystemFactoryType : public ISystemFactory {
 private:
     template <typename T>
     struct HasOnShellAndSystemInitialize {
-        template <typename U, void (U::*)(const WPEFramework::PluginHost::IShell *, const std::string&)>
+        template <typename U, void (U::*)(const Thunder::PluginHost::IShell *, const std::string&)>
         struct SFINAE {
         };
         template <typename U>
@@ -586,7 +586,7 @@ class SystemFactoryType : public ISystemFactory {
 
     template <typename T>
     struct HasOnShellAndSystemDeinitialize {
-        template <typename U, void (U::*)(const WPEFramework::PluginHost::IShell *)>
+        template <typename U, void (U::*)(const Thunder::PluginHost::IShell *)>
         struct SFINAE {
         };
         template <typename U>
@@ -597,18 +597,18 @@ class SystemFactoryType : public ISystemFactory {
     };
 
 
-    void Initialize(const WPEFramework::PluginHost::IShell * service, const std::string& configline, std::true_type) {
+    void Initialize(const Thunder::PluginHost::IShell * service, const std::string& configline, std::true_type) {
         _instance.Initialize(service, configline);
     }
 
-    void Initialize(const WPEFramework::PluginHost::IShell *, const std::string&, std::false_type) {
+    void Initialize(const Thunder::PluginHost::IShell *, const std::string&, std::false_type) {
     }
 
-    void Deinitialize(const WPEFramework::PluginHost::IShell * service, std::true_type) {
+    void Deinitialize(const Thunder::PluginHost::IShell * service, std::true_type) {
         _instance.Deinitialize(service);
     }
 
-    void Deinitialize(const WPEFramework::PluginHost::IShell *, std::false_type) {
+    void Deinitialize(const Thunder::PluginHost::IShell *, std::false_type) {
     }
 
     template <typename T>

diff --git a/interfaces/IDeviceInfo.h b/interfaces/IDeviceInfo.h
@@ -23,7 +23,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDeviceInfo : virtual public Core::IUnknown {

diff --git a/interfaces/IDictionary.h b/interfaces/IDictionary.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */

diff --git a/interfaces/IDisplayInfo.h b/interfaces/IDisplayInfo.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */

diff --git a/interfaces/IDolby.h b/interfaces/IDolby.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     namespace Dolby {

diff --git a/interfaces/IDsgccClient.h b/interfaces/IDsgccClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDsgccClient : virtual public Core::IUnknown {

diff --git a/interfaces/IExternal.h b/interfaces/IExternal.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 #include "IValuePoint.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
     struct EXTERNAL IExternal : virtual public Core::IUnknown {
         enum { ID = ID_EXTERNAL };

diff --git a/interfaces/IExternalBase.h b/interfaces/IExternalBase.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 #include "IExternal.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit