Apply clang-tidy fixes

Author: github-actions[bot]

form/core/placement.cpp

@@ -2,20 +2,21 @@
 
 #include "placement.hpp"
 #include <string>
+#include <utility>
 
 using namespace form::detail::experimental;
 
 /// Constructor with initialization
-Placement::Placement(std::string const& fileName,
-                     std::string const& containerName,
+Placement::Placement(std::string  fileName,
+                     std::string  containerName,
                      int technology) :
-  m_technology(technology), m_fileName(fileName), m_containerName(containerName)
+  m_technology(technology), m_fileName(std::move(fileName)), m_containerName(std::move(containerName))
 {
 }
 
 /// Access file name
-std::string const& Placement::fileName() const { return m_fileName; }
+auto Placement::fileName() const -> std::string const& { return m_fileName; }
 /// Access container name
-std::string const& Placement::containerName() const { return m_containerName; }
+auto Placement::containerName() const -> std::string const& { return m_containerName; }
 /// Access technology type
-int Placement::technology() const { return m_technology; }
+auto Placement::technology() const -> int { return m_technology; }

form/core/placement.hpp

@@ -16,7 +16,7 @@ namespace form::detail::experimental {
     Placement() = default;
 
     /// Constructor with initialization
-    Placement(std::string const& fileName, std::string const& containerName, int technology);
+    Placement(std::string  fileName, std::string  containerName, int technology);
 
     /// Access file name
     std::string const& fileName() const;

form/core/token.cpp

@@ -2,24 +2,25 @@
 
 #include "token.hpp"
 #include <string>
+#include <utility>
 
 using namespace form::detail::experimental;
 
 /// Constructor with initialization
-Token::Token(std::string const& fileName,
-             std::string const& containerName,
+Token::Token(std::string  fileName,
+             std::string  containerName,
              int technology,
              int id) :
-  m_technology(technology), m_fileName(fileName), m_containerName(containerName), m_id(id)
+  m_technology(technology), m_fileName(std::move(fileName)), m_containerName(std::move(containerName)), m_id(id)
 {
 }
 
 /// Access file name
-std::string const& Token::fileName() const { return m_fileName; }
+auto Token::fileName() const -> std::string const& { return m_fileName; }
 /// Access container name
-std::string const& Token::containerName() const { return m_containerName; }
+auto Token::containerName() const -> std::string const& { return m_containerName; }
 /// Access technology type
-int Token::technology() const { return m_technology; }
+auto Token::technology() const -> int { return m_technology; }
 /// Set technology type
 /// Access identifier/entry number
-int Token::id() const { return m_id; }
+auto Token::id() const -> int { return m_id; }

form/core/token.hpp

@@ -15,8 +15,8 @@ namespace form::detail::experimental {
     Token() = default;
 
     /// Constructor with initialization
-    Token(std::string const& fileName,
-          std::string const& containerName,
+    Token(std::string  fileName,
+          std::string  containerName,
           int technology,
           int id = -1);
 

form/form/config.cpp

@@ -22,7 +22,7 @@ namespace form::experimental::config {
     m_items.emplace_back(product_name, file_name, technology);
   }
 
-  std::optional<PersistenceItem> output_item_config::findItem(std::string const& product_name) const
+  auto output_item_config::findItem(std::string const& product_name) const -> std::optional<PersistenceItem>
   {
     for (auto const& item : m_items) {
       if (item.product_name == product_name) {
@@ -32,15 +32,15 @@ namespace form::experimental::config {
     return std::nullopt;
   }
 
-  tech_setting_config::table_t tech_setting_config::getFileTable(int const technology,
-                                                                 std::string const& fileName) const
+  auto tech_setting_config::getFileTable(int const technology,
+                                                                 std::string const& fileName) const -> tech_setting_config::table_t
   {
     auto const per_tech = ::const_lookup(file_settings, technology);
     return ::const_lookup(per_tech, fileName);
   }
 
-  tech_setting_config::table_t tech_setting_config::getContainerTable(
-    int const technology, std::string const& containerName) const
+  auto tech_setting_config::getContainerTable(
+    int const technology, std::string const& containerName) const -> tech_setting_config::table_t
   {
     auto const per_tech = ::const_lookup(container_settings, technology);
     return ::const_lookup(per_tech, containerName);

form/form/form.cpp

@@ -17,7 +17,7 @@ namespace form::experimental {
   // Accept and store config
   form_interface::form_interface(std::shared_ptr<mock_phlex::product_type_names> tm,
                                  mock_phlex::config::parse_config const& config) :
-    m_pers(nullptr), m_type_map(tm)
+    m_pers(nullptr), m_type_map(std::move(tm))
   {
     // Convert phlex config to form config
     form::experimental::config::output_item_config output_items;

form/mock_phlex/phlex_toy_config.cpp

@@ -10,7 +10,7 @@ namespace mock_phlex::config {
     m_items.emplace_back(product_name, file_name, technology);
   }
 
-  PersistenceItem const* parse_config::findItem(std::string const& product_name) const
+  auto parse_config::findItem(std::string const& product_name) const -> PersistenceItem const*
   {
     for (auto const& item : m_items) {
       if (item.product_name == product_name) {

form/mock_phlex/phlex_toy_core.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 
 namespace mock_phlex {
-  std::shared_ptr<product_type_names> createTypeMap()
+  auto createTypeMap() -> std::shared_ptr<product_type_names>
   {
     return std::make_shared<product_type_names>();
   }

form/persistence/persistence.cpp

@@ -19,7 +19,7 @@ using namespace form::detail::experimental;
 
 // Factory function implementation
 namespace form::detail::experimental {
-  std::unique_ptr<IPersistence> createPersistence() { return std::make_unique<Persistence>(); }
+  auto createPersistence() -> std::unique_ptr<IPersistence> { return std::make_unique<Persistence>(); }
 } // namespace form::detail::experimental
 
 Persistence::Persistence() :
@@ -80,8 +80,8 @@ void Persistence::read(std::string const& creator,
   return;
 }
 
-form::experimental::config::PersistenceItem const* Persistence::findConfigItem(
-  std::string const& label) const
+auto Persistence::findConfigItem(
+  std::string const& label) const -> form::experimental::config::PersistenceItem const*
 {
   auto const& items = m_output_items.getItems();
   if (label == "index")
@@ -90,13 +90,13 @@ form::experimental::config::PersistenceItem const* Persistence::findConfigItem(
              : &(*items
                     .begin()); //emulate how FORM did this before Phlex PR #22.  Will be fixed in a future FORM update.
 
-  auto it = std::find_if(
-    items.begin(), items.end(), [&label](auto const& item) { return item.product_name == label; });
+  auto it = std::ranges::find_if(
+    items, [&label](auto const& item) -> auto { return item.product_name == label; });
 
   return (it != items.end()) ? &(*it) : nullptr;
 }
 
-std::string Persistence::buildFullLabel(std::string_view creator, std::string_view label) const
+auto Persistence::buildFullLabel(std::string_view creator, std::string_view label) const -> std::string
 {
   std::string result;
   result.reserve(creator.size() + 1 + label.size());
@@ -106,8 +106,8 @@ std::string Persistence::buildFullLabel(std::string_view creator, std::string_vi
   return result;
 }
 
-std::unique_ptr<Placement> Persistence::getPlacement(std::string const& creator,
-                                                     std::string const& label)
+auto Persistence::getPlacement(std::string const& creator,
+                                                     std::string const& label) -> std::unique_ptr<Placement>
 {
   auto const* config_item = findConfigItem(label);
 
@@ -120,9 +120,9 @@ std::unique_ptr<Placement> Persistence::getPlacement(std::string const& creator,
   return std::make_unique<Placement>(config_item->file_name, full_label, config_item->technology);
 }
 
-std::unique_ptr<Token> Persistence::getToken(std::string const& creator,
+auto Persistence::getToken(std::string const& creator,
                                              std::string const& label,
-                                             std::string const& id)
+                                             std::string const& id) -> std::unique_ptr<Token>
 {
   auto const* config_item = findConfigItem(label);
 

form/root_storage/root_tbranch_container.cpp

@@ -52,7 +52,7 @@ void ROOT_TBranch_ContainerImp::setAttribute(std::string const& key, std::string
 void ROOT_TBranch_ContainerImp::setFile(std::shared_ptr<IStorage_File> file)
 {
   this->Storage_Associative_Container::setFile(file);
-  ROOT_TFileImp* root_tfile_imp = dynamic_cast<ROOT_TFileImp*>(file.get());
+  auto* root_tfile_imp = dynamic_cast<ROOT_TFileImp*>(file.get());
   if (root_tfile_imp == nullptr) {
     throw std::runtime_error("ROOT_TBranch_ContainerImp::setFile can't attach to non-ROOT file");
   }
@@ -63,7 +63,7 @@ void ROOT_TBranch_ContainerImp::setFile(std::shared_ptr<IStorage_File> file)
 void ROOT_TBranch_ContainerImp::setParent(std::shared_ptr<IStorage_Container> parent)
 {
   this->Storage_Associative_Container::setParent(parent);
-  ROOT_TTree_ContainerImp* root_ttree_imp = dynamic_cast<ROOT_TTree_ContainerImp*>(parent.get());
+  auto* root_ttree_imp = dynamic_cast<ROOT_TTree_ContainerImp*>(parent.get());
   if (root_ttree_imp == nullptr) {
     throw std::runtime_error("ROOT_TBranch_ContainerImp::setParent");
   }
@@ -125,7 +125,7 @@ void ROOT_TBranch_ContainerImp::commit()
   return;
 }
 
-bool ROOT_TBranch_ContainerImp::read(int id, void const** data, std::string& type)
+auto ROOT_TBranch_ContainerImp::read(int id, void const** data, std::string& type) -> bool
 {
   if (m_tfile == nullptr) {
     throw std::runtime_error("ROOT_TBranch_ContainerImp::read no file attached");