diff --git a/src/Gvas/File.cpp b/src/Gvas/File.cpp index a4fb2b1..7493f5d 100644 --- a/src/Gvas/File.cpp +++ b/src/Gvas/File.cpp @@ -31,7 +31,7 @@ namespace Gvas { File::File(Containers::String filepath): _propSerialiser{PropertySerialiser::instance()} { - _filepath = std::move(filepath); + _filepath = Utility::move(filepath); loadData(); } @@ -65,9 +65,9 @@ File::saveType() { void File::appendProperty(Types::UnrealPropertyBase::ptr prop) { - auto none_prop = std::move(_properties.back()); - _properties.back() = std::move(prop); - arrayAppend(_properties, std::move(none_prop)); + auto none_prop = Utility::move(_properties.back()); + _properties.back() = Utility::move(prop); + arrayAppend(_properties, Utility::move(none_prop)); } Containers::ArrayView @@ -245,7 +245,7 @@ File::loadData() { Types::UnrealPropertyBase::ptr prop; while((prop = _propSerialiser->read(reader)) != nullptr) { - arrayAppend(_properties, std::move(prop)); + arrayAppend(_properties, Utility::move(prop)); } if(_properties.isEmpty()) { diff --git a/src/Gvas/PropertySerialiser.cpp b/src/Gvas/PropertySerialiser.cpp index 81c590f..c57faad 100644 --- a/src/Gvas/PropertySerialiser.cpp +++ b/src/Gvas/PropertySerialiser.cpp @@ -100,7 +100,7 @@ PropertySerialiser::read(BinaryIo::Reader& reader) { return nullptr; } - return deserialise(std::move(name), std::move(type), value_length, reader); + return deserialise(Utility::move(name), Utility::move(type), value_length, reader); } Types::UnrealPropertyBase::ptr @@ -111,7 +111,7 @@ PropertySerialiser::readItem(BinaryIo::Reader& reader, Containers::String type, return nullptr; } - return deserialise(std::move(name), std::move(type), value_length, reader); + return deserialise(Utility::move(name), Utility::move(type), value_length, reader); } Containers::Array @@ -151,7 +151,7 @@ PropertySerialiser::readSet(BinaryIo::Reader& reader, Containers::StringView ite else { for(std::uint32_t i = 0; i < count; i++) { auto item = readItem(reader, item_type, std::size_t(-1), ""); - arrayAppend(array, std::move(item)); + arrayAppend(array, Utility::move(item)); } } @@ -176,8 +176,8 @@ PropertySerialiser::deserialise(Containers::String name, Containers::String type return nullptr; } - prop->name = std::move(name); - prop->propertyType = std::move(type); + prop->name = Utility::move(name); + prop->propertyType = Utility::move(type); return prop; } diff --git a/src/Gvas/Serialisers/ArrayProperty.cpp b/src/Gvas/Serialisers/ArrayProperty.cpp index a6e2047..0b8a13f 100644 --- a/src/Gvas/Serialisers/ArrayProperty.cpp +++ b/src/Gvas/Serialisers/ArrayProperty.cpp @@ -48,7 +48,7 @@ ArrayProperty::deserialiseProperty(Containers::StringView name, Containers::Stri } auto prop = Containers::pointer(); - prop->itemType = std::move(item_type); + prop->itemType = Utility::move(item_type); prop->items = serialiser.readSet(reader, prop->itemType, item_count); return prop; diff --git a/src/Gvas/Serialisers/MapProperty.cpp b/src/Gvas/Serialisers/MapProperty.cpp index 4fbb216..2925276 100644 --- a/src/Gvas/Serialisers/MapProperty.cpp +++ b/src/Gvas/Serialisers/MapProperty.cpp @@ -83,7 +83,7 @@ MapProperty::deserialiseProperty(Containers::StringView name, Containers::String Types::UnrealPropertyBase::ptr value_item; if(prop->valueType == "StructProperty"_s) { while((value_item = serialiser.read(reader)) != nullptr) { - arrayAppend(pair.values, std::move(value_item)); + arrayAppend(pair.values, Utility::move(value_item)); if(pair.values.back()->name == "None"_s && pair.values.back()->propertyType == "NoneProperty"_s && @@ -98,10 +98,10 @@ MapProperty::deserialiseProperty(Containers::StringView name, Containers::String return nullptr; } - arrayAppend(pair.values, std::move(value_item)); + arrayAppend(pair.values, Utility::move(value_item)); } - arrayAppend(prop->map, std::move(pair)); + arrayAppend(prop->map, Utility::move(pair)); } // End dirty code diff --git a/src/Gvas/Serialisers/SetProperty.cpp b/src/Gvas/Serialisers/SetProperty.cpp index d6ffd4b..dd7220f 100644 --- a/src/Gvas/Serialisers/SetProperty.cpp +++ b/src/Gvas/Serialisers/SetProperty.cpp @@ -52,7 +52,7 @@ SetProperty::deserialiseProperty(Containers::StringView name, Containers::String } auto prop = Containers::pointer(); - prop->itemType = std::move(item_type); + prop->itemType = Utility::move(item_type); prop->items = serialiser.readSet(reader, prop->itemType, item_count); return prop; diff --git a/src/Gvas/Serialisers/Struct.cpp b/src/Gvas/Serialisers/Struct.cpp index e73ac8a..c16cccd 100644 --- a/src/Gvas/Serialisers/Struct.cpp +++ b/src/Gvas/Serialisers/Struct.cpp @@ -60,8 +60,8 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st if(count == 0) { auto prop = Containers::pointer(); - prop->structType = std::move(item_type); - prop->structGuid = std::move(guid); + prop->structType = Utility::move(item_type); + prop->structGuid = guid; } else { for(std::uint32_t i = 0; i < count; i++) { @@ -80,7 +80,7 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st dynamic_cast(prop.get())->structGuid = guid; - arrayAppend(array, std::move(prop)); + arrayAppend(array, Utility::move(prop)); } } @@ -118,7 +118,7 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st if(!prop) { prop = readStructValue(name, item_type, value_length, reader, serialiser); if(prop) { - dynamic_cast(prop.get())->structGuid = std::move(guid); + dynamic_cast(prop.get())->structGuid = guid; } } @@ -207,7 +207,7 @@ Struct::readStructValue(Containers::StringView name, Containers::StringView type Types::UnrealPropertyBase::ptr prop; while((prop = serialiser.read(reader)) != nullptr) { - arrayAppend(st_prop->properties, std::move(prop)); + arrayAppend(st_prop->properties, Utility::move(prop)); if(st_prop->properties.back()->name == "None" && st_prop->properties.back()->propertyType == "NoneProperty" && diff --git a/src/Gvas/Serialisers/TextProperty.cpp b/src/Gvas/Serialisers/TextProperty.cpp index 7525958..0d60c11 100644 --- a/src/Gvas/Serialisers/TextProperty.cpp +++ b/src/Gvas/Serialisers/TextProperty.cpp @@ -62,7 +62,7 @@ TextProperty::deserialiseProperty(Containers::StringView name, Containers::Strin return nullptr; } - arrayAppend(prop->data, std::move(str)); + arrayAppend(prop->data, Utility::move(str)); interval = reader.position() - start_position; } while(std::size_t(interval) < value_length); diff --git a/src/Gvas/Types/GenericStructProperty.h b/src/Gvas/Types/GenericStructProperty.h index deea124..67028e9 100644 --- a/src/Gvas/Types/GenericStructProperty.h +++ b/src/Gvas/Types/GenericStructProperty.h @@ -47,7 +47,7 @@ struct GenericStructProperty : public StructProperty { atMove(Containers::StringView name) { for(auto& item : properties) { if(item && item->name == name) { - return Containers::pointerCast(std::move(item)); + return Containers::pointerCast(Utility::move(item)); } } return nullptr; diff --git a/src/Mass/Mass_Armour.cpp b/src/Mass/Mass_Armour.cpp index 8f42da0..34b6f9b 100644 --- a/src/Mass/Mass_Armour.cpp +++ b/src/Mass/Mass_Armour.cpp @@ -358,7 +358,7 @@ Mass::writeBulletLauncherAttachments() { attach_style_prop->name.emplace(MASS_BL_ATTACHMENT_STYLE); attach_style_prop->enumType = "enuBLAttachmentStyle"_s; Gvas::Types::ByteProperty::ptr prop{attach_style_prop}; - arrayAppend(unit_data->properties, std::move(prop)); + arrayAppend(unit_data->properties, Utility::move(prop)); } auto& attach_style = attach_style_prop->enumValue; diff --git a/src/Mass/Mass_Frame.cpp b/src/Mass/Mass_Frame.cpp index f897ed9..e19f20f 100644 --- a/src/Mass/Mass_Frame.cpp +++ b/src/Mass/Mass_Frame.cpp @@ -99,7 +99,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_NECK); } length->value = _frame.joints.neck; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_BODY); @@ -109,7 +109,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_BODY); } length->value = _frame.joints.body; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_SHOULDER); @@ -119,7 +119,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_SHOULDER); } length->value = _frame.joints.shoulders; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_ARM_UPPER); @@ -129,7 +129,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_ARM_UPPER); } length->value = _frame.joints.upperArms; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_ARM_LOWER); @@ -139,7 +139,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_ARM_LOWER); } length->value = _frame.joints.lowerArms; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_HIP); @@ -149,7 +149,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_HIP); } length->value = _frame.joints.hips; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_LEG_UPPER); @@ -159,7 +159,7 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_LEG_UPPER); } length->value = _frame.joints.upperLegs; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } length = frame_prop->atMove(MASS_JOINT_LEG_LOWER); @@ -169,14 +169,14 @@ Mass::writeJointSliders() { length->name.emplace(MASS_JOINT_LEG_LOWER); } length->value = _frame.joints.lowerLegs; - arrayAppend(temp, std::move(length)); + arrayAppend(temp, Utility::move(length)); } - arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 3])); - arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 2])); - arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 1])); + arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 3])); + arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 2])); + arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 1])); - frame_prop->properties = std::move(temp); + frame_prop->properties = Utility::move(temp); if(!_mass->saveToFile()) { _lastError = _mass->lastError(); diff --git a/src/Profile/Profile.cpp b/src/Profile/Profile.cpp index d770ffd..cc342e1 100644 --- a/src/Profile/Profile.cpp +++ b/src/Profile/Profile.cpp @@ -285,7 +285,7 @@ Profile::setMaterial(GameData::MaterialID id, std::int32_t amount) { } res_prop->id = id; Gvas::Types::ResourceItemValue::ptr prop{res_prop}; - arrayAppend(mats_prop->items, std::move(prop)); + arrayAppend(mats_prop->items, Utility::move(prop)); } else { res_prop = dynamic_cast(it->get()); diff --git a/src/ProfileManager/ProfileManager.cpp b/src/ProfileManager/ProfileManager.cpp index 53b89c6..e48f7c0 100644 --- a/src/ProfileManager/ProfileManager.cpp +++ b/src/ProfileManager/ProfileManager.cpp @@ -87,7 +87,7 @@ ProfileManager::refreshProfiles() { continue; } - arrayAppend(_profiles, std::move(profile)); + arrayAppend(_profiles, Utility::move(profile)); } if(_profiles.isEmpty()) { @@ -298,7 +298,7 @@ ProfileManager::refreshBackups() { arrayAppend(backup.includedFiles, InPlaceInit, zip_get_name(zip, i, ZIP_FL_UNCHANGED)); } - arrayAppend(_backups, std::move(backup)); + arrayAppend(_backups, Utility::move(backup)); } } diff --git a/src/ToastQueue/ToastQueue.cpp b/src/ToastQueue/ToastQueue.cpp index 06d610a..bafc92b 100644 --- a/src/ToastQueue/ToastQueue.cpp +++ b/src/ToastQueue/ToastQueue.cpp @@ -99,7 +99,7 @@ Toast::opacity() { void ToastQueue::addToast(Toast&& toast) { - _toasts.push_back(std::move(toast)); + _toasts.push_back(Utility::move(toast)); } void