Commit 163c9265 authored by Kasper Marstal's avatar Kasper Marstal
Browse files

WIP: Removed constness of Blueprint constructor arg

parent 787f18ae
......@@ -55,8 +55,8 @@ public:
typedef std::map<
std::string, RegistrationControllerStartInterface * > RegistrationControllerStartInterfaceMapType;
Overlord( std::shared_ptr< const Blueprint > blueprint );
Overlord( Blueprint const * blueprint );
Overlord( std::shared_ptr< Blueprint > blueprint );
Overlord( Blueprint * blueprint );
~Overlord() {}
/** Read configuration at the blueprints nodes and edges and return true if all components could be uniquely selected*/
......@@ -93,7 +93,7 @@ private:
typedef ComponentSelectorContainerType::iterator ComponentSelectorIteratorType;
/** Read configuration at the blueprints nodes and try to find instantiated components */
void ApplyNodeConfiguration();
void ApplyComponentConfiguration();
/** Read configuration at the blueprints edges and try to find instantiated components */
void ApplyConnectionConfiguration();
......
......@@ -26,11 +26,11 @@
namespace selx
{
Overlord::Overlord( std::shared_ptr< const Blueprint > blueprint ) : m_Blueprint( blueprint ), m_isConfigured(false )
Overlord::Overlord( std::shared_ptr< Blueprint > blueprint ) : m_Blueprint( blueprint ), m_isConfigured(false )
{
}
Overlord::Overlord( Blueprint const * blueprint ) : m_Blueprint( blueprint ), m_isConfigured( false )
Overlord::Overlord( Blueprint * blueprint ) : m_Blueprint( blueprint ), m_isConfigured( false )
{
}
......@@ -47,7 +47,7 @@ Overlord::Configure()
if( !this->m_isConfigured )
{
std::cout << "===== Applying Component Criteria =====" << std::endl;
this->ApplyNodeConfiguration();
this->ApplyComponentConfiguration();
auto nonUniqueComponentNames = this->GetNonUniqueComponentNames();
std::cout << nonUniqueComponentNames.size() << " out of " << m_Blueprint->GetComponentNames().size()
......@@ -117,7 +117,7 @@ Overlord::GetNonUniqueComponentNames()
void
Overlord::ApplyNodeConfiguration()
Overlord::ApplyComponentConfiguration()
{
// Creates a ComponentSelector for each node of the graph and apply
// the criteria/properties at each node to narrow the Component selection.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment