From f7795cf09e98f14498cc2350ccdaaab7d2834616 Mon Sep 17 00:00:00 2001 From: ayumax Date: Sat, 27 Apr 2019 22:29:44 +0900 Subject: [PATCH] Release build compatible (ver1.1.0) --- ObjectDelivererTest.uproject | 2 +- Plugins/ObjectDeliverer/ObjectDeliverer.uplugin | 4 ++-- .../Private/DeliveryBox/DeliveryBox.cpp | 2 +- .../Private/DeliveryBox/DeliveryBoxFactory.cpp | 6 +++--- .../DeliveryBox/ObjectDeliveryBoxUsingJson.cpp | 2 +- .../DeliveryBox/Utf8StringDeliveryBox.cpp | 2 +- .../Private/PacketRule/PacketRule.cpp | 2 +- .../Private/PacketRule/PacketRuleFactory.cpp | 10 +++++----- .../Private/PacketRule/PacketRuleFixedLength.cpp | 4 ++-- .../Private/PacketRule/PacketRuleNodivision.cpp | 4 ++-- .../Private/PacketRule/PacketRuleSizeBody.cpp | 4 ++-- .../Private/PacketRule/PacketRuleTerminate.cpp | 4 ++-- .../Private/Protocol/ObjectDelivererProtocol.cpp | 2 +- .../Private/Protocol/ProtocolFactory.cpp | 16 ++++++++-------- .../Private/Protocol/ProtocolLogReader.cpp | 2 +- .../Private/Protocol/ProtocolLogWriter.cpp | 2 +- .../Private/Protocol/ProtocolSharedMemory.cpp | 2 +- .../Private/Protocol/ProtocolSocketBase.cpp | 2 +- .../Private/Protocol/ProtocolTcpIpClient.cpp | 2 +- .../Private/Protocol/ProtocolTcpIpServer.cpp | 4 ++-- .../Private/Protocol/ProtocolTcpIpSocket.cpp | 2 +- .../Protocol/ProtocolUdpSocketReceiver.cpp | 2 +- .../Private/Protocol/ProtocolUdpSocketSender.cpp | 2 +- .../Tests/ObjectDelivererManagerTestHelper.h | 2 +- .../Private/Tests/PacketRuleNodivisionTest.cpp | 4 ++-- .../Private/Tests/PacketRuleSizeBodyTest.cpp | 4 ++-- .../Private/Tests/PacketRuleTerminateTest.cpp | 4 ++-- .../Tests/ProtocolLogWriterReaderTest.cpp | 14 +++++++------- .../Private/Tests/ProtocolSharedMemoryTest.cpp | 10 +++++----- .../Tests/ProtocolTcpIpServerClientTest.cpp | 12 ++++++------ .../Private/Tests/ProtocolUdpSocketTest.cpp | 12 ++++++------ .../Public/ObjectDelivererManager.h | 2 +- 32 files changed, 74 insertions(+), 74 deletions(-) diff --git a/ObjectDelivererTest.uproject b/ObjectDelivererTest.uproject index 075ab5f..cb13ae6 100644 --- a/ObjectDelivererTest.uproject +++ b/ObjectDelivererTest.uproject @@ -18,7 +18,7 @@ }, { "Name": "HoudiniEngine", - "Enabled": true + "Enabled": false } ] } \ No newline at end of file diff --git a/Plugins/ObjectDeliverer/ObjectDeliverer.uplugin b/Plugins/ObjectDeliverer/ObjectDeliverer.uplugin index 37807d1..65cb77e 100644 --- a/Plugins/ObjectDeliverer/ObjectDeliverer.uplugin +++ b/Plugins/ObjectDeliverer/ObjectDeliverer.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 1, - "VersionName": "1.0.0", + "Version": 110, + "VersionName": "1.1.0", "FriendlyName": "ObjectDeliverer", "Description": "ObjectDeliverer is a data transmission / reception library for Unreal Engine (C ++, Blueprint). ", "Category": "Programming", diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBox.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBox.cpp index 6b51376..650a0a8 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBox.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBox.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "DeliveryBox.h" +#include "DeliveryBox/DeliveryBox.h" UDeliveryBox::UDeliveryBox() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBoxFactory.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBoxFactory.cpp index fc5402e..856e65f 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBoxFactory.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/DeliveryBoxFactory.cpp @@ -1,7 +1,7 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "DeliveryBoxFactory.h" -#include "ObjectDeliveryBoxUsingJson.h" -#include "Utf8StringDeliveryBox.h" +#include "DeliveryBox/DeliveryBoxFactory.h" +#include "DeliveryBox/ObjectDeliveryBoxUsingJson.h" +#include "DeliveryBox/Utf8StringDeliveryBox.h" UObjectDeliveryBoxUsingJson* UDeliveryBoxFactory::CreateObjectDeliveryBoxUsingJson(UClass* TargetClass) { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/ObjectDeliveryBoxUsingJson.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/ObjectDeliveryBoxUsingJson.cpp index 4a4519c..0e056e8 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/ObjectDeliveryBoxUsingJson.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/ObjectDeliveryBoxUsingJson.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ObjectDeliveryBoxUsingJson.h" +#include "DeliveryBox/ObjectDeliveryBoxUsingJson.h" #include "Utils/StringUtil.h" #include "../Utils/ObjectJsonSerializer.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/Utf8StringDeliveryBox.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/Utf8StringDeliveryBox.cpp index 3689c9e..a97996b 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/Utf8StringDeliveryBox.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/DeliveryBox/Utf8StringDeliveryBox.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "Utf8StringDeliveryBox.h" +#include "DeliveryBox/Utf8StringDeliveryBox.h" #include "Utils/StringUtil.h" UUtf8StringDeliveryBox::UUtf8StringDeliveryBox() diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRule.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRule.cpp index 6505f3d..a5e1748 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRule.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRule.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRule.h" +#include "PacketRule/PacketRule.h" UPacketRule::UPacketRule() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFactory.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFactory.cpp index a3153c1..800cff8 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFactory.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFactory.cpp @@ -1,9 +1,9 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRuleFactory.h" -#include "PacketRuleFixedLength.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleTerminate.h" -#include "PacketRuleNodivision.h" +#include "PacketRule/PacketRuleFactory.h" +#include "PacketRule/PacketRuleFixedLength.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleTerminate.h" +#include "PacketRule/PacketRuleNodivision.h" UPacketRuleFixedLength* UPacketRuleFactory::CreatePacketRuleFixedLength(int32 FixedSize) { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFixedLength.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFixedLength.cpp index 624293b..d91c941 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFixedLength.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleFixedLength.cpp @@ -1,6 +1,6 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRuleFixedLength.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleFixedLength.h" +#include "PacketRule/PacketRuleFactory.h" UPacketRuleFixedLength::UPacketRuleFixedLength() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleNodivision.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleNodivision.cpp index b82d782..bfbd4e8 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleNodivision.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleNodivision.cpp @@ -1,6 +1,6 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRuleNodivision.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleNodivision.h" +#include "PacketRule/PacketRuleFactory.h" UPacketRuleNodivision::UPacketRuleNodivision() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleSizeBody.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleSizeBody.cpp index c33c784..e7e976c 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleSizeBody.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleSizeBody.cpp @@ -1,6 +1,6 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" UPacketRuleSizeBody::UPacketRuleSizeBody() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleTerminate.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleTerminate.cpp index ef7ecf7..60f2456 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleTerminate.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/PacketRule/PacketRuleTerminate.cpp @@ -1,6 +1,6 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "PacketRuleTerminate.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleTerminate.h" +#include "PacketRule/PacketRuleFactory.h" UPacketRuleTerminate::UPacketRuleTerminate() { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ObjectDelivererProtocol.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ObjectDelivererProtocol.cpp index 53875a3..515053b 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ObjectDelivererProtocol.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ObjectDelivererProtocol.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ObjectDelivererProtocol.h" +#include "Protocol/ObjectDelivererProtocol.h" #include "PacketRule/PacketRule.h" UObjectDelivererProtocol::UObjectDelivererProtocol() diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolFactory.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolFactory.cpp index c2577d3..dfef6af 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolFactory.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolFactory.cpp @@ -1,12 +1,12 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolFactory.h" -#include "ProtocolTcpIpClient.h" -#include "ProtocolTcpIpServer.h" -#include "ProtocolUdpSocketSender.h" -#include "ProtocolUdpSocketReceiver.h" -#include "ProtocolSharedMemory.h" -#include "ProtocolLogWriter.h" -#include "ProtocolLogReader.h" +#include "Protocol/ProtocolFactory.h" +#include "Protocol/ProtocolTcpIpClient.h" +#include "Protocol/ProtocolTcpIpServer.h" +#include "Protocol/ProtocolUdpSocketSender.h" +#include "Protocol/ProtocolUdpSocketReceiver.h" +#include "Protocol/ProtocolSharedMemory.h" +#include "Protocol/ProtocolLogWriter.h" +#include "Protocol/ProtocolLogReader.h" UProtocolTcpIpClient* UProtocolFactory::CreateProtocolTcpIpClient(const FString& IpAddress /*= "localhost"*/, int32 Port /*= 8000*/, bool Retry/* = false*/) { diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogReader.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogReader.cpp index ae73ef3..9a9f340 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogReader.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogReader.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolLogReader.h" +#include "Protocol/ProtocolLogReader.h" #include "PacketRule/PacketRule.h" #include "Utils/FileUtil.h" #include "Utils/WorkerThread.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogWriter.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogWriter.cpp index 5d247ec..3d32634 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogWriter.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolLogWriter.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolLogWriter.h" +#include "Protocol/ProtocolLogWriter.h" #include "PacketRule/PacketRule.h" #include "Utils/FileUtil.h" #include "Misc/Paths.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSharedMemory.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSharedMemory.cpp index 9be09a3..a622a69 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSharedMemory.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSharedMemory.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolSharedMemory.h" +#include "Protocol/ProtocolSharedMemory.h" #include "Utils/WorkerThread.h" #include "Runtime/Core/Public/HAL/RunnableThread.h" #include "PacketRule/PacketRule.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSocketBase.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSocketBase.cpp index faea05a..e1540b8 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSocketBase.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolSocketBase.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolSocketBase.h" +#include "Protocol/ProtocolSocketBase.h" #include "Misc/OutputDeviceRedirector.h" #include "Sockets.h" #include "SocketSubsystem.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpClient.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpClient.cpp index 37b2b3b..8619e71 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpClient.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpClient.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolTcpIpClient.h" +#include "Protocol/ProtocolTcpIpClient.h" #include "Common/TcpSocketBuilder.h" #include "Utils/WorkerThread.h" #include "Runtime/Core/Public/HAL/RunnableThread.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpServer.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpServer.cpp index 7d8d092..66d3c6d 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpServer.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpServer.cpp @@ -1,7 +1,7 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolTcpIpServer.h" +#include "Protocol/ProtocolTcpIpServer.h" +#include "Protocol/ProtocolTcpIpSocket.h" #include "Common/TcpSocketBuilder.h" -#include "ProtocolTcpIpSocket.h" #include "Utils/WorkerThread.h" #include "PacketRule/PacketRule.h" #include "Runtime/Core/Public/HAL/RunnableThread.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpSocket.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpSocket.cpp index f5aa8a8..2b23a1e 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpSocket.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolTcpIpSocket.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolTcpIpSocket.h" +#include "Protocol/ProtocolTcpIpSocket.h" #include "Common/TcpSocketBuilder.h" #include "Utils/WorkerThread.h" #include "Runtime/Core/Public/HAL/RunnableThread.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketReceiver.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketReceiver.cpp index 79f9e87..8590381 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketReceiver.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketReceiver.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolUdpSocketReceiver.h" +#include "Protocol/ProtocolUdpSocketReceiver.h" #include "PacketRule/PacketRule.h" UProtocolUdpSocketReceiver::UProtocolUdpSocketReceiver() diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketSender.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketSender.cpp index c3a69ff..7281fb3 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketSender.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Protocol/ProtocolUdpSocketSender.cpp @@ -1,5 +1,5 @@ // Copyright 2019 ayumax. All Rights Reserved. -#include "ProtocolUdpSocketSender.h" +#include "Protocol/ProtocolUdpSocketSender.h" #include "Common/UdpSocketBuilder.h" #include "Utils/WorkerThread.h" #include "Runtime/Core/Public/HAL/RunnableThread.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ObjectDelivererManagerTestHelper.h b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ObjectDelivererManagerTestHelper.h index 65653d0..246aa13 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ObjectDelivererManagerTestHelper.h +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ObjectDelivererManagerTestHelper.h @@ -4,7 +4,7 @@ #include "CoreMinimal.h" #include "PacketRule/PacketRuleFactory.h" #include "Protocol/ProtocolFactory.h" -#include "DeliveryBoxFactory.h" +#include "DeliveryBox/DeliveryBoxFactory.h" #include "UObject/GCObject.h" #include "ObjectDelivererManagerTestHelper.generated.h" diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleNodivisionTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleNodivisionTest.cpp index 5ec9d5e..6b9db3a 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleNodivisionTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleNodivisionTest.cpp @@ -1,7 +1,7 @@ // Copyright 2019 ayumax. All Rights Reserved. #include "Misc/AutomationTest.h" -#include "PacketRuleNodivision.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleNodivision.h" +#include "PacketRule/PacketRuleFactory.h" IMPLEMENT_SIMPLE_AUTOMATION_TEST(FPacketRuleNodivisionTest_MakeSendPacket, "ObjectDeliverer.PacketRuleTests.PacketRuleNodivisionTest.MakeSendPacket", EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::SmokeFilter) diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleSizeBodyTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleSizeBodyTest.cpp index d91eca7..39a30db 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleSizeBodyTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleSizeBodyTest.cpp @@ -1,7 +1,7 @@ // Copyright 2019 ayumax. All Rights Reserved. #include "Misc/AutomationTest.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" IMPLEMENT_SIMPLE_AUTOMATION_TEST(FPacketRuleSizeBodyTest_MakeSendPacket, "ObjectDeliverer.PacketRuleTests.FPacketRuleSizeBodyTest.MakeSendPacket", EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::SmokeFilter) diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleTerminateTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleTerminateTest.cpp index 4aad333..841a2d4 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleTerminateTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/PacketRuleTerminateTest.cpp @@ -1,7 +1,7 @@ // Copyright 2019 ayumax. All Rights Reserved. #include "Misc/AutomationTest.h" -#include "PacketRuleTerminate.h" -#include "PacketRuleFactory.h" +#include "PacketRule/PacketRuleTerminate.h" +#include "PacketRule/PacketRuleFactory.h" IMPLEMENT_SIMPLE_AUTOMATION_TEST(FPacketRuleTerminateTest_MakeSendPacket, "ObjectDeliverer.PacketRuleTests.PacketRuleTerminateTest.MakeSendPacket", EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::SmokeFilter) diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolLogWriterReaderTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolLogWriterReaderTest.cpp index 5e52964..017fc42 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolLogWriterReaderTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolLogWriterReaderTest.cpp @@ -2,14 +2,14 @@ #include "CoreMinimal.h" #include "Misc/AutomationTest.h" #include "Tests/AutomationCommon.h" -#include "ProtocolLogReader.h" -#include "ProtocolLogWriter.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" -#include "ProtocolFactory.h" +#include "Protocol/ProtocolLogReader.h" +#include "Protocol/ProtocolLogWriter.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" +#include "Protocol/ProtocolFactory.h" #include "ObjectDelivererManager.h" -#include "Utf8StringDeliveryBox.h" -#include "Private/Tests/ObjectDelivererManagerTestHelper.h" +#include "DeliveryBox/Utf8StringDeliveryBox.h" +#include "Tests/ObjectDelivererManagerTestHelper.h" #if WITH_DEV_AUTOMATION_TESTS diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolSharedMemoryTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolSharedMemoryTest.cpp index ab4b394..9ac195b 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolSharedMemoryTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolSharedMemoryTest.cpp @@ -2,12 +2,12 @@ #include "CoreMinimal.h" #include "Misc/AutomationTest.h" #include "Tests/AutomationCommon.h" -#include "ProtocolSharedMemory.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" -#include "ProtocolFactory.h" +#include "Protocol/ProtocolSharedMemory.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" +#include "Protocol/ProtocolFactory.h" #include "ObjectDelivererManager.h" -#include "Private/Tests/ObjectDelivererManagerTestHelper.h" +#include "Tests/ObjectDelivererManagerTestHelper.h" #if WITH_DEV_AUTOMATION_TESTS diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolTcpIpServerClientTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolTcpIpServerClientTest.cpp index fe7ef5b..2afeaa9 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolTcpIpServerClientTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolTcpIpServerClientTest.cpp @@ -2,13 +2,13 @@ #include "CoreMinimal.h" #include "Misc/AutomationTest.h" #include "Tests/AutomationCommon.h" -#include "ProtocolTcpIpClient.h" -#include "ProtocolTcpIpServer.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" -#include "ProtocolFactory.h" +#include "Protocol/ProtocolTcpIpClient.h" +#include "Protocol/ProtocolTcpIpServer.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" +#include "Protocol/ProtocolFactory.h" #include "ObjectDelivererManager.h" -#include "Private/Tests/ObjectDelivererManagerTestHelper.h" +#include "Tests/ObjectDelivererManagerTestHelper.h" #if WITH_DEV_AUTOMATION_TESTS diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolUdpSocketTest.cpp b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolUdpSocketTest.cpp index 114f04d..fa18916 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolUdpSocketTest.cpp +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Private/Tests/ProtocolUdpSocketTest.cpp @@ -2,13 +2,13 @@ #include "CoreMinimal.h" #include "Misc/AutomationTest.h" #include "Tests/AutomationCommon.h" -#include "ProtocolUdpSocketSender.h" -#include "ProtocolUdpSocketReceiver.h" -#include "PacketRuleSizeBody.h" -#include "PacketRuleFactory.h" -#include "ProtocolFactory.h" +#include "Protocol/ProtocolUdpSocketSender.h" +#include "Protocol/ProtocolUdpSocketReceiver.h" +#include "PacketRule/PacketRuleSizeBody.h" +#include "PacketRule/PacketRuleFactory.h" +#include "Protocol/ProtocolFactory.h" #include "ObjectDelivererManager.h" -#include "Private/Tests/ObjectDelivererManagerTestHelper.h" +#include "Tests/ObjectDelivererManagerTestHelper.h" #if WITH_DEV_AUTOMATION_TESTS diff --git a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Public/ObjectDelivererManager.h b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Public/ObjectDelivererManager.h index 802f5c1..88f0526 100644 --- a/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Public/ObjectDelivererManager.h +++ b/Plugins/ObjectDeliverer/Source/ObjectDeliverer/Public/ObjectDelivererManager.h @@ -4,7 +4,7 @@ #include "CoreMinimal.h" #include "PacketRule/PacketRuleFactory.h" #include "Protocol/ProtocolFactory.h" -#include "DeliveryBoxFactory.h" +#include "DeliveryBox/DeliveryBoxFactory.h" #include "UObject/GCObject.h" #include "Delegates/DelegateCombinations.h" #include "ObjectDelivererManager.generated.h"