fix: compilation with CommonTechset

src/ObjCommon/Game/IW4/Techset/TechsetConstantsIW4.h

@@ -2,8 +2,8 @@
 
 #include "Game/IW4/CommonIW4.h"
 #include "Game/IW4/IW4.h"
-#include "StateMap/StateMapLayout.h"
 #include "Techset/CommonTechset.h"
+#include "Techset/StateMap/StateMapLayout.h"
 
 #include <type_traits>
 #include <unordered_map>

src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp

@@ -9,9 +9,9 @@
 #include "Gdt/AbstractGdtEntryReader.h"
 #include "Gdt/IGdtQueryable.h"
 #include "Pool/GlobalAssetPool.h"
-#include "StateMap/StateMapFromTechniqueExtractor.h"
-#include "StateMap/StateMapHandler.h"
 #include "Techset/CommonTechsetCache.h"
+#include "Techset/StateMap/StateMapFromTechniqueExtractor.h"
+#include "Techset/StateMap/StateMapHandler.h"
 #include "Techset/TechniqueFileReader.h"
 #include "Techset/TechniqueStateMapCache.h"
 #include "Techset/TechsetCommon.h"

src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp

@@ -6,9 +6,9 @@
 #include "Game/IW4/Techset/TechsetConstantsIW4.h"
 #include "Shader/D3D9ShaderAnalyser.h"
 #include "Shader/ShaderCommon.h"
-#include "StateMap/StateMapReader.h"
 #include "Techset/CommonTechsetCache.h"
 #include "Techset/CommonTechsetLoader.h"
+#include "Techset/StateMap/StateMapReader.h"
 #include "Techset/TechniqueFileReader.h"
 #include "Techset/TechniqueStateMapCache.h"
 #include "Techset/TechsetCommon.h"

src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h

@@ -3,8 +3,8 @@
 #include "Asset/IAssetCreator.h"
 #include "Game/IW4/IW4.h"
 #include "SearchPath/ISearchPath.h"
-#include "StateMap/StateMapDefinition.h"
 #include "Techset/CommonTechset.h"
+#include "Techset/StateMap/StateMapDefinition.h"
 #include "Utils/MemoryManager.h"
 
 #include <memory>

src/ObjCompiling/Techset/StateMap/Parsing/Matcher/StateMapExpressionMatchers.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Parsing/Simple/Expression/SimpleExpressionMatchers.h"
-#include "StateMap/Parsing/StateMapParserState.h"
+#include "Techset/StateMap/Parsing/StateMapParserState.h"
 
 #include <memory>
 

src/ObjCompiling/Techset/StateMap/Parsing/StateMapParser.h

@@ -4,8 +4,6 @@
 #include "Parsing/Simple/SimpleLexer.h"
 #include "Parsing/Simple/SimpleParserValue.h"
 #include "StateMapParserState.h"
-#include "Techset/TechsetDefinition.h"
-#include "Utils/ClassUtils.h"
 
 namespace state_map
 {
@@ -16,7 +14,7 @@ namespace state_map
 
     public:
         StateMapParser(SimpleLexer* lexer, std::string stateMapName, const StateMapLayout& layout);
-        _NODISCARD std::unique_ptr<StateMapDefinition> GetStateMapDefinition() const;
+        [[nodiscard]] std::unique_ptr<StateMapDefinition> GetStateMapDefinition() const;
-        _NODISCARD StateMapParserState* GetState() const;
+        [[nodiscard]] StateMapParserState* GetState() const;
     };
 } // namespace state_map

src/ObjCompiling/Techset/StateMap/Parsing/StateMapParserState.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "StateMap/StateMapDefinition.h"
+#include "Techset/StateMap/StateMapDefinition.h"
-#include "StateMap/StateMapLayout.h"
+#include "Techset/StateMap/StateMapLayout.h"
 
 #include <memory>
 #include <set>

src/ObjCompiling/Techset/StateMap/StateMapHandler.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "StateMap/StateMapDefinition.h"
+#include "Techset/StateMap/StateMapDefinition.h"
-#include "StateMap/StateMapLayout.h"
+#include "Techset/StateMap/StateMapLayout.h"
-#include "Utils/ClassUtils.h"
 
 #include <cstdint>
 #include <unordered_map>
@@ -13,7 +12,7 @@ namespace state_map
     {
     public:
         void AddValue(std::string key, std::string value);
-        _NODISCARD SimpleExpressionValue ValueByName(const std::string& name) const override;
+        [[nodiscard]] SimpleExpressionValue ValueByName(const std::string& name) const override;
 
     private:
         std::unordered_map<std::string, std::string> m_vars;

src/ObjCompiling/Techset/StateMap/StateMapReader.h

@@ -2,8 +2,8 @@
 
 #include "Parsing/IParserLineStream.h"
 #include "Parsing/StateMapParserState.h"
-#include "StateMap/StateMapLayout.h"
 #include "StateMapDefinition.h"
+#include "Techset/StateMap/StateMapLayout.h"
 #include "Utils/ClassUtils.h"
 
 #include <memory>

src/ObjCompiling/Techset/TechniqueFileReader.cpp

@@ -3,7 +3,7 @@
 #include "Parsing/Impl/CommentRemovingStreamProxy.h"
 #include "Parsing/Impl/ParserSingleInputStream.h"
 #include "Parsing/Simple/SimpleLexer.h"
-#include "Parsing/TechniqueFileParser.h"
+#include "Techset/Parsing/TechniqueFileParser.h"
 #include "Utils/Logging/Log.h"
 
 #include <iostream>

src/ObjCompiling/Techset/TechniqueFileReader.h

@@ -2,7 +2,6 @@
 
 #include "Parsing/IParserLineStream.h"
 #include "TechniqueDefinitionAcceptor.h"
-#include "Utils/ClassUtils.h"
 
 #include <memory>
 #include <string>