From 93fae53ea5ada5273d7e68dc3bc0319c08853fc6 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 7 Dec 2015 22:45:07 +0100 Subject: [PATCH] Graphics: Qt-friendly change Former-commit-id: b4b278897d681ea5361ce9f751a0ecba7acd34ee --- include/Nazara/Graphics/TextSprite.inl | 16 ++++++++-------- src/Nazara/Graphics/TextSprite.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/Nazara/Graphics/TextSprite.inl b/include/Nazara/Graphics/TextSprite.inl index a22641100..cc230873d 100644 --- a/include/Nazara/Graphics/TextSprite.inl +++ b/include/Nazara/Graphics/TextSprite.inl @@ -26,11 +26,11 @@ namespace Nz for (auto it = sprite.m_atlases.begin(); it != sprite.m_atlases.end(); ++it) { const AbstractAtlas* atlas = it->first; - AtlasSlots& slots = m_atlases[atlas]; + AtlasSlots& atlasSlots = m_atlases[atlas]; - slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); - slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); - slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); + atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); } } @@ -111,11 +111,11 @@ namespace Nz for (auto it = text.m_atlases.begin(); it != text.m_atlases.end(); ++it) { const AbstractAtlas* atlas = it->first; - AtlasSlots& slots = m_atlases[atlas]; + AtlasSlots& atlasSlots = m_atlases[atlas]; - slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); - slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); - slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); + atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); } InvalidateBoundingVolume(); diff --git a/src/Nazara/Graphics/TextSprite.cpp b/src/Nazara/Graphics/TextSprite.cpp index 4ea284a42..13e4b3e49 100644 --- a/src/Nazara/Graphics/TextSprite.cpp +++ b/src/Nazara/Graphics/TextSprite.cpp @@ -49,11 +49,11 @@ namespace Nz if (m_atlases.find(atlas) == m_atlases.end()) { - AtlasSlots& slots = m_atlases[atlas]; + AtlasSlots& atlasSlots = m_atlases[atlas]; - slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); - slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); - slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); + atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); + atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); } }