aboutsummaryrefslogtreecommitdiff
path: root/primedev/shared/keyvalues.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'primedev/shared/keyvalues.cpp')
-rw-r--r--primedev/shared/keyvalues.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/primedev/shared/keyvalues.cpp b/primedev/shared/keyvalues.cpp
index 36f891eb..46ce4e04 100644
--- a/primedev/shared/keyvalues.cpp
+++ b/primedev/shared/keyvalues.cpp
@@ -511,7 +511,7 @@ bool KeyValues::IsEmpty(const char* pszKeyName)
KeyValues* KeyValues::GetFirstTrueSubKey(void) const
{
assert_msg(this, "Member function called on NULL KeyValues");
- KeyValues* pRet = this ? m_pSub : nullptr;
+ KeyValues* pRet = m_pSub;
while (pRet && pRet->m_iDataType != TYPE_NONE)
pRet = pRet->m_pPeer;
@@ -525,7 +525,7 @@ KeyValues* KeyValues::GetFirstTrueSubKey(void) const
KeyValues* KeyValues::GetNextTrueSubKey(void) const
{
assert_msg(this, "Member function called on NULL KeyValues");
- KeyValues* pRet = this ? m_pPeer : nullptr;
+ KeyValues* pRet = m_pPeer;
while (pRet && pRet->m_iDataType != TYPE_NONE)
pRet = pRet->m_pPeer;
@@ -539,7 +539,7 @@ KeyValues* KeyValues::GetNextTrueSubKey(void) const
KeyValues* KeyValues::GetFirstValue(void) const
{
assert_msg(this, "Member function called on NULL KeyValues");
- KeyValues* pRet = this ? m_pSub : nullptr;
+ KeyValues* pRet = m_pSub;
while (pRet && pRet->m_iDataType == TYPE_NONE)
pRet = pRet->m_pPeer;
@@ -553,7 +553,7 @@ KeyValues* KeyValues::GetFirstValue(void) const
KeyValues* KeyValues::GetNextValue(void) const
{
assert_msg(this, "Member function called on NULL KeyValues");
- KeyValues* pRet = this ? m_pPeer : nullptr;
+ KeyValues* pRet = m_pPeer;
while (pRet && pRet->m_iDataType == TYPE_NONE)
pRet = pRet->m_pPeer;
@@ -566,7 +566,7 @@ KeyValues* KeyValues::GetNextValue(void) const
KeyValues* KeyValues::GetFirstSubKey() const
{
assert_msg(this, "Member function called on NULL KeyValues");
- return this ? m_pSub : nullptr;
+ return m_pSub;
}
//-----------------------------------------------------------------------------
@@ -575,7 +575,7 @@ KeyValues* KeyValues::GetFirstSubKey() const
KeyValues* KeyValues::GetNextKey() const
{
assert_msg(this, "Member function called on NULL KeyValues");
- return this ? m_pPeer : nullptr;
+ return m_pPeer;
}
//-----------------------------------------------------------------------------