Rename problematic names (interface). Forward declare all friend classes and prefix with namespace. See #118.

Include/RmlUi/Core/Context.h

@@ -355,7 +355,7 @@ private:
 	// Sends the specified event to all elements in new_items that don't appear in old_items.
 	static void SendEvents(const ElementSet& old_items, const ElementSet& new_items, EventId id, const Dictionary& parameters);
 
-	friend class Element;
+	friend class Rml::Element;
 	friend RMLUICORE_API Context* CreateContext(const String&, const Vector2i&, RenderInterface*);
 };
 

Include/RmlUi/Core/DecoratorInstancer.h

@@ -59,9 +59,9 @@ public:
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
 	/// @param[in] name The type of decorator desired. For example, "decorator: simple(...);" is declared as type "simple".
 	/// @param[in] properties All RCSS properties associated with the decorator.
-	/// @param[in] interface An interface for querying the active style sheet.
+	/// @param[in] instancer_interface An interface for querying the active style sheet.
 	/// @return A shared_ptr to the decorator if it was instanced successfully.
-	virtual SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) = 0;
+	virtual SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) = 0;
 
 	/// Returns the property specification associated with the instancer.
 	const PropertySpecification& GetPropertySpecification() const;

Include/RmlUi/Core/Element.h

@@ -55,12 +55,13 @@ class ElementDefinition;
 class ElementDocument;
 class ElementScroll;
 class ElementStyle;
+class LayoutEngine;
+class LayoutInlineBox;
 class PropertiesIteratorView;
-class FontFaceHandleDefault;
 class PropertyDictionary;
 class RenderInterface;
-class TransformState;
 class StyleSheet;
+class TransformState;
 struct ElementMeta;
 
 /**
@@ -744,11 +745,11 @@ private:
 
 	ElementMeta* meta;
 
-	friend class Context;
-	friend class ElementStyle;
-	friend class LayoutEngine;
-	friend class LayoutInlineBox;
-	friend class ElementScroll;
+	friend class Rml::Context;
+	friend class Rml::ElementStyle;
+	friend class Rml::LayoutEngine;
+	friend class Rml::LayoutInlineBox;
+	friend class Rml::ElementScroll;
 };
 
 } // namespace Rml

Include/RmlUi/Core/ElementDocument.h

@@ -175,8 +175,8 @@ private:
 
 	bool position_dirty;
 
-	friend class Context;
-	friend class Factory;
+	friend class Rml::Context;
+	friend class Rml::Factory;
 
 };
 

Include/RmlUi/Core/Elements/ElementDataGridRow.h

@@ -46,7 +46,7 @@ class ElementDataGrid;
 
 class RMLUICORE_API ElementDataGridRow : public Element, public DataSourceListener
 {
-friend class ElementDataGrid;
+friend class Rml::ElementDataGrid;
 
 public:
 	RMLUI_RTTI_DefineWithParent(ElementDataGridRow, Element)

Include/RmlUi/Core/Event.h

@@ -36,6 +36,7 @@
 
 namespace Rml {
 
+class Factory;
 class Element;
 class EventInstancer;
 struct EventSpecification;
@@ -144,7 +145,7 @@ private:
 
 	EventInstancer* instancer = nullptr;
 
-	friend class Factory;
+	friend class Rml::Factory;
 };
 
 

Include/RmlUi/Core/FontEffectInstancer.h

@@ -36,6 +36,7 @@
 
 namespace Rml {
 
+class Factory;
 class FontEffect;
 
 /**
@@ -83,7 +84,7 @@ private:
 	// Properties that define the geometry.
 	SmallUnorderedSet< PropertyId > volatile_properties;
 
-	friend class Factory;
+	friend class Rml::Factory;
 };
 
 } // namespace Rml

Include/RmlUi/Core/Matrix4.h

@@ -249,7 +249,7 @@ class Matrix4
 
 		typedef typename StorageType::TransposeType TransposeStorageType;
 		typedef Matrix4< ComponentType, TransposeStorageType > TransposeType;
-		friend class Matrix4< ComponentType, TransposeStorageType >;
+		friend class Rml::Matrix4< ComponentType, TransposeStorageType >;
 
 	private:
 		// The components of the matrix.

Include/RmlUi/Core/ObserverPtr.h

@@ -118,7 +118,7 @@ public:
 
 private:
 
-	friend class EnableObserverPtr<T>;
+	friend class Rml::EnableObserverPtr<T>;
 
 	explicit ObserverPtr(ObserverPtrBlock* block) noexcept : block(block)
 	{

Include/RmlUi/Core/PropertySpecification.h

@@ -136,7 +136,7 @@ private:
 
 	bool ParsePropertyValues(StringList& values_list, const String& values, bool split_values) const;
 
-	friend class StyleSheetSpecification;
+	friend class Rml::StyleSheetSpecification;
 };
 
 } // namespace Rml

Include/RmlUi/Core/RenderInterface.h

@@ -119,7 +119,7 @@ public:
 private:
 	Context* context;
 
-	friend class Context;
+	friend class Rml::Context;
 };
 
 } // namespace Rml

Include/RmlUi/Core/Traits.h

@@ -52,7 +52,7 @@ class RMLUICORE_API Releasable : public NonCopyMoveable {
 protected:
 	virtual ~Releasable() = default;
 	virtual void Release() = 0;
-	friend class ReleaserBase;
+	friend class Rml::ReleaserBase;
 };
 
 class RMLUICORE_API ReleaserBase {

Samples/invaders/src/DecoratorInstancerDefender.cpp

@@ -44,7 +44,7 @@ DecoratorInstancerDefender::~DecoratorInstancerDefender()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerDefender::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	const Rml::Property* image_source_property = properties.GetProperty(id_image_src);
 	Rml::String image_source = image_source_property->Get< Rml::String >();

Samples/invaders/src/DecoratorInstancerDefender.h

@@ -42,10 +42,7 @@ public:
 	~DecoratorInstancerDefender();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param[in] name The type of decorator desired. For example, "background-decorator: simple;" is declared as type "simple".
-	/// @param[in] properties All RCSS properties associated with the decorator.
-	/// @return The decorator if it was instanced successful, nullptr if an error occured.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_image_src;

Samples/invaders/src/DecoratorInstancerStarfield.cpp

@@ -48,7 +48,7 @@ DecoratorInstancerStarfield::~DecoratorInstancerStarfield()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerStarfield::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	int num_layers = Rml::Math::RealToInteger(properties.GetProperty(id_num_layers)->Get< float >());
 	Rml::Colourb top_colour = properties.GetProperty(id_top_colour)->Get< Rml::Colourb >();

Samples/invaders/src/DecoratorInstancerStarfield.h

@@ -43,10 +43,7 @@ public:
 	~DecoratorInstancerStarfield();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param name The type of decorator desired. For example, "background-decorator: simple;" is declared as type "simple".
-	/// @param properties All RCSS properties associated with the decorator.
-	/// @return The decorator if it was instanced successful, nullptr if an error occured.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_num_layers, id_top_colour, id_bottom_colour, id_top_speed, id_bottom_speed, id_top_density, id_bottom_density;

Samples/luainvaders/src/DecoratorInstancerDefender.cpp

@@ -44,7 +44,7 @@ DecoratorInstancerDefender::~DecoratorInstancerDefender()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerDefender::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	const Rml::Property* image_source_property = properties.GetProperty(id_image_src);
 	Rml::String image_source = image_source_property->Get< Rml::String >();

Samples/luainvaders/src/DecoratorInstancerDefender.h

@@ -42,10 +42,7 @@ public:
 	~DecoratorInstancerDefender();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param[in] name The type of decorator desired. For example, "background-decorator: simple;" is declared as type "simple".
-	/// @param[in] properties All RCSS properties associated with the decorator.
-	/// @return The decorator if it was instanced successful, nullptr if an error occured.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_image_src;

Samples/luainvaders/src/DecoratorInstancerStarfield.cpp

@@ -48,7 +48,7 @@ DecoratorInstancerStarfield::~DecoratorInstancerStarfield()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerStarfield::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	int num_layers = Rml::Math::RealToInteger(properties.GetProperty(id_num_layers)->Get< float >());
 	Rml::Colourb top_colour = properties.GetProperty(id_top_colour)->Get< Rml::Colourb >();

Samples/luainvaders/src/DecoratorInstancerStarfield.h

@@ -43,10 +43,7 @@ public:
 	~DecoratorInstancerStarfield();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param name The type of decorator desired. For example, "background-decorator: simple;" is declared as type "simple".
-	/// @param properties All RCSS properties associated with the decorator.
-	/// @return The decorator if it was instanced successful, nullptr if an error occured.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_num_layers, id_top_colour, id_bottom_colour, id_top_speed, id_bottom_speed, id_top_density, id_bottom_density;

Samples/tutorial/datagrid/src/DecoratorInstancerDefender.cpp

@@ -27,7 +27,7 @@ DecoratorInstancerDefender::~DecoratorInstancerDefender()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerDefender::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	const Rml::Property* image_source_property = properties.GetProperty(id_image_src);
 	Rml::String image_source = image_source_property->Get< Rml::String >();

Samples/tutorial/datagrid/src/DecoratorInstancerDefender.h

@@ -26,11 +26,7 @@ public:
 	virtual ~DecoratorInstancerDefender();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param[in] name The type of decorator desired. For example, "decorator: simple(...);" is declared as type "simple".
-	/// @param[in] properties All RCSS properties associated with the decorator.
-	/// @param[in] interface An interface for querying the active style sheet.
-	/// @return A shared_ptr to the decorator if it was instanced successfully.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_image_src;

Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.cpp

@@ -27,7 +27,7 @@ DecoratorInstancerDefender::~DecoratorInstancerDefender()
 
 // Instances a decorator given the property tag and attributes from the RCSS file.
 Rml::SharedPtr<Rml::Decorator> DecoratorInstancerDefender::InstanceDecorator(const Rml::String& /*name*/,
