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

Core/Signals: Remove Connect/Disconnect macros

Browse Source 
And make interface easier to use


Former-commit-id: 5b789c9acb694839cb173ae96392650d80d383b7
This commit is contained in:
Lynix
2015-06-07 17:28:19 +02:00
parent 004b53c590
commit 4e5cdea454
10 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Nazara/Utility/Font.cpp
View File

@@ -298,15 +298,15 @@ void NzFont::SetAtlas(const std::shared_ptr<NzAbstractAtlas>& atlas)
m_atlas = atlas;
if (m_atlas)
{
m_atlasClearedSlot = NazaraConnectThis(*m_atlas, OnAtlasCleared, OnAtlasCleared);
m_atlasLayerChangeSlot = NazaraConnectThis(*m_atlas, OnAtlasLayerChange, OnAtlasLayerChange);
m_atlasReleaseSlot = NazaraConnectThis(*m_atlas, OnAtlasRelease, OnAtlasRelease);
m_atlasClearedSlot.Connect(m_atlas->OnAtlasCleared, this, OnAtlasCleared);
m_atlasLayerChangeSlot.Connect(m_atlas->OnAtlasLayerChange, this, OnAtlasLayerChange);
m_atlasReleaseSlot.Connect(m_atlas->OnAtlasRelease, this, OnAtlasRelease);
}
else
{
NazaraDisconnect(m_atlasClearedSlot);
NazaraDisconnect(m_atlasLayerChangeSlot);
NazaraDisconnect(m_atlasReleaseSlot);
m_atlasClearedSlot.Disconnect();
m_atlasLayerChangeSlot.Disconnect();
m_atlasReleaseSlot.Disconnect();
}
OnFontAtlasChanged(this);

16
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@@ -112,17 +112,17 @@ void NzSimpleTextDrawer::SetFont(NzFont* font)
m_font = font;
if (m_font)
{
m_atlasChangedSlot = NazaraConnectThis(*m_font, OnFontAtlasChanged, OnFontInvalidated);
m_atlasLayerChangedSlot = NazaraConnectThis(*m_font, OnFontAtlasLayerChanged, OnFontInvalidated);
m_fontReleaseSlot = NazaraConnectThis(*m_font, OnFontRelease, OnFontRelease);
m_glyphCacheClearedSlot = NazaraConnectThis(*m_font, OnFontGlyphCacheCleared, OnFontInvalidated);
m_atlasChangedSlot.Connect(m_font->OnFontAtlasChanged, this, OnFontInvalidated);
m_atlasLayerChangedSlot.Connect(m_font->OnFontAtlasLayerChanged, this, OnFontInvalidated);
m_fontReleaseSlot.Connect(m_font->OnFontRelease, this, OnFontRelease);
m_glyphCacheClearedSlot.Connect(m_font->OnFontAtlasChanged, this, OnFontInvalidated);
}
else
{
NazaraDisconnect(m_atlasChangedSlot);
NazaraDisconnect(m_atlasLayerChangedSlot);
NazaraDisconnect(m_fontReleaseSlot);
NazaraDisconnect(m_glyphCacheClearedSlot);
m_atlasChangedSlot.Disconnect();
m_atlasLayerChangedSlot.Disconnect();
m_fontReleaseSlot.Disconnect();
m_glyphCacheClearedSlot.Disconnect();
}
m_glyphUpdated = false;