thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-11-04 00:07:19 +01:00
Code Releases Activity

Remove unnecessary argument from the Attach() and Detach() member functions of the basic event.

Browse Source
This commit is contained in:
Sandu Liviu Catalin
2015-10-03 21:54:02 +03:00
parent d5c5ff3289
commit 04936a9bef
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/Event/Basic.cpp
View File

@@ -33,7 +33,7 @@ BasicEvent::BasicEvent(SQInt32 type, bool suspended) noexcept
, m_Data() , m_Data()
, m_Suspended(suspended) , m_Suspended(suspended)
{ {
Attach(m_Type); Attach();
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@@ -49,7 +49,7 @@ BasicEvent::BasicEvent(const BasicEvent & o) noexcept
, m_Data(o.m_Data) , m_Data(o.m_Data)
, m_Suspended(o.m_Suspended) , m_Suspended(o.m_Suspended)
{ {
Attach(m_Type); Attach();
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@@ -65,13 +65,13 @@ BasicEvent::BasicEvent(BasicEvent && o) noexcept
, m_Data(o.m_Data) , m_Data(o.m_Data)
, m_Suspended(o.m_Suspended) , m_Suspended(o.m_Suspended)
{ {
Attach(m_Type); Attach();
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
BasicEvent::~BasicEvent() BasicEvent::~BasicEvent()
{ {
Detach(m_Type); Detach();
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@@ -79,7 +79,7 @@ BasicEvent & BasicEvent::operator = (const BasicEvent & o) noexcept
{ {
if (this != &o) if (this != &o)
{ {
Detach(m_Type); Detach();
m_Type = o.m_Type; m_Type = o.m_Type;
m_Stride = o.m_Stride; m_Stride = o.m_Stride;
@@ -92,7 +92,7 @@ BasicEvent & BasicEvent::operator = (const BasicEvent & o) noexcept
m_Data = o.m_Data; m_Data = o.m_Data;
m_Suspended = o.m_Suspended; m_Suspended = o.m_Suspended;
Attach(m_Type); Attach();
} }
return *this; return *this;
@@ -103,7 +103,7 @@ BasicEvent & BasicEvent::operator = (BasicEvent && o) noexcept
{ {
if (this != &o) if (this != &o)
{ {
Detach(m_Type); Detach();
m_Type = o.m_Type; m_Type = o.m_Type;
m_Stride = o.m_Stride; m_Stride = o.m_Stride;
@@ -116,7 +116,7 @@ BasicEvent & BasicEvent::operator = (BasicEvent && o) noexcept
m_Data = o.m_Data; m_Data = o.m_Data;
m_Suspended = o.m_Suspended; m_Suspended = o.m_Suspended;
Attach(m_Type); Attach();
} }
return *this; return *this;
@@ -279,6 +279,7 @@ void BasicEvent::SetOnTrigger(const Function & func) noexcept
{ {
m_OnTrigger = func; m_OnTrigger = func;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void BasicEvent::BlipCreated(SQInt32 blip, SQInt32 header, Object & payload) noexcept void BasicEvent::BlipCreated(SQInt32 blip, SQInt32 header, Object & payload) noexcept
{ {
@@ -1241,9 +1242,9 @@ bool BasicEvent::Trigger() noexcept
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void BasicEvent::Attach(EventType evt) noexcept void BasicEvent::Attach() noexcept
{ {
switch (evt) switch (m_Type)
{ {
case EVT_BLIPCREATED: case EVT_BLIPCREATED:
_Core->BlipCreated.Connect< BasicEvent, &BasicEvent::BlipCreated >(this); _Core->BlipCreated.Connect< BasicEvent, &BasicEvent::BlipCreated >(this);
@@ -1563,9 +1564,9 @@ void BasicEvent::Attach(EventType evt) noexcept
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void BasicEvent::Detach(EventType evt) noexcept void BasicEvent::Detach() noexcept
{ {
switch (evt) switch (m_Type)
{ {
case EVT_BLIPCREATED: case EVT_BLIPCREATED:
_Core->BlipCreated.Disconnect< BasicEvent, &BasicEvent::BlipCreated >(this); _Core->BlipCreated.Disconnect< BasicEvent, &BasicEvent::BlipCreated >(this);