Skip to content

style: use full paths for internal headers in capi/... #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VDanielEdwards wants to merge 2 commits into
base: main
Choose a base branch
from
Open

style: use full paths for internal headers in capi/... #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda8abe
style: use full paths for internal headers in `capi/...`
VDanielEdwards Apr 24, 2026
4a4aec5
fixup! style: use full paths for internal headers in `capi/...`
VDanielEdwards Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions SilKit/source/capi/CapiCan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
//
// SPDX-License-Identifier: MIT

#include <map>
#include <mutex>
#include <cstring>
#include <sstream>

#include "silkit/capi/SilKit.h"
#include "silkit/SilKit.hpp"
#include "CapiImpl.hpp"
#include "silkit/capi/Can.h"

#include "capi/CapiImpl.hpp"

#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/can/all.hpp"


Expand Down
15 changes: 5 additions & 10 deletions SilKit/source/capi/CapiDataPubSub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "capi/CapiImpl.hpp"
#include "capi/TypeConversion.hpp"

#include <map>
#include <mutex>
#include <cstring>
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/pubsub/all.hpp"


SilKit_ReturnCode SilKitCALL SilKit_DataPublisher_Create(SilKit_DataPublisher** outPublisher,
Expand Down
12 changes: 5 additions & 7 deletions SilKit/source/capi/CapiEthernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/services/ethernet/all.hpp"
#include "silkit/capi/Ethernet.h"

#include "capi/CapiImpl.hpp"

#include <cstring>
#include "CapiImpl.hpp"
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/ethernet/all.hpp"


SilKit_ReturnCode SilKitCALL SilKit_EthernetController_Create(SilKit_EthernetController** outController,
Expand Down
11 changes: 4 additions & 7 deletions SilKit/source/capi/CapiFlexray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
//
// SPDX-License-Identifier: MIT

#include <string>
#include <cstring>
#include "silkit/capi/Flexray.h"

#include "silkit/capi/SilKit.h"
#include "silkit/SilKit.hpp"
#include "silkit/services/flexray/all.hpp"
#include "capi/CapiImpl.hpp"

#include "IParticipantInternal.hpp"
#include "CapiImpl.hpp"
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/flexray/all.hpp"


namespace {
Expand Down
5 changes: 3 additions & 2 deletions SilKit/source/capi/CapiImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

#pragma once

#include "silkit/capi/Types.h"
#include "capi/CapiExceptions.hpp"

#include "silkit/capi/InterfaceIdentifiers.h"
#include "silkit/capi/Types.h"
#include "silkit/participant/exception.hpp"

#include "CapiExceptions.hpp"

#define CAPI_CATCH_EXCEPTIONS \
catch (const SilKit::CapiBadParameterError& e) \
Expand Down
12 changes: 5 additions & 7 deletions SilKit/source/capi/CapiLin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
//
// SPDX-License-Identifier: MIT

#include "silkit/capi/Lin.h"

#include "capi/CapiImpl.hpp"
#include "services/lin/LinControllerExtensionsImpl.hpp"

#include "silkit/capi/SilKit.h"
#include "silkit/SilKit.hpp"
#include "silkit/services/lin/all.hpp"
#include "silkit/experimental/services/lin/LinControllerExtensions.hpp"

#include "CapiImpl.hpp"

#include <cstring>
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/lin/all.hpp"


namespace {
Expand Down
8 changes: 3 additions & 5 deletions SilKit/source/capi/CapiLogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "capi/CapiImpl.hpp"

#include <string>
#include "silkit/services/logging/ILogger.hpp"


SilKit_ReturnCode SilKitCALL SilKit_Logger_Log(SilKit_Logger* self, SilKit_LoggingLevel level, const char* message)
Expand Down
17 changes: 6 additions & 11 deletions SilKit/source/capi/CapiNetworkSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@
//
// SPDX-License-Identifier: MIT

#include <iostream>
#include <string>
#include <algorithm>
#include <map>
#include <mutex>
#include <cstring>
#include "silkit/capi/NetworkSimulator.h"
#include "silkit/capi/EventProducer.h"

#include "silkit/capi/SilKit.h"
#include "silkit/SilKit.hpp"
#include "CapiImpl.hpp"
#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 "silkit/detail/impl/HourglassConversions.hpp"
#include "participant/ParticipantExtensionsImpl.hpp"

namespace SilKit {
namespace Experimental {
Expand Down
17 changes: 6 additions & 11 deletions SilKit/source/capi/CapiOrchestration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,17 @@
//
// 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 "capi/CapiImpl.hpp"
#include "participant/ParticipantExtensionsImpl.hpp"

#include "CapiImpl.hpp"
#include "TypeConversion.hpp"

#include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp"

#include <memory>
#include "silkit/experimental/services/orchestration/ISystemController.hpp"
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/orchestration/all.hpp"

#include <map>
#include <mutex>
#include <cstring>


namespace {
Expand Down
22 changes: 7 additions & 15 deletions SilKit/source/capi/CapiParticipant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "CreateParticipantImpl.hpp"
#include "capi/CapiImpl.hpp"
#include "config/ParticipantConfiguration.hpp"
#include "config/ParticipantConfigurationFromXImpl.hpp"
#include "config/YamlParser.hpp"

#include <memory>
#include <map>
#include <mutex>
#include <fstream>
#include "silkit/participant/IParticipant.hpp"


SilKit_ReturnCode SilKitCALL SilKit_Participant_Create(SilKit_Participant** outParticipant,
Expand Down
18 changes: 5 additions & 13 deletions SilKit/source/capi/CapiRpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "capi/CapiImpl.hpp"
#include "capi/TypeConversion.hpp"

#include <string>
#include <algorithm>
#include <map>
#include <mutex>
#include <cstring>
#include "silkit/participant/IParticipant.hpp"
#include "silkit/services/rpc/all.hpp"


namespace {
Expand Down
14 changes: 4 additions & 10 deletions SilKit/source/capi/CapiVendor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,14 @@
//
// SPDX-License-Identifier: MIT

#include "ParticipantConfiguration.hpp"
#include "CreateSilKitRegistryImpl.hpp"
#include "silkit/capi/Vendor.h"

#include "silkit/capi/SilKit.h"
#include "CreateSilKitRegistryImpl.hpp"
#include "capi/CapiImpl.hpp"
#include "config/ParticipantConfiguration.hpp"

#include "silkit/vendor/ISilKitRegistry.hpp"

#include "CapiImpl.hpp"
#include "TypeConversion.hpp"

#include <memory>
#include <map>
#include <mutex>


SilKit_ReturnCode SilKitCALL SilKit_Vendor_Vector_SilKitRegistry_Create(
SilKit_Vendor_Vector_SilKitRegistry** outSilKitRegistry, SilKit_ParticipantConfiguration* participantConfiguration)
Expand Down
5 changes: 3 additions & 2 deletions SilKit/source/capi/CapiVersion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 7 additions & 4 deletions SilKit/source/capi/Test_CapiCan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
//
// SPDX-License-Identifier: MIT

#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "silkit/capi/SilKit.h"
#include "core/mock/participant/MockParticipant.hpp"

#include "silkit/capi/Can.h"
#include "silkit/services/can/all.hpp"
#include "MockParticipant.hpp"

#include "gmock/gmock.h"
#include "gtest/gtest.h"


namespace {
using namespace SilKit::Services::Can;
Expand Down
11 changes: 7 additions & 4 deletions SilKit/source/capi/Test_CapiData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
#define _CRT_SECURE_NO_WARNINGS
#endif

#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "silkit/capi/SilKit.h"
#include "core/mock/participant/MockParticipant.hpp"

#include "silkit/capi/DataPubSub.h"
#include "silkit/services/pubsub/all.hpp"
#include "MockParticipant.hpp"

#include "gmock/gmock.h"
#include "gtest/gtest.h"


namespace {
using namespace SilKit::Services::PubSub;
Expand Down
13 changes: 7 additions & 6 deletions SilKit/source/capi/Test_CapiEthernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
//
// SPDX-License-Identifier: MIT

#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "silkit/capi/SilKit.h"
#include "core/mock/participant/MockParticipant.hpp"
#include "services/ethernet/EthDatatypeUtils.hpp"

#include "silkit/capi/Ethernet.h"
#include "silkit/services/ethernet/all.hpp"
#include "EthDatatypeUtils.hpp"
#include "MockParticipant.hpp"

#include "fmt/format.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"


namespace {
using namespace SilKit::Services::Ethernet;
Expand Down
9 changes: 6 additions & 3 deletions SilKit/source/capi/Test_CapiExceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
//
// SPDX-License-Identifier: MIT

#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "capi/CapiExceptions.hpp"
#include "capi/CapiImpl.hpp"

#include "CapiImpl.hpp"
#include "silkit/detail/impl/ThrowOnError.hpp"

#include "gmock/gmock.h"
#include "gtest/gtest.h"


namespace {

class Test_CapiExceptions : public testing::Test
Expand Down
6 changes: 4 additions & 2 deletions SilKit/source/capi/Test_CapiFlexray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
//
// SPDX-License-Identifier: MIT

#include "core/mock/participant/MockParticipant.hpp"

#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"


namespace {
using namespace SilKit::Core;
Expand Down
Loading
Loading