瀏覽代碼

Move Utilities.h header to public include directory

Michael Ragazzon 3 年之前
父節點
當前提交
5dd0cf1c84

+ 1 - 1
CMake/FileList.cmake

@@ -111,7 +111,6 @@ set(Core_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Source/Core/TextureResource.h
     ${PROJECT_SOURCE_DIR}/Source/Core/TransformState.h
     ${PROJECT_SOURCE_DIR}/Source/Core/TransformUtilities.h
-    ${PROJECT_SOURCE_DIR}/Source/Core/Utilities.h
     ${PROJECT_SOURCE_DIR}/Source/Core/WidgetScroll.h
     ${PROJECT_SOURCE_DIR}/Source/Core/XMLNodeHandlerBody.h
     ${PROJECT_SOURCE_DIR}/Source/Core/XMLNodeHandlerDefault.h
@@ -221,6 +220,7 @@ set(Core_PUB_HDR_FILES
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/TypeConverter.inl
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Types.h
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/URL.h
+    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Utilities.h
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Variant.h
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Variant.inl
     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Vector2.h

+ 2 - 0
Source/Core/Utilities.h → Include/RmlUi/Core/Utilities.h

@@ -29,6 +29,8 @@
 #ifndef RMLUI_CORE_UTILITIES_H
 #define RMLUI_CORE_UTILITIES_H
 
+#include "Types.h"
+
 namespace Rml {
 
 namespace Utilities {

+ 1 - 1
Source/Core/PropertyParserFontEffect.cpp

@@ -32,7 +32,7 @@
 #include "../../Include/RmlUi/Core/FontEffectInstancer.h"
 #include "../../Include/RmlUi/Core/PropertySpecification.h"
 #include "../../Include/RmlUi/Core/Profiling.h"
-#include "Utilities.h"
+#include "../../Include/RmlUi/Core/Utilities.h"
 #include <algorithm>
 
 namespace Rml {

+ 3 - 3
Source/Core/StyleSheet.cpp

@@ -27,14 +27,14 @@
  */
 
 #include "../../Include/RmlUi/Core/StyleSheet.h"
-#include "ElementDefinition.h"
-#include "StyleSheetNode.h"
-#include "Utilities.h"
 #include "../../Include/RmlUi/Core/DecoratorInstancer.h"
 #include "../../Include/RmlUi/Core/Element.h"
 #include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/PropertyDefinition.h"
 #include "../../Include/RmlUi/Core/StyleSheetSpecification.h"
+#include "../../Include/RmlUi/Core/Utilities.h"
+#include "ElementDefinition.h"
+#include "StyleSheetNode.h"
 #include <algorithm>
 
 namespace Rml {

+ 1 - 1
Source/Core/StyleSheetContainer.cpp

@@ -31,9 +31,9 @@
 #include "../../Include/RmlUi/Core/PropertyDictionary.h"
 #include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/StyleSheet.h"
+#include "../../Include/RmlUi/Core/Utilities.h"
 #include "ComputeProperty.h"
 #include "StyleSheetParser.h"
-#include "Utilities.h"
 
 namespace Rml {