rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved SignalWidgetBase::disconnect to cpp file

0.8
Bruno Van de Velde 2017-09-01 23:11:31 +02:00
parent f9af46bba4
commit 10d285f0df
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/TGUI/Signal.hpp
View File

@ -798,18 +798,7 @@ namespace tgui
/// ///
/// @return True when a connection with this id existed and was removed /// @return True when a connection with this id existed and was removed
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool disconnect(unsigned int id) bool disconnect(unsigned int id);
{
auto it = m_connectedSignals.find(id);
if (it != m_connectedSignals.end())
{
const bool ret = getSignal(it->second).disconnect(id);
m_connectedSignals.erase(it);
return ret;
}
else // The id was not found
return false;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

15
src/TGUI/Signal.cpp
View File

@ -360,6 +360,21 @@ namespace tgui
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool SignalWidgetBase::disconnect(unsigned int id)
{
auto it = m_connectedSignals.find(id);
if (it != m_connectedSignals.end())
{
const bool ret = getSignal(it->second).disconnect(id);
m_connectedSignals.erase(it);
return ret;
}
else // The id was not found
return false;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void SignalWidgetBase::disconnectAll(std::string signalName) void SignalWidgetBase::disconnectAll(std::string signalName)
{ {
return getSignal(toLower(std::move(signalName))).disconnectAll(); return getSignal(toLower(std::move(signalName))).disconnectAll();