From 3132bc77779cb1f55898c19ef404c729e1c7a17a Mon Sep 17 00:00:00 2001 From: L05 Date: Tue, 18 Feb 2020 09:22:29 -0800 Subject: [PATCH] 4.24 fix (includes) --- OSC/Source/OSC/Private/OscPrivatePCH.h | 4 ++-- OSC/Source/OSC/Private/OscSettings.cpp | 2 +- OSC/Source/OSC/Private/OscSettings.h | 2 +- OSC/Source/OSC/Private/Receive/OscDispatcher.cpp | 6 +++--- OSC/Source/OSC/Private/Receive/OscDispatcher.h | 10 +++++----- OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverActor.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverComponent.h | 4 ++-- OSC/Source/OSC/Public/Receive/OscReceiverInterface.h | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OSC/Source/OSC/Private/OscPrivatePCH.h b/OSC/Source/OSC/Private/OscPrivatePCH.h index 982cf0d..c959b02 100644 --- a/OSC/Source/OSC/Private/OscPrivatePCH.h +++ b/OSC/Source/OSC/Private/OscPrivatePCH.h @@ -6,10 +6,10 @@ #include "ISettingsModule.h" #include "ISettingsSection.h" -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" #include "Sockets.h" #include "SocketSubsystem.h" -#include "TaskGraphInterfaces.h" +#include "Async/TaskGraphInterfaces.h" #include "Runtime/Engine/Classes/Kismet/BlueprintFunctionLibrary.h" #include "Runtime/Networking/Public/Networking.h" diff --git a/OSC/Source/OSC/Private/OscSettings.cpp b/OSC/Source/OSC/Private/OscSettings.cpp index 9a6aca1..0bc1b49 100644 --- a/OSC/Source/OSC/Private/OscSettings.cpp +++ b/OSC/Source/OSC/Private/OscSettings.cpp @@ -3,7 +3,7 @@ #include "OscSettings.h" #include "OscDispatcher.h" -#include "IPv4Endpoint.h" +#include "Interfaces/IPv4/IPv4Address.h" #include "Sockets.h" diff --git a/OSC/Source/OSC/Private/OscSettings.h b/OSC/Source/OSC/Private/OscSettings.h index deec70e..1c794c3 100644 --- a/OSC/Source/OSC/Private/OscSettings.h +++ b/OSC/Source/OSC/Private/OscSettings.h @@ -1,6 +1,6 @@ #pragma once -#include "Object.h" +#include "UObject/Object.h" #include "OscReceiverInputKey.h" #include #include diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp index d3f4bac..cff5364 100644 --- a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp +++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp @@ -1,8 +1,8 @@ #include "OscPrivatePCH.h" #include "OscDispatcher.h" -#include "OscReceiverInterface.h" -#include "ArrayReader.h" -#include "IPv4Endpoint.h" +#include "Receive/OscReceiverInterface.h" +#include "Serialization/ArrayReader.h" +#include "Interfaces/IPv4/IPv4Address.h" #include "oscpack/osc/OscReceivedElements.h" diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.h b/OSC/Source/OSC/Private/Receive/OscDispatcher.h index 45f5fe8..637de59 100644 --- a/OSC/Source/OSC/Private/Receive/OscDispatcher.h +++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.h @@ -1,11 +1,11 @@ #pragma once -#include "Object.h" -#include "OscDataElemStruct.h" +#include "UObject/Object.h" +#include "Common/OscDataElemStruct.h" -#include "IPv4Address.h" -#include "CircularQueue.h" -#include "UdpSocketReceiver.h" +#include "Interfaces/IPv4/IPv4Address.h" +#include "Containers/CircularQueue.h" +#include "Common/UdpSocketReceiver.h" #include #include diff --git a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h index b775353..5e9f81c 100644 --- a/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h +++ b/OSC/Source/OSC/Private/Receive/OscReceiverInputKey.h @@ -2,8 +2,8 @@ #include "InputCoreTypes.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" class OscReceiverInputKey : public IOscReceiverInterface diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverActor.h b/OSC/Source/OSC/Public/Receive/OscReceiverActor.h index d2caf5f..5c9f434 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverActor.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverActor.h @@ -1,8 +1,8 @@ #pragma once #include "GameFramework/Actor.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" #include "OscReceiverActor.generated.h" diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h b/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h index 86c89e3..2e52db3 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverComponent.h @@ -1,8 +1,8 @@ #pragma once #include "Components/ActorComponent.h" -#include "OscReceiverInterface.h" -#include "OscDataElemStruct.h" +#include "Receive/OscReceiverInterface.h" +#include "Common/OscDataElemStruct.h" #include "OscReceiverComponent.generated.h" diff --git a/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h b/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h index a2f318b..d64b8c2 100644 --- a/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h +++ b/OSC/Source/OSC/Public/Receive/OscReceiverInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "OscDataElemStruct.h" +#include "Common/OscDataElemStruct.h" /// Base class to receive OSC messages.