sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDK: BaseWidget: silence harmless shadow warnings

Browse Source
This commit is contained in:
Alexandre Janniaux
2019-07-07 17:24:04 +02:00
parent 8b30fafda6
commit 724adb599a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SDK/src/NDK/BaseWidget.cpp
View File

@@ -197,9 +197,9 @@ namespace Ndk
newEntity->Enable(m_visible); newEntity->Enable(m_visible);
m_entities.emplace_back(); m_entities.emplace_back();
WidgetEntity& widgetEntity = m_entities.back(); WidgetEntity& newWidgetEntity = m_entities.back();
widgetEntity.handle = newEntity; newWidgetEntity.handle = newEntity;
widgetEntity.onDisabledSlot.Connect(newEntity->OnEntityDisabled, [this](Entity* entity) newWidgetEntity.onDisabledSlot.Connect(newEntity->OnEntityDisabled, [this](Entity* entity)
{ {
auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; }); auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; });
NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget"); NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget");
@@ -207,7 +207,7 @@ namespace Ndk
it->isEnabled = false; it->isEnabled = false;
}); });
widgetEntity.onEnabledSlot.Connect(newEntity->OnEntityEnabled, [this](Entity* entity) newWidgetEntity.onEnabledSlot.Connect(newEntity->OnEntityEnabled, [this](Entity* entity)
{ {
auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; }); auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; });
NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget"); NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget");