From c38367d55b06a56ff373f7128cd6cf705bf51b91 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 12 Mar 2022 14:02:52 +0100 Subject: [PATCH] Move common structureddatadef classes to objcommon --- .../StructuredDataDef}/CommonStructuredDataDef.cpp | 0 .../StructuredDataDef}/CommonStructuredDataDef.h | 0 .../StructuredDataDef}/CommonStructuredDataEnum.cpp | 0 .../StructuredDataDef}/CommonStructuredDataEnum.h | 0 .../StructuredDataDef}/CommonStructuredDataStruct.cpp | 0 .../StructuredDataDef}/CommonStructuredDataStruct.h | 0 .../StructuredDataDef}/CommonStructuredDataTypes.cpp | 0 .../StructuredDataDef}/CommonStructuredDataTypes.h | 0 .../Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h | 2 +- .../Parsing/StructuredDataDef/StructuredDataDefParser.h | 2 +- .../Parsing/StructuredDataDef/StructuredDataDefParserState.h | 2 +- .../Parsing/StructuredDataDef/StructuredDataDefReader.h | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataDef.cpp (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataDef.h (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataEnum.cpp (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataEnum.h (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataStruct.cpp (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataStruct.h (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataTypes.cpp (100%) rename src/{ObjLoading/Parsing/StructuredDataDef/Domain => ObjCommon/StructuredDataDef}/CommonStructuredDataTypes.h (100%) diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.cpp rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.cpp rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.h rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.cpp rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.h rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.cpp rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.h rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h index a6e22084..70dce1ca 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h @@ -2,7 +2,7 @@ #include "Game/IW4/IW4.h" #include "AssetLoading/BasicAssetLoader.h" -#include "Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h" +#include "StructuredDataDef/CommonStructuredDataDef.h" #include "SearchPath/ISearchPath.h" namespace IW4 diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h index 5a559321..cf45b1a4 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h +++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h @@ -2,7 +2,7 @@ #include "Utils/ClassUtils.h" #include "StructuredDataDefParserState.h" -#include "Domain/CommonStructuredDataDef.h" +#include "StructuredDataDef/CommonStructuredDataDef.h" #include "Parsing/Simple/SimpleLexer.h" #include "Parsing/Simple/SimpleParserValue.h" #include "Parsing/Impl/AbstractParser.h" diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h index 01b42a7d..2d60aa5d 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h +++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h @@ -5,7 +5,7 @@ #include #include -#include "Domain/CommonStructuredDataDef.h" +#include "StructuredDataDef/CommonStructuredDataDef.h" namespace sdd { diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h index bc4c2d1e..34e1162f 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h +++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h @@ -4,7 +4,7 @@ #include #include -#include "Domain/CommonStructuredDataDef.h" +#include "StructuredDataDef/CommonStructuredDataDef.h" #include "Parsing/IParserLineStream.h" class StructuredDataDefReader