diff --git a/alib2common/src/abstraction/AlgorithmRegistry.hpp b/alib2common/src/abstraction/AlgorithmRegistry.hpp index 9b0d5eb8009a7c2588910486b22cac4775695fdd..9323d7c5c9ca13af5885e82666a2e5067228e493 100644 --- a/alib2common/src/abstraction/AlgorithmRegistry.hpp +++ b/alib2common/src/abstraction/AlgorithmRegistry.hpp @@ -77,7 +77,7 @@ public: throw ::exception::CommonException ( "Callback for " + algorithm + " already registered." ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes, bool & downcast, bool & normalize ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes, bool & downcast, bool & normalize ) { auto group = getEntries ( ).find ( name ); if ( group == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + name + " not available" ); @@ -96,10 +96,10 @@ public: return overload->second->getAbstraction ( ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes ) { bool downcast; bool normalize; - return getAbstraction ( std::move ( name ), paramTypes, downcast, normalize ); + return getAbstraction ( name, paramTypes, downcast, normalize ); } static void listGroup ( const std::string & group ) { diff --git a/alib2common/src/abstraction/CastRegistry.hpp b/alib2common/src/abstraction/CastRegistry.hpp index 2f62000d96c4effb2cbdac539298847d5791dd10..3f9ccec3eef0bb279634d58b59aa813fa790dbeb 100644 --- a/alib2common/src/abstraction/CastRegistry.hpp +++ b/alib2common/src/abstraction/CastRegistry.hpp @@ -87,7 +87,7 @@ public: registerCastAlgorithm < TargetType, ParamType > ( target, param, callback, normalize ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string target, std::string param, bool & normalize ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & target, const std::string & param, bool & normalize ) { std::set < std::string > targetTypes; if ( alib::namingApi::hasTypes ( target ) ) targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( target ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } ); @@ -105,9 +105,9 @@ public: throw exception::CommonException ( "Entry from " + param + " to " + target + " not available." ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string target, std::string param ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & target, const std::string & param ) { bool normalize; - return getAbstraction ( std::move ( target ), std::move ( param ), normalize ); + return getAbstraction ( target, param, normalize ); } }; diff --git a/alib2common/src/abstraction/DowncastRegistry.hpp b/alib2common/src/abstraction/DowncastRegistry.hpp index 838370f71935ea04cbe4f06a016abc0981db18bb..7b7aaf3e7b0d086016c801b14f88c0edaaa3acf4 100644 --- a/alib2common/src/abstraction/DowncastRegistry.hpp +++ b/alib2common/src/abstraction/DowncastRegistry.hpp @@ -46,7 +46,7 @@ public: throw ::exception::CommonException ( "Downcasting for " + base + " to " + concrete + " already registered." ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string concrete, std::string base ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & concrete, const std::string & base ) { auto res = getEntries ( ).find ( std::make_pair ( concrete, base ) ); if ( res == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + concrete + ", " + base + " not available." ); diff --git a/alib2common/src/abstraction/ImmediateRegistry.hpp b/alib2common/src/abstraction/ImmediateRegistry.hpp index 79c3313bb44ab1440d01e6eba1a5e08aa4210820..d7884d14db5de6041462f7a1af65b97fc98299b9 100644 --- a/alib2common/src/abstraction/ImmediateRegistry.hpp +++ b/alib2common/src/abstraction/ImmediateRegistry.hpp @@ -52,12 +52,12 @@ public: registerImmediate < ResultType > ( std::move ( result ) ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string result, std::string value ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & result, std::string value ) { auto res = getEntries ( ).find ( result ); if ( res == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + result + " not available." ); - return res->second->getAbstraction ( value ); + return res->second->getAbstraction ( std::move ( value ) ); } }; diff --git a/alib2common/src/abstraction/NormalizeRegistry.hpp b/alib2common/src/abstraction/NormalizeRegistry.hpp index c5e1ae84a1e6ad55189cce2247b41616859027b7..a777bc7190c69fa36f711dead00e8a9dd6a0929e 100644 --- a/alib2common/src/abstraction/NormalizeRegistry.hpp +++ b/alib2common/src/abstraction/NormalizeRegistry.hpp @@ -49,7 +49,7 @@ public: registerNormalize < ParamType > ( std::move ( param ) ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string param ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & param ) { auto res = getEntries ( ).find ( param ); if ( res == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + param + " not available." ); diff --git a/alib2common/src/abstraction/Registry.cpp b/alib2common/src/abstraction/Registry.cpp index 86410f8b09465aff4ae2796c4abc08a29f7e80f5..93fd9259bfc30a81bae544e4bd2d45111795499c 100644 --- a/alib2common/src/abstraction/Registry.cpp +++ b/alib2common/src/abstraction/Registry.cpp @@ -30,40 +30,40 @@ void Registry::listAlgorithms ( ) { AlgorithmRegistry::list ( ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getAlgorithmAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes ) { - return AlgorithmRegistry::getAbstraction ( std::move ( name ), paramTypes ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getAlgorithmAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes ) { + return AlgorithmRegistry::getAbstraction ( name, paramTypes ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getAlgorithmAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes, bool & unwrap, bool & normalize ) { - return AlgorithmRegistry::getAbstraction ( std::move ( name ), paramTypes, unwrap, normalize ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getAlgorithmAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes, bool & unwrap, bool & normalize ) { + return AlgorithmRegistry::getAbstraction ( name, paramTypes, unwrap, normalize ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getCastAbstraction ( std::string target, std::string param, bool & normalize ) { - return CastRegistry::getAbstraction ( std::move ( target ), std::move ( param ), normalize ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getCastAbstraction ( const std::string & target, const std::string & param, bool & normalize ) { + return CastRegistry::getAbstraction ( target, param, normalize ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getImmediateAbstraction ( std::string result, std::string value ) { - return ImmediateRegistry::getAbstraction ( std::move ( result ), std::move ( value ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getImmediateAbstraction ( const std::string & result, std::string value ) { + return ImmediateRegistry::getAbstraction ( result, std::move ( value ) ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getNormalizeAbstraction ( std::string param ) { - return NormalizeRegistry::getAbstraction ( std::move ( param ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getNormalizeAbstraction ( const std::string & param ) { + return NormalizeRegistry::getAbstraction ( param ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getDowncastAbstraction ( std::string concrete, std::string base ) { - return DowncastRegistry::getAbstraction ( std::move ( concrete ), std::move ( base ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getDowncastAbstraction ( const std::string & concrete, const std::string & base ) { + return DowncastRegistry::getAbstraction ( concrete, base ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getValuePrinterAbstraction ( std::string param ) { - return ValuePrinterRegistry::getAbstraction ( std::move ( param ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getValuePrinterAbstraction ( const std::string & param ) { + return ValuePrinterRegistry::getAbstraction ( param ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getXmlFileWriterAbstraction ( std::string param, std::string filename ) { - return XmlFileWriterRegistry::getAbstraction ( std::move ( param ), std::move ( filename ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getXmlFileWriterAbstraction ( const std::string & param, std::string filename ) { + return XmlFileWriterRegistry::getAbstraction ( param, std::move ( filename ) ); } -std::shared_ptr < abstraction::OperationAbstraction > Registry::getXmlParserAbstraction ( std::string typeName, ext::deque < sax::Token > tokens ) { - return XmlParserRegistry::getAbstraction ( std::move ( typeName ), std::move ( tokens ) ); +std::shared_ptr < abstraction::OperationAbstraction > Registry::getXmlParserAbstraction ( const std::string & typeName, ext::deque < sax::Token > tokens ) { + return XmlParserRegistry::getAbstraction ( typeName, std::move ( tokens ) ); } } /* namespace abstraction */ diff --git a/alib2common/src/abstraction/Registry.h b/alib2common/src/abstraction/Registry.h index 8a7d67cd61031f8f644ae5859beacc0eaf3ee0e6..955a42c71e86feaba502cd4676ba912eb79d6ce8 100644 --- a/alib2common/src/abstraction/Registry.h +++ b/alib2common/src/abstraction/Registry.h @@ -18,15 +18,15 @@ public: static void listAlgorithmOverloads ( const std::string & algorithm ); static void listAlgorithms ( ); - static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes ); - static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( std::string name, const ext::vector < ext::type_index > & paramTypes, bool & unwrap, bool & normalize ); - static std::shared_ptr < abstraction::OperationAbstraction > getCastAbstraction ( std::string target, std::string param, bool & normalize ); - static std::shared_ptr < abstraction::OperationAbstraction > getImmediateAbstraction ( std::string result, std::string value ); - static std::shared_ptr < abstraction::OperationAbstraction > getNormalizeAbstraction ( std::string param ); - static std::shared_ptr < abstraction::OperationAbstraction > getDowncastAbstraction ( std::string concrete, std::string base ); - static std::shared_ptr < abstraction::OperationAbstraction > getValuePrinterAbstraction ( std::string param ); - static std::shared_ptr < abstraction::OperationAbstraction > getXmlFileWriterAbstraction ( std::string param, std::string filename ); - static std::shared_ptr < abstraction::OperationAbstraction > getXmlParserAbstraction ( std::string typeName, ext::deque < sax::Token > tokens ); + static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes ); + static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( const std::string & name, const ext::vector < ext::type_index > & paramTypes, bool & unwrap, bool & normalize ); + static std::shared_ptr < abstraction::OperationAbstraction > getCastAbstraction ( const std::string & target, const std::string & param, bool & normalize ); + static std::shared_ptr < abstraction::OperationAbstraction > getImmediateAbstraction ( const std::string & result, std::string value ); + static std::shared_ptr < abstraction::OperationAbstraction > getNormalizeAbstraction ( const std::string & param ); + static std::shared_ptr < abstraction::OperationAbstraction > getDowncastAbstraction ( const std::string & concrete, const std::string & base ); + static std::shared_ptr < abstraction::OperationAbstraction > getValuePrinterAbstraction ( const std::string & param ); + static std::shared_ptr < abstraction::OperationAbstraction > getXmlFileWriterAbstraction ( const std::string & param, std::string filename ); + static std::shared_ptr < abstraction::OperationAbstraction > getXmlParserAbstraction ( const std::string & typeName, ext::deque < sax::Token > tokens ); }; } /* namespace abstraction */ diff --git a/alib2common/src/abstraction/ValuePrinterRegistry.hpp b/alib2common/src/abstraction/ValuePrinterRegistry.hpp index 3a3b5d79be9d5f025d918c7bf39a77f1bb721f0b..92619c468e4a498f0462854dafdf1f310ee7e752 100644 --- a/alib2common/src/abstraction/ValuePrinterRegistry.hpp +++ b/alib2common/src/abstraction/ValuePrinterRegistry.hpp @@ -49,7 +49,7 @@ public: registerValuePrinter < ParamType > ( std::move ( param ) ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string param ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & param ) { auto res = getEntries ( ).find ( param ); if ( res == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + param + " not available." ); diff --git a/alib2common/src/abstraction/XmlFileWriterRegistry.hpp b/alib2common/src/abstraction/XmlFileWriterRegistry.hpp index 238ffb911c70101fba22a9f6bf2e405bb091d5bf..f603838df5f6dc8c1a59060392aa38c817e3470c 100644 --- a/alib2common/src/abstraction/XmlFileWriterRegistry.hpp +++ b/alib2common/src/abstraction/XmlFileWriterRegistry.hpp @@ -49,7 +49,7 @@ public: registerXmlFileWriter < ParamType > ( std::move ( param ) ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string param, std::string filename ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & param, std::string filename ) { auto res = getEntries ( ).find ( param ); if ( res == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + param + " not available." ); diff --git a/alib2common/src/abstraction/XmlParserRegistry.hpp b/alib2common/src/abstraction/XmlParserRegistry.hpp index 717be9f491bbe0ecdaba2ef45ead964096d00f1c..40664eff9f1ce13ebaa69c122dd0e346bd450843 100644 --- a/alib2common/src/abstraction/XmlParserRegistry.hpp +++ b/alib2common/src/abstraction/XmlParserRegistry.hpp @@ -45,7 +45,7 @@ public: getEntries ( ).insert ( std::make_pair ( ret, std::unique_ptr < Entry > ( new EntryImpl < ReturnType > ( ) ) ) ); } - static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string typeName, ext::deque < sax::Token > tokens ) { + static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & typeName, ext::deque < sax::Token > tokens ) { auto type = getEntries ( ).find ( typeName ); if ( type == getEntries ( ).end ( ) ) throw exception::CommonException ( "Entry " + typeName + " not available." );