diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.cpp index 870e05ac..7ba70e75 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.cpp @@ -4,7 +4,7 @@ #include "ObjLoading.h" #include "Game/IW4/IW4.h" -#include "Parsing/StructuredDataDef/StructuredDataDefReader.h" +#include "StructuredDataDef/StructuredDataDefReader.h" #include "Pool/GlobalAssetPool.h" using namespace IW4; diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataDefScopeSequences.cpp b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataDefScopeSequences.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataDefScopeSequences.h b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.h similarity index 87% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataDefScopeSequences.h rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.h index 413d9889..7ca94427 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataDefScopeSequences.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataDefScopeSequences.h @@ -1,7 +1,7 @@ #pragma once #include "Parsing/Sequence/AbstractScopeSequenceHolder.h" -#include "Parsing/StructuredDataDef/StructuredDataDefParser.h" +#include "StructuredDataDef/Parsing/StructuredDataDefParser.h" namespace sdd { diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataEnumScopeSequences.cpp b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataEnumScopeSequences.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataEnumScopeSequences.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataEnumScopeSequences.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataEnumScopeSequences.h b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataEnumScopeSequences.h similarity index 87% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataEnumScopeSequences.h rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataEnumScopeSequences.h index c5a34e2b..3cacf855 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataEnumScopeSequences.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataEnumScopeSequences.h @@ -1,7 +1,7 @@ #pragma once #include "Parsing/Sequence/AbstractScopeSequenceHolder.h" -#include "Parsing/StructuredDataDef/StructuredDataDefParser.h" +#include "StructuredDataDef/Parsing/StructuredDataDefParser.h" namespace sdd { diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataNoScopeSequences.cpp b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataNoScopeSequences.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataNoScopeSequences.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataNoScopeSequences.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataNoScopeSequences.h b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataNoScopeSequences.h similarity index 87% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataNoScopeSequences.h rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataNoScopeSequences.h index 8d57ed32..52cd0a77 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataNoScopeSequences.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataNoScopeSequences.h @@ -1,7 +1,7 @@ #pragma once #include "Parsing/Sequence/AbstractScopeSequenceHolder.h" -#include "Parsing/StructuredDataDef/StructuredDataDefParser.h" +#include "StructuredDataDef/Parsing/StructuredDataDefParser.h" namespace sdd { diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.h b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.h similarity index 87% rename from src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.h rename to src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.h index 0cd7d3a3..c67df87c 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/Sequence/StructuredDataStructScopeSequences.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/Sequence/StructuredDataStructScopeSequences.h @@ -1,7 +1,7 @@ #pragma once #include "Parsing/Sequence/AbstractScopeSequenceHolder.h" -#include "Parsing/StructuredDataDef/StructuredDataDefParser.h" +#include "StructuredDataDef/Parsing/StructuredDataDefParser.h" namespace sdd { diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.cpp b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h rename to src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.cpp b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParserState.cpp similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.cpp rename to src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParserState.cpp diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParserState.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h rename to src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParserState.h diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.cpp b/src/ObjLoading/StructuredDataDef/StructuredDataDefReader.cpp similarity index 97% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.cpp rename to src/ObjLoading/StructuredDataDef/StructuredDataDefReader.cpp index 43096e83..2eade578 100644 --- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.cpp +++ b/src/ObjLoading/StructuredDataDef/StructuredDataDefReader.cpp @@ -1,6 +1,6 @@ #include "StructuredDataDefReader.h" -#include "StructuredDataDefParser.h" +#include "StructuredDataDef/Parsing/StructuredDataDefParser.h" #include "Parsing/Impl/CommentRemovingStreamProxy.h" #include "Parsing/Impl/DefinesStreamProxy.h" #include "Parsing/Impl/IncludingStreamProxy.h" diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h b/src/ObjLoading/StructuredDataDef/StructuredDataDefReader.h similarity index 100% rename from src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h rename to src/ObjLoading/StructuredDataDef/StructuredDataDefReader.h