rename PropertyTag > FPropertyTag

Author: moritz-h

libsave/include/SatisfactorySave/GameTypes/Arrays/StructArray.h

@@ -42,6 +42,6 @@ namespace SatisfactorySave {
 
     protected:
         FPropertyTypeName type_param_;
-        PropertyTag inner_tag_;
+        FPropertyTag inner_tag_;
     };
 } // namespace SatisfactorySave

libsave/include/SatisfactorySave/GameTypes/Properties/Base/Property.h

@@ -17,7 +17,7 @@ namespace SatisfactorySave {
 
         explicit Property(FName type);
         Property(FName type, FName name);
-        explicit Property(PropertyTag tag);
+        explicit Property(FPropertyTag tag);
         virtual ~Property() = default;
         Property(const Property&) = default;
         Property& operator=(const Property&) = default;
@@ -51,7 +51,7 @@ namespace SatisfactorySave {
         }
 
     protected:
-        PropertyTag tag_;
+        FPropertyTag tag_;
 
         friend class PropertyList;
     };

libsave/include/SatisfactorySave/GameTypes/Properties/Base/PropertyImpl.h

@@ -16,7 +16,7 @@ namespace SatisfactorySave {
         PropertyImplBase(FName name, T value)
             : Property(FName(std::string(Impl::TypeName)), std::move(name)),
               Value(std::move(value)) {}
-        explicit PropertyImplBase(PropertyTag tag) : Property(std::move(tag)) {}
+        explicit PropertyImplBase(FPropertyTag tag) : Property(std::move(tag)) {}
 
         PropertyImplBase(const PropertyImplBase&) = default;
         PropertyImplBase& operator=(const PropertyImplBase&) = default;

libsave/include/SatisfactorySave/GameTypes/Properties/BoolProperty.h

@@ -15,7 +15,7 @@ namespace SatisfactorySave {
         BoolProperty(FName name, bool value) : Property(FName(std::string(TypeName)), std::move(name)) {
             setValue(value);
         }
-        explicit BoolProperty(PropertyTag tag) : Property(std::move(tag)) {}
+        explicit BoolProperty(FPropertyTag tag) : Property(std::move(tag)) {}
 
         [[nodiscard]] std::shared_ptr<Property> clone() const override;
 

libsave/include/SatisfactorySave/GameTypes/Properties/MapProperty.h

@@ -14,7 +14,7 @@ namespace SatisfactorySave {
         MapProperty() : Property(FName(std::string(TypeName))) {}
         explicit MapProperty(FName name) : Property(FName(std::string(TypeName)), std::move(name)) {}
         MapProperty(FName name, std::shared_ptr<MapTypeList> keys, std::shared_ptr<MapTypeList> values);
-        explicit MapProperty(PropertyTag tag) : Property(std::move(tag)) {}
+        explicit MapProperty(FPropertyTag tag) : Property(std::move(tag)) {}
         MapProperty(const MapProperty& other);
         MapProperty& operator=(const MapProperty& other);
         MapProperty(MapProperty&&) = default;

libsave/include/SatisfactorySave/GameTypes/UE/CoreUObject/UObject/PropertyTag.h

@@ -17,7 +17,7 @@ namespace SatisfactorySave {
         BinaryOrNative,
     };
 
-    struct SATISFACTORYSAVE_API PropertyTag {
+    struct SATISFACTORYSAVE_API FPropertyTag {
         FPropertyTypeName_Data TypeName;
         FName Name;
         FName Type;
@@ -34,7 +34,7 @@ namespace SatisfactorySave {
         EPropertyTagSerializeType SerializeType = EPropertyTagSerializeType::Unknown;
         std::size_t SizeOffset = static_cast<std::size_t>(-1);
 
-        PropertyTag() = default;
+        FPropertyTag() = default;
 
         void serialize(Archive& ar);
 

libsave/src/GameTypes/Properties/Base/Property.cpp

@@ -7,7 +7,7 @@
 #include "GameTypes/Properties/Base/PropertyAll.h"
 
 std::shared_ptr<SatisfactorySave::Property> SatisfactorySave::Property::create(IStreamArchive& ar) {
-    PropertyTag tag;
+    FPropertyTag tag;
     ar << tag;
 
     if (tag.Name == "None") {
@@ -70,7 +70,7 @@ std::shared_ptr<SatisfactorySave::Property> SatisfactorySave::Property::create(I
         recursion_depth--;
     } catch (const std::exception& ex) {
         recursion_depth--;
-        PropertyTag tagCopy = property->tag_;
+        FPropertyTag tagCopy = property->tag_;
         spdlog::error("Error parsing property {} (Type: {}, Class: {}) in recursion depth {}: {}",
             tagCopy.Name.toString(), tagCopy.Type.toString(), ar.getParentClassInfo(), recursion_depth, ex.what());
 
@@ -104,4 +104,4 @@ SatisfactorySave::Property::Property(FName type, FName name) {
     tag_.Name = std::move(name);
 }
 
-SatisfactorySave::Property::Property(PropertyTag tag) : tag_(std::move(tag)) {}
+SatisfactorySave::Property::Property(FPropertyTag tag) : tag_(std::move(tag)) {}

libsave/src/GameTypes/UE/CoreUObject/UObject/PropertyTag.cpp

@@ -10,7 +10,7 @@ enum class EPropertyTagFlags : uint8_t {
     SkippedSerialize = 0x20,
 };
 
-void SatisfactorySave::PropertyTag::serialize(Archive& ar) {
+void SatisfactorySave::FPropertyTag::serialize(Archive& ar) {
     ar << Name;
     if (Name == "None") {
         return;
@@ -70,7 +70,7 @@ void SatisfactorySave::PropertyTag::serialize(Archive& ar) {
         }
 
         if (PropertyTagFlags & 0x04) {
-            throw std::runtime_error("PropertyTag: PropertyExtensions not implemented!");
+            throw std::runtime_error("FPropertyTag: PropertyExtensions not implemented!");
         }
     } else {
         ar << Type;
@@ -103,15 +103,15 @@ void SatisfactorySave::PropertyTag::serialize(Archive& ar) {
     }
 }
 
-void SatisfactorySave::PropertyTag::SetType() {
+void SatisfactorySave::FPropertyTag::SetType() {
     Type = TypeName.GetName();
 
     if (Type.Number == /*NAME_NO_NUMBER_INTERNAL*/ 0) {
         if (Type.Name == "StructProperty") {
             StructName = TypeName.GetParameterName(0);
             FName StructGuidName = TypeName.GetParameterName(1);
             if (StructGuidName != "None") {
-                throw std::runtime_error("PropertyTag: Parsing StructGuidName not implemented!");
+                throw std::runtime_error("FPropertyTag: Parsing StructGuidName not implemented!");
             }
         } else if (Type.Name == "ByteProperty" || Type.Name == "EnumProperty") {
             EnumName = TypeName.GetParameterName(0);