-	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*interface*/)
+	const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& /*instancer_interface*/)
 {
 	const Rml::Property* image_source_property = properties.GetProperty(id_image_src);
 	Rml::String image_source = image_source_property->Get< Rml::String >();

Samples/tutorial/datagrid_tree/src/DecoratorInstancerDefender.h

@@ -26,11 +26,7 @@ public:
 	virtual ~DecoratorInstancerDefender();
 
 	/// Instances a decorator given the property tag and attributes from the RCSS file.
-	/// @param[in] name The type of decorator desired. For example, "decorator: simple(...);" is declared as type "simple".
-	/// @param[in] properties All RCSS properties associated with the decorator.
-	/// @param[in] interface An interface for querying the active style sheet.
-	/// @return A shared_ptr to the decorator if it was instanced successfully.
-	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& interface) override;
+	Rml::SharedPtr<Rml::Decorator> InstanceDecorator(const Rml::String& name, const Rml::PropertyDictionary& properties, const Rml::DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	Rml::PropertyId id_image_src;

Source/Core/DataControllerDefault.cpp

@@ -118,9 +118,9 @@ bool DataControllerEvent::Initialize(DataModel& model, Element* element, const S
 	RMLUI_ASSERT(element);
 
 	expression = MakeUnique<DataExpression>(expression_str);
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (!expression->Parse(interface, true))
+	if (!expression->Parse(expr_interface, true))
 		return false;
 
 	id = EventSpecificationInterface::GetIdOrInsert(modifier);
@@ -142,9 +142,9 @@ void DataControllerEvent::ProcessEvent(Event& event)
 
 	if (Element* element = GetElement())
 	{
-		DataExpressionInterface interface(element->GetDataModel(), element, &event);
+		DataExpressionInterface expr_interface(element->GetDataModel(), element, &event);
 		Variant unused_value_out;
-		expression->Run(interface, unused_value_out);
+		expression->Run(expr_interface, unused_value_out);
 	}
 }
 

Source/Core/DataViewDefault.cpp

@@ -46,9 +46,9 @@ bool DataViewCommon::Initialize(DataModel& model, Element* element, const String
 		modifier = in_modifier;
 
 	expression = MakeUnique<DataExpression>(expression_str);
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	bool result = expression->Parse(interface, false);
+	bool result = expression->Parse(expr_interface, false);
 	return result;
 }
 
@@ -84,9 +84,9 @@ bool DataViewAttribute::Update(DataModel& model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		const String value = variant.Get<String>();
 		const Variant* attribute = element->GetAttribute(attribute_name);
@@ -114,9 +114,9 @@ bool DataViewStyle::Update(DataModel& model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 	
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		const String value = variant.Get<String>();
 		const Property* p = element->GetLocalProperty(property_name);
@@ -139,9 +139,9 @@ bool DataViewClass::Update(DataModel& model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		const bool activate = variant.Get<bool>();
 		const bool is_set = element->IsClassSet(class_name);
@@ -163,9 +163,9 @@ bool DataViewRml::Update(DataModel & model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		String new_rml = variant.Get<String>();
 		if (new_rml != previous_rml)
@@ -187,9 +187,9 @@ bool DataViewIf::Update(DataModel& model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		const bool value = variant.Get<bool>();
 		const bool is_visible = (element->GetLocalStyleProperties().count(PropertyId::Display) == 0);
@@ -214,9 +214,9 @@ bool DataViewVisible::Update(DataModel& model)
 	bool result = false;
 	Variant variant;
 	Element* element = GetElement();
-	DataExpressionInterface interface(&model, element);
+	DataExpressionInterface expr_interface(&model, element);
 
-	if (element && GetExpression().Run(interface, variant))
+	if (element && GetExpression().Run(expr_interface, variant))
 	{
 		const bool value = variant.Get<bool>();
 		const bool is_visible = (element->GetLocalStyleProperties().count(PropertyId::Visibility) == 0);

Source/Core/DecoratorGradient.h

@@ -63,7 +63,7 @@ public:
 	DecoratorGradientInstancer();
 	~DecoratorGradientInstancer();
 
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	struct GradientPropertyIds {

Source/Core/DecoratorNinePatch.cpp

@@ -196,7 +196,7 @@ DecoratorNinePatchInstancer::~DecoratorNinePatchInstancer()
 {
 }
 
-SharedPtr<Decorator> DecoratorNinePatchInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& interface)
+SharedPtr<Decorator> DecoratorNinePatchInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface)
 {
 	RMLUI_UNUSED(name);
 
@@ -216,7 +216,7 @@ SharedPtr<Decorator> DecoratorNinePatchInstancer::InstanceDecorator(const String
 
 	{
 		const String sprite_name = properties.GetProperty(sprite_outer_id)->Get< String >();
-		sprite_outer = interface.GetSprite(sprite_name);
+		sprite_outer = instancer_interface.GetSprite(sprite_name);
 		if (!sprite_outer)
 		{
 			Log::Message(Log::LT_WARNING, "Could not find sprite named '%s' in ninepatch decorator.", sprite_name.c_str());
@@ -225,7 +225,7 @@ SharedPtr<Decorator> DecoratorNinePatchInstancer::InstanceDecorator(const String
 	}
 	{
 		const String sprite_name = properties.GetProperty(sprite_inner_id)->Get< String >();
-		sprite_inner = interface.GetSprite(sprite_name);
+		sprite_inner = instancer_interface.GetSprite(sprite_name);
 		if (!sprite_inner)
 		{
 			Log::Message(Log::LT_WARNING, "Could not find sprite named '%s' in ninepatch decorator.", sprite_name.c_str());

Source/Core/DecoratorNinePatch.h

@@ -62,7 +62,7 @@ public:
 	DecoratorNinePatchInstancer();
 	~DecoratorNinePatchInstancer();
 
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 
 private:
 	PropertyId sprite_outer_id, sprite_inner_id;

Source/Core/DecoratorTiledBoxInstancer.cpp

@@ -53,7 +53,7 @@ DecoratorTiledBoxInstancer::~DecoratorTiledBoxInstancer()
 }
 
 // Instances a box decorator.
-SharedPtr<Decorator>DecoratorTiledBoxInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& interface)
+SharedPtr<Decorator>DecoratorTiledBoxInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface)
 {
 	RMLUI_UNUSED(name);
 
@@ -62,7 +62,7 @@ SharedPtr<Decorator>DecoratorTiledBoxInstancer::InstanceDecorator(const String&
 	DecoratorTiled::Tile tiles[num_tiles];
 	Texture textures[num_tiles];
 
-	if (!GetTileProperties(tiles, textures, num_tiles, properties, interface))
+	if (!GetTileProperties(tiles, textures, num_tiles, properties, instancer_interface))
 		return nullptr;
 
 	auto decorator = MakeShared<DecoratorTiledBox>();

Source/Core/DecoratorTiledBoxInstancer.h

@@ -44,7 +44,7 @@ public:
 	~DecoratorTiledBoxInstancer();
 
 	/// Instances a box decorator.
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 };
 
 } // namespace Rml

Source/Core/DecoratorTiledHorizontalInstancer.cpp

@@ -43,7 +43,7 @@ DecoratorTiledHorizontalInstancer::~DecoratorTiledHorizontalInstancer()
 {
 }
 
-SharedPtr<Decorator> DecoratorTiledHorizontalInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& interface)
+SharedPtr<Decorator> DecoratorTiledHorizontalInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface)
 {
 	RMLUI_UNUSED(name);
 
@@ -52,7 +52,7 @@ SharedPtr<Decorator> DecoratorTiledHorizontalInstancer::InstanceDecorator(const
 	DecoratorTiled::Tile tiles[num_tiles];
 	Texture textures[num_tiles];
 
-	if (!GetTileProperties(tiles, textures, num_tiles, properties, interface))
+	if (!GetTileProperties(tiles, textures, num_tiles, properties, instancer_interface))
 		return nullptr;
 
 	auto decorator = MakeShared<DecoratorTiledHorizontal>();

Source/Core/DecoratorTiledHorizontalInstancer.h

@@ -44,7 +44,7 @@ public:
 	~DecoratorTiledHorizontalInstancer();
 
 	/// Instances a horizontal decorator.
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 };
 
 } // namespace Rml

Source/Core/DecoratorTiledImageInstancer.cpp

@@ -42,14 +42,14 @@ DecoratorTiledImageInstancer::~DecoratorTiledImageInstancer()
 }
 
 
-SharedPtr<Decorator> DecoratorTiledImageInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& interface)
+SharedPtr<Decorator> DecoratorTiledImageInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface)
 {
 	RMLUI_UNUSED(name);
 
 	DecoratorTiled::Tile tile;
 	Texture texture;
 
-	if (!GetTileProperties(&tile, &texture, 1, properties, interface))
+	if (!GetTileProperties(&tile, &texture, 1, properties, instancer_interface))
 		return nullptr;
 	
 	auto decorator = MakeShared<DecoratorTiledImage>();

Source/Core/DecoratorTiledImageInstancer.h

@@ -44,7 +44,7 @@ public:
 	~DecoratorTiledImageInstancer();
 
 	/// Instances an image decorator.
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 };
 
 } // namespace Rml

Source/Core/DecoratorTiledInstancer.cpp

@@ -81,7 +81,7 @@ void DecoratorTiledInstancer::RegisterTileProperty(const String& name, bool regi
 
 
 // Retrieves all the properties for a tile from the property dictionary.
-bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Texture* textures, size_t num_tiles_and_textures, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) const
+bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Texture* textures, size_t num_tiles_and_textures, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) const
 {
 	RMLUI_ASSERT(num_tiles_and_textures == tile_property_ids.size());
 
@@ -109,7 +109,7 @@ bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Tex
 		Texture& texture = textures[i];
 
 		// A tile is always either a sprite or an image.
-		if (const Sprite * sprite = interface.GetSprite(texture_name))
+		if (const Sprite * sprite = instancer_interface.GetSprite(texture_name))
 		{
 			tile.position.x = sprite->rectangle.x;
 			tile.position.y = sprite->rectangle.y;

Source/Core/DecoratorTiledInstancer.h

@@ -56,8 +56,8 @@ protected:
 	/// @param[out] tile The tile structure for storing the tile properties.
 	/// @param[out] textures Holds the textures declared for the tile.
 	/// @param[in] properties The user-defined list of parameters for the decorator.
-	/// @param[in] interface An interface for querying the active style sheet.
-	bool GetTileProperties(DecoratorTiled::Tile* tiles, Texture* textures, size_t num_tiles_and_textures, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) const;
+	/// @param[in] instancer_interface An interface for querying the active style sheet.
+	bool GetTileProperties(DecoratorTiled::Tile* tiles, Texture* textures, size_t num_tiles_and_textures, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) const;
 
 private:
 	struct TilePropertyIds {

Source/Core/DecoratorTiledVerticalInstancer.cpp

@@ -43,7 +43,7 @@ DecoratorTiledVerticalInstancer::~DecoratorTiledVerticalInstancer()
 {
 }
 
-SharedPtr<Decorator> DecoratorTiledVerticalInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& interface)
+SharedPtr<Decorator> DecoratorTiledVerticalInstancer::InstanceDecorator(const String& RMLUI_UNUSED_PARAMETER(name), const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface)
 {
 	RMLUI_UNUSED(name);
 
@@ -52,7 +52,7 @@ SharedPtr<Decorator> DecoratorTiledVerticalInstancer::InstanceDecorator(const St
 	DecoratorTiled::Tile tiles[num_tiles];
 	Texture textures[num_tiles];
 
-	if (!GetTileProperties(tiles, textures, num_tiles, properties, interface))
+	if (!GetTileProperties(tiles, textures, num_tiles, properties, instancer_interface))
 		return nullptr;
 
 	auto decorator = MakeShared<DecoratorTiledVertical>();

Source/Core/DecoratorTiledVerticalInstancer.h

@@ -44,7 +44,7 @@ public:
 	~DecoratorTiledVerticalInstancer();
 
 	/// Instances a vertical decorator.
-	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& interface) override;
+	SharedPtr<Decorator> InstanceDecorator(const String& name, const PropertyDictionary& properties, const DecoratorInstancerInterface& instancer_interface) override;
 };
 
 } // namespace Rml

Source/Core/Pool.h

@@ -65,7 +65,7 @@ public:
 	 */
 	class Iterator
 	{
-		friend class Pool< PoolType >;
+		friend class Rml::Pool< PoolType >;
 
 	public :
 		/// Increments the iterator to reference the next node in the