Code-style consistency improvement:

Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions

View File

@@ -4,16 +4,13 @@
See license in Gwen.h
*/
#include "Gwen/Events.h"
using namespace Gwen;
using namespace Gwen::Event;
Handler::Handler()
{
}
Handler::~Handler()
@@ -25,29 +22,27 @@ void Handler::CleanLinks()
{
// Tell all the callers that we're dead
std::list<Caller*>::iterator iter = m_Callers.begin();
while ( iter != m_Callers.end() )
while (iter != m_Callers.end())
{
Caller* pCaller = *iter;
UnRegisterCaller( pCaller );
pCaller->RemoveHandler( this );
UnRegisterCaller(pCaller);
pCaller->RemoveHandler(this);
iter = m_Callers.begin();
}
}
void Handler::RegisterCaller( Caller* pCaller )
void Handler::RegisterCaller(Caller* pCaller)
{
m_Callers.push_back( pCaller );
m_Callers.push_back(pCaller);
}
void Handler::UnRegisterCaller( Caller* pCaller )
void Handler::UnRegisterCaller(Caller* pCaller)
{
m_Callers.remove( pCaller );
m_Callers.remove(pCaller);
}
Caller::Caller()
{
}
Caller::~Caller()
@@ -61,51 +56,50 @@ void Caller::CleanLinks()
for (iter = m_Handlers.begin(); iter != m_Handlers.end(); ++iter)
{
handler& h = *iter;
h.pObject->UnRegisterCaller( this );
h.pObject->UnRegisterCaller(this);
}
m_Handlers.clear();
}
void Caller::Call( Controls::Base* pThis )
void Caller::Call(Controls::Base* pThis)
{
std::list<handler>::iterator iter;
for (iter = m_Handlers.begin(); iter != m_Handlers.end(); ++iter)
{
handler& h = *iter;
(h.pObject->*h.fnFunction)( pThis );
(h.pObject->*h.fnFunction)(pThis);
}
}
}
void Caller::AddInternal( Event::Handler* pObject, Event::Handler::Function pFunction )
void Caller::AddInternal(Event::Handler* pObject, Event::Handler::Function pFunction)
{
handler h;
h.fnFunction = pFunction;
h.pObject = pObject;
m_Handlers.push_back( h );
m_Handlers.push_back(h);
pObject->RegisterCaller( this );
pObject->RegisterCaller(this);
}
void Caller::RemoveHandler( Event::Handler* pObject )
void Caller::RemoveHandler(Event::Handler* pObject)
{
pObject->UnRegisterCaller( this );
pObject->UnRegisterCaller(this);
std::list<handler>::iterator iter = m_Handlers.begin();
while ( iter != m_Handlers.end() )
while (iter != m_Handlers.end())
{
handler& h = *iter;
if ( h.pObject == pObject )
if (h.pObject == pObject)
{
iter = m_Handlers.erase( iter );
iter = m_Handlers.erase(iter);
}
else
{
++iter;
}
}
}