summaryrefslogtreecommitdiffstats
path: root/Project/Branch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Project/Branch.cpp')
-rw-r--r--Project/Branch.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Project/Branch.cpp b/Project/Branch.cpp
index 8bcbb5e..b86ff02 100644
--- a/Project/Branch.cpp
+++ b/Project/Branch.cpp
@@ -95,8 +95,8 @@ bool Branch::SetNodeParent(Element* parent)
return true;
}
} else {
- if(m_activeNodeID == 1) m_parentList[0] = NULL;
- if(m_activeNodeID == 2) m_parentList[1] = NULL;
+ if(m_activeNodeID == 1) m_parentList[0] = nullptr;
+ if(m_activeNodeID == 2) m_parentList[1] = nullptr;
}
}
return false;
@@ -106,7 +106,7 @@ void Branch::RemoveParent(Element* parent)
{
for(int i = 0; i < 2; i++) {
if(parent == m_parentList[i]) {
- m_parentList[i] = NULL;
+ m_parentList[i] = nullptr;
m_online = false;
UpdateSwitchesPosition();
}
@@ -121,7 +121,7 @@ void Branch::UpdateNodes()
if(!m_parentList[0]->Intersects(nodeRect)) {
m_parentList[0]->RemoveChild(this);
- m_parentList[0] = NULL;
+ m_parentList[0] = nullptr;
m_online = false;
UpdateSwitchesPosition();
}
@@ -133,7 +133,7 @@ void Branch::UpdateNodes()
if(!m_parentList[1]->Intersects(nodeRect)) {
m_parentList[1]->RemoveChild(this);
- m_parentList[1] = NULL;
+ m_parentList[1] = nullptr;
m_online = false;
UpdateSwitchesPosition();
}