From 15c7aabe272d87f8f10853a6d2d8cea2f935fd6e Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 16 Aug 2023 21:47:05 -0500 Subject: [PATCH] App: clang-tidy cleanup of Expression::_renameObjectIdentifier --- src/App/Expression.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index 339c6821bf..ba136afe46 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -3027,24 +3027,27 @@ bool VariableExpression::_updateElementReference( } bool VariableExpression::_renameObjectIdentifier( - const std::map &paths, - const ObjectIdentifier &path, ExpressionVisitor &v) + const std::map& paths, + const ObjectIdentifier& path, + ExpressionVisitor& visitor) { - const auto &oldPath = var.canonicalPath(); + const auto& oldPath = var.canonicalPath(); auto it = paths.find(oldPath); if (it != paths.end()) { - v.aboutToChange(); + visitor.aboutToChange(); const bool originalHasDocumentObjectName = var.hasDocumentObjectName(); ObjectIdentifier::String originalDocumentObjectName = var.getDocumentObjectName(); std::string originalSubObjectName = var.getSubObjectName(); - if(path.getOwner()) + if (path.getOwner()) { var = it->second.relativeTo(path); - else + } + else { var = it->second; + } if (originalHasDocumentObjectName) { var.setDocumentObjectName(std::move(originalDocumentObjectName), true, - std::move(originalSubObjectName)); + originalSubObjectName); } return true; }