From dda8abedab222396d0ecd754d8929162e14edbdc Mon Sep 17 00:00:00 2001 From: Daniel Edwards Date: Fri, 24 Apr 2026 14:43:33 +0200 Subject: [PATCH 1/2] style: use full paths for internal headers in `capi/...` Signed-off-by: Daniel Edwards --- SilKit/source/capi/CapiCan.cpp | 13 +++++------ SilKit/source/capi/CapiDataPubSub.cpp | 15 +++++-------- SilKit/source/capi/CapiEthernet.cpp | 10 ++++----- SilKit/source/capi/CapiFlexray.cpp | 9 +++----- SilKit/source/capi/CapiImpl.hpp | 5 +++-- SilKit/source/capi/CapiLin.cpp | 12 +++++----- SilKit/source/capi/CapiLogger.cpp | 8 +++---- SilKit/source/capi/CapiNetworkSimulator.cpp | 16 +++++--------- SilKit/source/capi/CapiOrchestration.cpp | 19 ++++++---------- SilKit/source/capi/CapiParticipant.cpp | 22 ++++++------------- SilKit/source/capi/CapiRpc.cpp | 18 +++++---------- SilKit/source/capi/CapiVendor.cpp | 14 ++++-------- SilKit/source/capi/CapiVersion.cpp | 5 +++-- SilKit/source/capi/Test_CapiCan.cpp | 10 ++++++--- SilKit/source/capi/Test_CapiData.cpp | 10 ++++++--- SilKit/source/capi/Test_CapiEthernet.cpp | 12 +++++----- SilKit/source/capi/Test_CapiExceptions.cpp | 7 ++++-- SilKit/source/capi/Test_CapiFlexray.cpp | 9 +++++--- SilKit/source/capi/Test_CapiLin.cpp | 10 +++++---- SilKit/source/capi/Test_CapiNetSim.cpp | 10 ++++++--- .../Test_CapiParticipantStateHandling.cpp | 9 +++++--- SilKit/source/capi/Test_CapiRpc.cpp | 12 ++++++---- SilKit/source/capi/Test_CapiSilKit.cpp | 8 ++++--- SilKit/source/capi/Test_CapiTimeSync.cpp | 9 +++++--- SilKit/source/capi/TypeConversion.hpp | 7 ++++-- 25 files changed, 134 insertions(+), 145 deletions(-) diff --git a/SilKit/source/capi/CapiCan.cpp b/SilKit/source/capi/CapiCan.cpp index 1cac3bc92..f24dafe53 100644 --- a/SilKit/source/capi/CapiCan.cpp +++ b/SilKit/source/capi/CapiCan.cpp @@ -2,16 +2,13 @@ // // SPDX-License-Identifier: MIT -#include -#include -#include -#include - -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "CapiImpl.hpp" +#include "silkit/capi/Can.h" + +#include "silkit/participant/IParticipant.hpp" #include "silkit/services/can/all.hpp" +#include "capi/CapiImpl.hpp" + SilKit_ReturnCode SilKitCALL SilKit_CanController_Create(SilKit_CanController** outController, SilKit_Participant* participant, const char* cName, diff --git a/SilKit/source/capi/CapiDataPubSub.cpp b/SilKit/source/capi/CapiDataPubSub.cpp index 209c472e9..d4c1e6462 100644 --- a/SilKit/source/capi/CapiDataPubSub.cpp +++ b/SilKit/source/capi/CapiDataPubSub.cpp @@ -2,18 +2,13 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/logging/ILogger.hpp" -#include "silkit/services/orchestration/all.hpp" -#include "silkit/services/pubsub/all.hpp" +#include "silkit/capi/DataPubSub.h" -#include "CapiImpl.hpp" -#include "TypeConversion.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/pubsub/all.hpp" -#include -#include -#include +#include "capi/CapiImpl.hpp" +#include "capi/TypeConversion.hpp" SilKit_ReturnCode SilKitCALL SilKit_DataPublisher_Create(SilKit_DataPublisher** outPublisher, diff --git a/SilKit/source/capi/CapiEthernet.cpp b/SilKit/source/capi/CapiEthernet.cpp index 6ac3592bb..239fdd684 100644 --- a/SilKit/source/capi/CapiEthernet.cpp +++ b/SilKit/source/capi/CapiEthernet.cpp @@ -2,14 +2,12 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/logging/ILogger.hpp" -#include "silkit/services/orchestration/all.hpp" +#include "silkit/capi/Ethernet.h" + +#include "silkit/participant/IParticipant.hpp" #include "silkit/services/ethernet/all.hpp" -#include -#include "CapiImpl.hpp" +#include "capi/CapiImpl.hpp" SilKit_ReturnCode SilKitCALL SilKit_EthernetController_Create(SilKit_EthernetController** outController, diff --git a/SilKit/source/capi/CapiFlexray.cpp b/SilKit/source/capi/CapiFlexray.cpp index 644706fce..36d621e61 100644 --- a/SilKit/source/capi/CapiFlexray.cpp +++ b/SilKit/source/capi/CapiFlexray.cpp @@ -2,15 +2,12 @@ // // SPDX-License-Identifier: MIT -#include -#include +#include "silkit/capi/Flexray.h" -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" +#include "silkit/participant/IParticipant.hpp" #include "silkit/services/flexray/all.hpp" -#include "IParticipantInternal.hpp" -#include "CapiImpl.hpp" +#include "capi/CapiImpl.hpp" namespace { diff --git a/SilKit/source/capi/CapiImpl.hpp b/SilKit/source/capi/CapiImpl.hpp index 19dfdede0..cf9e88a31 100644 --- a/SilKit/source/capi/CapiImpl.hpp +++ b/SilKit/source/capi/CapiImpl.hpp @@ -4,11 +4,12 @@ #pragma once -#include "silkit/capi/Types.h" #include "silkit/capi/InterfaceIdentifiers.h" +#include "silkit/capi/Types.h" #include "silkit/participant/exception.hpp" -#include "CapiExceptions.hpp" +#include "capi/CapiExceptions.hpp" + #define CAPI_CATCH_EXCEPTIONS \ catch (const SilKit::CapiBadParameterError& e) \ diff --git a/SilKit/source/capi/CapiLin.cpp b/SilKit/source/capi/CapiLin.cpp index fe7863ae9..f09af5c16 100644 --- a/SilKit/source/capi/CapiLin.cpp +++ b/SilKit/source/capi/CapiLin.cpp @@ -2,16 +2,14 @@ // // SPDX-License-Identifier: MIT -#include "services/lin/LinControllerExtensionsImpl.hpp" +#include "silkit/capi/Lin.h" -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/lin/all.hpp" #include "silkit/experimental/services/lin/LinControllerExtensions.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/lin/all.hpp" -#include "CapiImpl.hpp" - -#include +#include "capi/CapiImpl.hpp" +#include "services/lin/LinControllerExtensionsImpl.hpp" namespace { diff --git a/SilKit/source/capi/CapiLogger.cpp b/SilKit/source/capi/CapiLogger.cpp index 09d2e92e9..f55c917ae 100644 --- a/SilKit/source/capi/CapiLogger.cpp +++ b/SilKit/source/capi/CapiLogger.cpp @@ -2,13 +2,11 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/logging/ILogger.hpp" +#include "silkit/capi/Logger.h" -#include "CapiImpl.hpp" +#include "silkit/services/logging/ILogger.hpp" -#include +#include "capi/CapiImpl.hpp" SilKit_ReturnCode SilKitCALL SilKit_Logger_Log(SilKit_Logger* self, SilKit_LoggingLevel level, const char* message) diff --git a/SilKit/source/capi/CapiNetworkSimulator.cpp b/SilKit/source/capi/CapiNetworkSimulator.cpp index f8b4624b0..2287c810c 100644 --- a/SilKit/source/capi/CapiNetworkSimulator.cpp +++ b/SilKit/source/capi/CapiNetworkSimulator.cpp @@ -2,22 +2,16 @@ // // SPDX-License-Identifier: MIT -#include -#include -#include -#include -#include -#include - -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "CapiImpl.hpp" +#include "silkit/capi/NetworkSimulator.h" +#include "silkit/detail/impl/HourglassConversions.hpp" #include "silkit/experimental/netsim/all.hpp" +#include "silkit/participant/IParticipant.hpp" -#include "silkit/detail/impl/HourglassConversions.hpp" +#include "capi/CapiImpl.hpp" #include "participant/ParticipantExtensionsImpl.hpp" + namespace SilKit { namespace Experimental { namespace NetworkSimulation { diff --git a/SilKit/source/capi/CapiOrchestration.cpp b/SilKit/source/capi/CapiOrchestration.cpp index 303359aff..ca6eac14e 100644 --- a/SilKit/source/capi/CapiOrchestration.cpp +++ b/SilKit/source/capi/CapiOrchestration.cpp @@ -2,23 +2,18 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/orchestration/all.hpp" -#include "silkit/participant/exception.hpp" +#include "silkit/capi/Orchestration.h" -#include "participant/ParticipantExtensionsImpl.hpp" +#include -#include "CapiImpl.hpp" -#include "TypeConversion.hpp" +#include "silkit/experimental/services/orchestration/ISystemController.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/orchestration/all.hpp" +#include "capi/CapiImpl.hpp" +#include "participant/ParticipantExtensionsImpl.hpp" #include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp" -#include -#include -#include -#include - namespace { diff --git a/SilKit/source/capi/CapiParticipant.cpp b/SilKit/source/capi/CapiParticipant.cpp index 326e61117..6a2b4be85 100644 --- a/SilKit/source/capi/CapiParticipant.cpp +++ b/SilKit/source/capi/CapiParticipant.cpp @@ -2,23 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "ParticipantConfiguration.hpp" -#include "ParticipantConfigurationFromXImpl.hpp" -#include "CreateParticipantImpl.hpp" -#include "YamlParser.hpp" - -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/logging/ILogger.hpp" -#include "silkit/services/orchestration/all.hpp" +#include "silkit/capi/Participant.h" -#include "CapiImpl.hpp" -#include "TypeConversion.hpp" +#include "silkit/participant/IParticipant.hpp" -#include -#include -#include -#include +#include "CreateParticipantImpl.hpp" +#include "capi/CapiImpl.hpp" +#include "config/ParticipantConfiguration.hpp" +#include "config/ParticipantConfigurationFromXImpl.hpp" +#include "config/YamlParser.hpp" SilKit_ReturnCode SilKitCALL SilKit_Participant_Create(SilKit_Participant** outParticipant, diff --git a/SilKit/source/capi/CapiRpc.cpp b/SilKit/source/capi/CapiRpc.cpp index f894363c8..06cf88089 100644 --- a/SilKit/source/capi/CapiRpc.cpp +++ b/SilKit/source/capi/CapiRpc.cpp @@ -2,21 +2,13 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" -#include "silkit/SilKit.hpp" -#include "silkit/services/logging/ILogger.hpp" -#include "silkit/services/orchestration/all.hpp" -#include "silkit/services/orchestration/string_utils.hpp" -#include "silkit/services/rpc/all.hpp" +#include "silkit/capi/Rpc.h" -#include "CapiImpl.hpp" -#include "TypeConversion.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/rpc/all.hpp" -#include -#include -#include -#include -#include +#include "capi/CapiImpl.hpp" +#include "capi/TypeConversion.hpp" namespace { diff --git a/SilKit/source/capi/CapiVendor.cpp b/SilKit/source/capi/CapiVendor.cpp index 264b5b3a3..5f73fc644 100644 --- a/SilKit/source/capi/CapiVendor.cpp +++ b/SilKit/source/capi/CapiVendor.cpp @@ -2,19 +2,13 @@ // // SPDX-License-Identifier: MIT -#include "ParticipantConfiguration.hpp" -#include "CreateSilKitRegistryImpl.hpp" - -#include "silkit/capi/SilKit.h" +#include "silkit/capi/Vendor.h" #include "silkit/vendor/ISilKitRegistry.hpp" -#include "CapiImpl.hpp" -#include "TypeConversion.hpp" - -#include -#include -#include +#include "CreateSilKitRegistryImpl.hpp" +#include "capi/CapiImpl.hpp" +#include "config/ParticipantConfiguration.hpp" SilKit_ReturnCode SilKitCALL SilKit_Vendor_Vector_SilKitRegistry_Create( diff --git a/SilKit/source/capi/CapiVersion.cpp b/SilKit/source/capi/CapiVersion.cpp index d3273ecb2..89359cb4d 100644 --- a/SilKit/source/capi/CapiVersion.cpp +++ b/SilKit/source/capi/CapiVersion.cpp @@ -2,9 +2,10 @@ // // SPDX-License-Identifier: MIT -#include "silkit/capi/SilKit.h" +#include "silkit/capi/Version.h" + #include "SilKitVersionImpl.hpp" -#include "CapiImpl.hpp" +#include "capi/CapiImpl.hpp" SilKit_ReturnCode SilKitCALL SilKit_Version_Major(uint32_t* outVersionMajor) diff --git a/SilKit/source/capi/Test_CapiCan.cpp b/SilKit/source/capi/Test_CapiCan.cpp index e6586fa8d..c7755196e 100644 --- a/SilKit/source/capi/Test_CapiCan.cpp +++ b/SilKit/source/capi/Test_CapiCan.cpp @@ -2,11 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" +#include "silkit/capi/Can.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/can/all.hpp" -#include "MockParticipant.hpp" + +#include "core/mock/participant/MockParticipant.hpp" + namespace { using namespace SilKit::Services::Can; diff --git a/SilKit/source/capi/Test_CapiData.cpp b/SilKit/source/capi/Test_CapiData.cpp index 37999bdda..3bd20efd8 100644 --- a/SilKit/source/capi/Test_CapiData.cpp +++ b/SilKit/source/capi/Test_CapiData.cpp @@ -6,11 +6,15 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "gtest/gtest.h" +#include "silkit/capi/DataPubSub.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/pubsub/all.hpp" -#include "MockParticipant.hpp" + +#include "core/mock/participant/MockParticipant.hpp" + namespace { using namespace SilKit::Services::PubSub; diff --git a/SilKit/source/capi/Test_CapiEthernet.cpp b/SilKit/source/capi/Test_CapiEthernet.cpp index c00bcc299..de951c6c0 100644 --- a/SilKit/source/capi/Test_CapiEthernet.cpp +++ b/SilKit/source/capi/Test_CapiEthernet.cpp @@ -2,14 +2,16 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" +#include "silkit/capi/Ethernet.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/ethernet/all.hpp" -#include "EthDatatypeUtils.hpp" -#include "MockParticipant.hpp" -#include "fmt/format.h" +#include "core/mock/participant/MockParticipant.hpp" +#include "services/ethernet/EthDatatypeUtils.hpp" + namespace { using namespace SilKit::Services::Ethernet; diff --git a/SilKit/source/capi/Test_CapiExceptions.cpp b/SilKit/source/capi/Test_CapiExceptions.cpp index b879c0fc0..76054cdfe 100644 --- a/SilKit/source/capi/Test_CapiExceptions.cpp +++ b/SilKit/source/capi/Test_CapiExceptions.cpp @@ -2,12 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" #include "gmock/gmock.h" +#include "gtest/gtest.h" -#include "CapiImpl.hpp" #include "silkit/detail/impl/ThrowOnError.hpp" +#include "capi/CapiExceptions.hpp" +#include "capi/CapiImpl.hpp" + + namespace { class Test_CapiExceptions : public testing::Test diff --git a/SilKit/source/capi/Test_CapiFlexray.cpp b/SilKit/source/capi/Test_CapiFlexray.cpp index 31b77272b..5cf3f4b81 100644 --- a/SilKit/source/capi/Test_CapiFlexray.cpp +++ b/SilKit/source/capi/Test_CapiFlexray.cpp @@ -3,11 +3,14 @@ // SPDX-License-Identifier: MIT #include "silkit/capi/Flexray.h" -#include "silkit/capi/SilKit.h" -#include "silkit/services/flexray/all.hpp" + #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "MockParticipant.hpp" + +#include "silkit/services/flexray/all.hpp" + +#include "core/mock/participant/MockParticipant.hpp" + namespace { using namespace SilKit::Core; diff --git a/SilKit/source/capi/Test_CapiLin.cpp b/SilKit/source/capi/Test_CapiLin.cpp index 15492be49..63befdcd6 100644 --- a/SilKit/source/capi/Test_CapiLin.cpp +++ b/SilKit/source/capi/Test_CapiLin.cpp @@ -2,14 +2,16 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" +#include "silkit/capi/Lin.h" + #include "gmock/gmock.h" +#include "gtest/gtest.h" -#include "silkit/capi/SilKit.h" #include "silkit/services/lin/all.hpp" -#include "MockParticipant.hpp" -#include "ILinControllerExtensions.hpp" +#include "core/mock/participant/MockParticipant.hpp" +#include "services/lin/ILinControllerExtensions.hpp" + namespace { using namespace SilKit::Services::Lin; diff --git a/SilKit/source/capi/Test_CapiNetSim.cpp b/SilKit/source/capi/Test_CapiNetSim.cpp index f876353dd..112decb04 100644 --- a/SilKit/source/capi/Test_CapiNetSim.cpp +++ b/SilKit/source/capi/Test_CapiNetSim.cpp @@ -2,11 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" +#include "silkit/capi/NetworkSimulator.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/experimental/netsim/all.hpp" -#include "MockParticipant.hpp" + +#include "core/mock/participant/MockParticipant.hpp" + namespace { using namespace SilKit::Experimental::NetworkSimulation; diff --git a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp index 3167eb704..627759389 100644 --- a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp +++ b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp @@ -6,12 +6,15 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "gtest/gtest.h" +#include "silkit/capi/Orchestration.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/orchestration/all.hpp" -#include "MockParticipant.hpp" +#include "core/mock/participant/MockParticipant.hpp" + namespace { using testing::Return; diff --git a/SilKit/source/capi/Test_CapiRpc.cpp b/SilKit/source/capi/Test_CapiRpc.cpp index 43796a68e..d08775436 100644 --- a/SilKit/source/capi/Test_CapiRpc.cpp +++ b/SilKit/source/capi/Test_CapiRpc.cpp @@ -6,12 +6,16 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "gtest/gtest.h" +#include "silkit/capi/Rpc.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/rpc/all.hpp" -#include "MockParticipant.hpp" -#include "RpcCallHandle.hpp" + +#include "core/mock/participant/MockParticipant.hpp" +#include "services/rpc/RpcCallHandle.hpp" + namespace { using namespace SilKit::Services::Rpc; diff --git a/SilKit/source/capi/Test_CapiSilKit.cpp b/SilKit/source/capi/Test_CapiSilKit.cpp index aa177754f..ac4cb6426 100644 --- a/SilKit/source/capi/Test_CapiSilKit.cpp +++ b/SilKit/source/capi/Test_CapiSilKit.cpp @@ -2,11 +2,13 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" -#include "gmock/gmock.h" #include "silkit/capi/SilKit.h" -#include "MockParticipant.hpp" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include "core/mock/participant/MockParticipant.hpp" + namespace { diff --git a/SilKit/source/capi/Test_CapiTimeSync.cpp b/SilKit/source/capi/Test_CapiTimeSync.cpp index 45bd86403..2a8754bd0 100644 --- a/SilKit/source/capi/Test_CapiTimeSync.cpp +++ b/SilKit/source/capi/Test_CapiTimeSync.cpp @@ -2,12 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "gtest/gtest.h" +#include "silkit/capi/Orchestration.h" + #include "gmock/gmock.h" -#include "silkit/capi/SilKit.h" +#include "gtest/gtest.h" + #include "silkit/services/orchestration/all.hpp" -#include "MockParticipant.hpp" +#include "core/mock/participant/MockParticipant.hpp" + namespace { using namespace SilKit::Services::Orchestration; diff --git a/SilKit/source/capi/TypeConversion.hpp b/SilKit/source/capi/TypeConversion.hpp index dbaec0c10..45c4621a2 100644 --- a/SilKit/source/capi/TypeConversion.hpp +++ b/SilKit/source/capi/TypeConversion.hpp @@ -4,13 +4,16 @@ #pragma once +#include +#include + +#include "silkit/capi/DataPubSub.h" +#include "silkit/capi/Rpc.h" #include "silkit/capi/Types.h" #include "silkit/services/pubsub/PubSubSpec.hpp" #include "silkit/services/rpc/RpcSpec.hpp" -#include -#include namespace { From 4a4aec5bd3e4c0ddb021e33a8cfd92422abaf4b1 Mon Sep 17 00:00:00 2001 From: Daniel Edwards Date: Mon, 27 Apr 2026 10:53:57 +0200 Subject: [PATCH 2/2] fixup! style: use full paths for internal headers in `capi/...` Signed-off-by: Daniel Edwards --- SilKit/source/capi/CapiCan.cpp | 4 ++-- SilKit/source/capi/CapiDataPubSub.cpp | 6 +++--- SilKit/source/capi/CapiEthernet.cpp | 4 ++-- SilKit/source/capi/CapiFlexray.cpp | 4 ++-- SilKit/source/capi/CapiImpl.hpp | 4 ++-- SilKit/source/capi/CapiLin.cpp | 6 +++--- SilKit/source/capi/CapiLogger.cpp | 4 ++-- SilKit/source/capi/CapiNetworkSimulator.cpp | 7 ++++--- SilKit/source/capi/CapiOrchestration.cpp | 8 ++++---- SilKit/source/capi/CapiParticipant.cpp | 4 ++-- SilKit/source/capi/CapiRpc.cpp | 6 +++--- SilKit/source/capi/CapiVendor.cpp | 4 ++-- SilKit/source/capi/Test_CapiCan.cpp | 7 +++---- SilKit/source/capi/Test_CapiData.cpp | 7 +++---- SilKit/source/capi/Test_CapiEthernet.cpp | 9 ++++----- SilKit/source/capi/Test_CapiExceptions.cpp | 8 ++++---- SilKit/source/capi/Test_CapiFlexray.cpp | 7 +++---- SilKit/source/capi/Test_CapiLin.cpp | 9 ++++----- SilKit/source/capi/Test_CapiNetSim.cpp | 7 +++---- SilKit/source/capi/Test_CapiParticipantStateHandling.cpp | 7 +++---- SilKit/source/capi/Test_CapiRpc.cpp | 9 ++++----- SilKit/source/capi/Test_CapiSilKit.cpp | 4 ++-- SilKit/source/capi/Test_CapiTimeSync.cpp | 7 +++---- SilKit/source/capi/TypeConversion.hpp | 7 +++---- 24 files changed, 70 insertions(+), 79 deletions(-) diff --git a/SilKit/source/capi/CapiCan.cpp b/SilKit/source/capi/CapiCan.cpp index f24dafe53..dca6d10c2 100644 --- a/SilKit/source/capi/CapiCan.cpp +++ b/SilKit/source/capi/CapiCan.cpp @@ -4,11 +4,11 @@ #include "silkit/capi/Can.h" +#include "capi/CapiImpl.hpp" + #include "silkit/participant/IParticipant.hpp" #include "silkit/services/can/all.hpp" -#include "capi/CapiImpl.hpp" - SilKit_ReturnCode SilKitCALL SilKit_CanController_Create(SilKit_CanController** outController, SilKit_Participant* participant, const char* cName, diff --git a/SilKit/source/capi/CapiDataPubSub.cpp b/SilKit/source/capi/CapiDataPubSub.cpp index d4c1e6462..a48050fc5 100644 --- a/SilKit/source/capi/CapiDataPubSub.cpp +++ b/SilKit/source/capi/CapiDataPubSub.cpp @@ -4,12 +4,12 @@ #include "silkit/capi/DataPubSub.h" -#include "silkit/participant/IParticipant.hpp" -#include "silkit/services/pubsub/all.hpp" - #include "capi/CapiImpl.hpp" #include "capi/TypeConversion.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/pubsub/all.hpp" + SilKit_ReturnCode SilKitCALL SilKit_DataPublisher_Create(SilKit_DataPublisher** outPublisher, SilKit_Participant* participant, const char* controllerName, diff --git a/SilKit/source/capi/CapiEthernet.cpp b/SilKit/source/capi/CapiEthernet.cpp index 239fdd684..fab2613ad 100644 --- a/SilKit/source/capi/CapiEthernet.cpp +++ b/SilKit/source/capi/CapiEthernet.cpp @@ -4,11 +4,11 @@ #include "silkit/capi/Ethernet.h" +#include "capi/CapiImpl.hpp" + #include "silkit/participant/IParticipant.hpp" #include "silkit/services/ethernet/all.hpp" -#include "capi/CapiImpl.hpp" - SilKit_ReturnCode SilKitCALL SilKit_EthernetController_Create(SilKit_EthernetController** outController, SilKit_Participant* participant, const char* name, diff --git a/SilKit/source/capi/CapiFlexray.cpp b/SilKit/source/capi/CapiFlexray.cpp index 36d621e61..130b60ea5 100644 --- a/SilKit/source/capi/CapiFlexray.cpp +++ b/SilKit/source/capi/CapiFlexray.cpp @@ -4,11 +4,11 @@ #include "silkit/capi/Flexray.h" +#include "capi/CapiImpl.hpp" + #include "silkit/participant/IParticipant.hpp" #include "silkit/services/flexray/all.hpp" -#include "capi/CapiImpl.hpp" - namespace { diff --git a/SilKit/source/capi/CapiImpl.hpp b/SilKit/source/capi/CapiImpl.hpp index cf9e88a31..85002c06e 100644 --- a/SilKit/source/capi/CapiImpl.hpp +++ b/SilKit/source/capi/CapiImpl.hpp @@ -4,12 +4,12 @@ #pragma once +#include "capi/CapiExceptions.hpp" + #include "silkit/capi/InterfaceIdentifiers.h" #include "silkit/capi/Types.h" #include "silkit/participant/exception.hpp" -#include "capi/CapiExceptions.hpp" - #define CAPI_CATCH_EXCEPTIONS \ catch (const SilKit::CapiBadParameterError& e) \ diff --git a/SilKit/source/capi/CapiLin.cpp b/SilKit/source/capi/CapiLin.cpp index f09af5c16..bd8414001 100644 --- a/SilKit/source/capi/CapiLin.cpp +++ b/SilKit/source/capi/CapiLin.cpp @@ -4,13 +4,13 @@ #include "silkit/capi/Lin.h" +#include "capi/CapiImpl.hpp" +#include "services/lin/LinControllerExtensionsImpl.hpp" + #include "silkit/experimental/services/lin/LinControllerExtensions.hpp" #include "silkit/participant/IParticipant.hpp" #include "silkit/services/lin/all.hpp" -#include "capi/CapiImpl.hpp" -#include "services/lin/LinControllerExtensionsImpl.hpp" - namespace { diff --git a/SilKit/source/capi/CapiLogger.cpp b/SilKit/source/capi/CapiLogger.cpp index f55c917ae..c68e14278 100644 --- a/SilKit/source/capi/CapiLogger.cpp +++ b/SilKit/source/capi/CapiLogger.cpp @@ -4,10 +4,10 @@ #include "silkit/capi/Logger.h" -#include "silkit/services/logging/ILogger.hpp" - #include "capi/CapiImpl.hpp" +#include "silkit/services/logging/ILogger.hpp" + SilKit_ReturnCode SilKitCALL SilKit_Logger_Log(SilKit_Logger* self, SilKit_LoggingLevel level, const char* message) try diff --git a/SilKit/source/capi/CapiNetworkSimulator.cpp b/SilKit/source/capi/CapiNetworkSimulator.cpp index 2287c810c..42838d1ba 100644 --- a/SilKit/source/capi/CapiNetworkSimulator.cpp +++ b/SilKit/source/capi/CapiNetworkSimulator.cpp @@ -3,14 +3,15 @@ // SPDX-License-Identifier: MIT #include "silkit/capi/NetworkSimulator.h" +#include "silkit/capi/EventProducer.h" + +#include "capi/CapiImpl.hpp" +#include "participant/ParticipantExtensionsImpl.hpp" #include "silkit/detail/impl/HourglassConversions.hpp" #include "silkit/experimental/netsim/all.hpp" #include "silkit/participant/IParticipant.hpp" -#include "capi/CapiImpl.hpp" -#include "participant/ParticipantExtensionsImpl.hpp" - namespace SilKit { namespace Experimental { diff --git a/SilKit/source/capi/CapiOrchestration.cpp b/SilKit/source/capi/CapiOrchestration.cpp index ca6eac14e..bd4f6a37c 100644 --- a/SilKit/source/capi/CapiOrchestration.cpp +++ b/SilKit/source/capi/CapiOrchestration.cpp @@ -4,15 +4,15 @@ #include "silkit/capi/Orchestration.h" -#include +#include "capi/CapiImpl.hpp" +#include "participant/ParticipantExtensionsImpl.hpp" +#include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp" #include "silkit/experimental/services/orchestration/ISystemController.hpp" #include "silkit/participant/IParticipant.hpp" #include "silkit/services/orchestration/all.hpp" -#include "capi/CapiImpl.hpp" -#include "participant/ParticipantExtensionsImpl.hpp" -#include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp" +#include namespace { diff --git a/SilKit/source/capi/CapiParticipant.cpp b/SilKit/source/capi/CapiParticipant.cpp index 6a2b4be85..841119597 100644 --- a/SilKit/source/capi/CapiParticipant.cpp +++ b/SilKit/source/capi/CapiParticipant.cpp @@ -4,14 +4,14 @@ #include "silkit/capi/Participant.h" -#include "silkit/participant/IParticipant.hpp" - #include "CreateParticipantImpl.hpp" #include "capi/CapiImpl.hpp" #include "config/ParticipantConfiguration.hpp" #include "config/ParticipantConfigurationFromXImpl.hpp" #include "config/YamlParser.hpp" +#include "silkit/participant/IParticipant.hpp" + SilKit_ReturnCode SilKitCALL SilKit_Participant_Create(SilKit_Participant** outParticipant, SilKit_ParticipantConfiguration* participantConfiguration, diff --git a/SilKit/source/capi/CapiRpc.cpp b/SilKit/source/capi/CapiRpc.cpp index 06cf88089..3a01ab9c4 100644 --- a/SilKit/source/capi/CapiRpc.cpp +++ b/SilKit/source/capi/CapiRpc.cpp @@ -4,12 +4,12 @@ #include "silkit/capi/Rpc.h" -#include "silkit/participant/IParticipant.hpp" -#include "silkit/services/rpc/all.hpp" - #include "capi/CapiImpl.hpp" #include "capi/TypeConversion.hpp" +#include "silkit/participant/IParticipant.hpp" +#include "silkit/services/rpc/all.hpp" + namespace { diff --git a/SilKit/source/capi/CapiVendor.cpp b/SilKit/source/capi/CapiVendor.cpp index 5f73fc644..9452e502d 100644 --- a/SilKit/source/capi/CapiVendor.cpp +++ b/SilKit/source/capi/CapiVendor.cpp @@ -4,12 +4,12 @@ #include "silkit/capi/Vendor.h" -#include "silkit/vendor/ISilKitRegistry.hpp" - #include "CreateSilKitRegistryImpl.hpp" #include "capi/CapiImpl.hpp" #include "config/ParticipantConfiguration.hpp" +#include "silkit/vendor/ISilKitRegistry.hpp" + SilKit_ReturnCode SilKitCALL SilKit_Vendor_Vector_SilKitRegistry_Create( SilKit_Vendor_Vector_SilKitRegistry** outSilKitRegistry, SilKit_ParticipantConfiguration* participantConfiguration) diff --git a/SilKit/source/capi/Test_CapiCan.cpp b/SilKit/source/capi/Test_CapiCan.cpp index c7755196e..7b9852494 100644 --- a/SilKit/source/capi/Test_CapiCan.cpp +++ b/SilKit/source/capi/Test_CapiCan.cpp @@ -2,15 +2,14 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/Can.h" +#include "silkit/services/can/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/can/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using namespace SilKit::Services::Can; diff --git a/SilKit/source/capi/Test_CapiData.cpp b/SilKit/source/capi/Test_CapiData.cpp index 3bd20efd8..53c2a6c69 100644 --- a/SilKit/source/capi/Test_CapiData.cpp +++ b/SilKit/source/capi/Test_CapiData.cpp @@ -6,15 +6,14 @@ #define _CRT_SECURE_NO_WARNINGS #endif +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/DataPubSub.h" +#include "silkit/services/pubsub/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/pubsub/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using namespace SilKit::Services::PubSub; diff --git a/SilKit/source/capi/Test_CapiEthernet.cpp b/SilKit/source/capi/Test_CapiEthernet.cpp index de951c6c0..e15e7c6c9 100644 --- a/SilKit/source/capi/Test_CapiEthernet.cpp +++ b/SilKit/source/capi/Test_CapiEthernet.cpp @@ -2,16 +2,15 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" +#include "services/ethernet/EthDatatypeUtils.hpp" + #include "silkit/capi/Ethernet.h" +#include "silkit/services/ethernet/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/ethernet/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" -#include "services/ethernet/EthDatatypeUtils.hpp" - namespace { using namespace SilKit::Services::Ethernet; diff --git a/SilKit/source/capi/Test_CapiExceptions.cpp b/SilKit/source/capi/Test_CapiExceptions.cpp index 76054cdfe..9e1eab534 100644 --- a/SilKit/source/capi/Test_CapiExceptions.cpp +++ b/SilKit/source/capi/Test_CapiExceptions.cpp @@ -2,13 +2,13 @@ // // SPDX-License-Identifier: MIT -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "capi/CapiExceptions.hpp" +#include "capi/CapiImpl.hpp" #include "silkit/detail/impl/ThrowOnError.hpp" -#include "capi/CapiExceptions.hpp" -#include "capi/CapiImpl.hpp" +#include "gmock/gmock.h" +#include "gtest/gtest.h" namespace { diff --git a/SilKit/source/capi/Test_CapiFlexray.cpp b/SilKit/source/capi/Test_CapiFlexray.cpp index 5cf3f4b81..27380a884 100644 --- a/SilKit/source/capi/Test_CapiFlexray.cpp +++ b/SilKit/source/capi/Test_CapiFlexray.cpp @@ -2,15 +2,14 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/Flexray.h" +#include "silkit/services/flexray/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/flexray/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using namespace SilKit::Core; diff --git a/SilKit/source/capi/Test_CapiLin.cpp b/SilKit/source/capi/Test_CapiLin.cpp index 63befdcd6..99e6b3af0 100644 --- a/SilKit/source/capi/Test_CapiLin.cpp +++ b/SilKit/source/capi/Test_CapiLin.cpp @@ -2,16 +2,15 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" +#include "services/lin/ILinControllerExtensions.hpp" + #include "silkit/capi/Lin.h" +#include "silkit/services/lin/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/lin/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" -#include "services/lin/ILinControllerExtensions.hpp" - namespace { using namespace SilKit::Services::Lin; diff --git a/SilKit/source/capi/Test_CapiNetSim.cpp b/SilKit/source/capi/Test_CapiNetSim.cpp index 112decb04..62c2e9537 100644 --- a/SilKit/source/capi/Test_CapiNetSim.cpp +++ b/SilKit/source/capi/Test_CapiNetSim.cpp @@ -2,15 +2,14 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/NetworkSimulator.h" +#include "silkit/experimental/netsim/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/experimental/netsim/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using namespace SilKit::Experimental::NetworkSimulation; diff --git a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp index 627759389..d65d37065 100644 --- a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp +++ b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp @@ -6,15 +6,14 @@ #define _CRT_SECURE_NO_WARNINGS #endif +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/Orchestration.h" +#include "silkit/services/orchestration/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/orchestration/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using testing::Return; diff --git a/SilKit/source/capi/Test_CapiRpc.cpp b/SilKit/source/capi/Test_CapiRpc.cpp index d08775436..3e3918d3b 100644 --- a/SilKit/source/capi/Test_CapiRpc.cpp +++ b/SilKit/source/capi/Test_CapiRpc.cpp @@ -6,16 +6,15 @@ #define _CRT_SECURE_NO_WARNINGS #endif +#include "core/mock/participant/MockParticipant.hpp" +#include "services/rpc/RpcCallHandle.hpp" + #include "silkit/capi/Rpc.h" +#include "silkit/services/rpc/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/rpc/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" -#include "services/rpc/RpcCallHandle.hpp" - namespace { using namespace SilKit::Services::Rpc; diff --git a/SilKit/source/capi/Test_CapiSilKit.cpp b/SilKit/source/capi/Test_CapiSilKit.cpp index ac4cb6426..89b31c47f 100644 --- a/SilKit/source/capi/Test_CapiSilKit.cpp +++ b/SilKit/source/capi/Test_CapiSilKit.cpp @@ -2,13 +2,13 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/SilKit.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "core/mock/participant/MockParticipant.hpp" - namespace { diff --git a/SilKit/source/capi/Test_CapiTimeSync.cpp b/SilKit/source/capi/Test_CapiTimeSync.cpp index 2a8754bd0..adca53fea 100644 --- a/SilKit/source/capi/Test_CapiTimeSync.cpp +++ b/SilKit/source/capi/Test_CapiTimeSync.cpp @@ -2,15 +2,14 @@ // // SPDX-License-Identifier: MIT +#include "core/mock/participant/MockParticipant.hpp" + #include "silkit/capi/Orchestration.h" +#include "silkit/services/orchestration/all.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "silkit/services/orchestration/all.hpp" - -#include "core/mock/participant/MockParticipant.hpp" - namespace { using namespace SilKit::Services::Orchestration; diff --git a/SilKit/source/capi/TypeConversion.hpp b/SilKit/source/capi/TypeConversion.hpp index 45c4621a2..8c079aa32 100644 --- a/SilKit/source/capi/TypeConversion.hpp +++ b/SilKit/source/capi/TypeConversion.hpp @@ -4,16 +4,15 @@ #pragma once -#include -#include - #include "silkit/capi/DataPubSub.h" #include "silkit/capi/Rpc.h" #include "silkit/capi/Types.h" - #include "silkit/services/pubsub/PubSubSpec.hpp" #include "silkit/services/rpc/RpcSpec.hpp" +#include +#include + namespace {