kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Materials: Pass by reference instead of pointers

Browse Source 
Refactoring topass by reference instead of using existing pointers.
This commit is contained in:
David Carter
2025-05-29 10:22:58 -04:00
committed by Chris Hennes
parent b7008de12a
commit 8b9f576538
28 changed files with 211 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/Material/App/Model.cpp
View File

@@ -202,10 +202,10 @@ ModelProperty& Model::operator[](const QString& key)
}
}
void Model::validate(const std::shared_ptr<Model>& other) const
void Model::validate(Model& other) const
{
try {
_library->validate(*(other->_library));
_library->validate(*(other._library));
}
catch (const InvalidLibrary& e)
{
@@ -213,42 +213,40 @@ void Model::validate(const std::shared_ptr<Model>& other) const
}
// std::map<QString, ModelProperty> _properties;
if (_type != other->_type) {
if (_type != other._type) {
throw InvalidModel("Model types don't match");
}
if (_name != other->_name) {
if (_name != other._name) {
throw InvalidModel("Model names don't match");
}
if (_directory != other->_directory) {
if (_directory != other._directory) {
throw InvalidModel("Model directories don't match");
}
if (!other->_filename.isEmpty()) {
if (!other._filename.isEmpty()) {
throw InvalidModel("Remote filename is not empty");
}
if (_uuid != other->_uuid) {
if (_uuid != other._uuid) {
throw InvalidModel("Model UUIDs don't match");
}
if (_description != other->_description) {
if (_description != other._description) {
throw InvalidModel("Model descriptions don't match");
}
if (_url != other->_url) {
if (_url != other._url) {
throw InvalidModel("Model URLs don't match");
}
if (_doi != other->_doi) {
if (_doi != other._doi) {
throw InvalidModel("Model DOIs don't match");
}
if (_inheritedUuids != other->_inheritedUuids) {
if (_inheritedUuids != other._inheritedUuids) {
throw InvalidModel("Model inherited UUIDs don't match");
}
// Need to compare properties
if (_properties.size() != other->_properties.size()) {
// Base::Console().log("Local property count %d\n", _properties.size());
// Base::Console().log("Remote property count %d\n", other->_properties.size());
if (_properties.size() != other._properties.size()) {
throw InvalidModel("Model property counts don't match");
}
for (auto& property : _properties) {
auto& remote = other->_properties[property.first];
auto& remote = other._properties[property.first];
property.second.validate(remote);
}
}