diff options
| author | Goraf <22941576+Goraf@users.noreply.github.com> | 2018-02-24 15:32:06 +0100 |
|---|---|---|
| committer | Goraf <22941576+Goraf@users.noreply.github.com> | 2018-02-24 18:20:46 +0100 |
| commit | 1c0172cca4f1e90679321912e20436a7f42f122d (patch) | |
| tree | 77a544d2c09332ec176f42ebcf58a40d9c5d2b93 /plugins/Boltun/src/Engine | |
| parent | dff565f40105b20b0e8e4dba1f48ccc9b8e7ff44 (diff) | |
more nullptr
Diffstat (limited to 'plugins/Boltun/src/Engine')
| -rw-r--r-- | plugins/Boltun/src/Engine/PerContactData.h | 8 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/ValueChooser.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Boltun/src/Engine/PerContactData.h b/plugins/Boltun/src/Engine/PerContactData.h index 71dcec126d..f573423bd3 100644 --- a/plugins/Boltun/src/Engine/PerContactData.h +++ b/plugins/Boltun/src/Engine/PerContactData.h @@ -40,7 +40,7 @@ class PerContactData }
inline InternalData()
- : data(NULL)
+ : data(nullptr)
{
assert(false);
}
@@ -78,7 +78,7 @@ PerContactData<Source, Data, ContactHandle>::~PerContactData() mir_cslock mlck(mapLock);
if (timerID)
{
- KillTimer(NULL, timerID);
+ KillTimer(nullptr, timerID);
perContactDataObjects.erase(timerID);
}
while (!datas.empty())
@@ -106,7 +106,7 @@ void PerContactData<Source, Data, ContactHandle>::PutData(ContactHandle Contact) ::time(&(datas[Contact]->time));
if (!timerID)
{
- timerID = SetTimer(NULL, 0, 30000, RunTimerProc<Source, Data, ContactHandle>);
+ timerID = SetTimer(nullptr, 0, 30000, RunTimerProc<Source, Data, ContactHandle>);
assert(timerID);
perContactDataObjects[timerID] = this;
}
@@ -138,7 +138,7 @@ void PerContactData<Source, Data, ContactHandle>::CleanupData() }
if (timerID && datas.empty()) //timerID may become NULL before locking, so should check
{
- KillTimer(NULL, timerID);
+ KillTimer(nullptr, timerID);
perContactDataObjects.erase(timerID);
}
}
diff --git a/plugins/Boltun/src/Engine/ValueChooser.h b/plugins/Boltun/src/Engine/ValueChooser.h index acd63dfd8f..e442f14530 100644 --- a/plugins/Boltun/src/Engine/ValueChooser.h +++ b/plugins/Boltun/src/Engine/ValueChooser.h @@ -37,7 +37,7 @@ public: :data(vec), notifyOnReset(NotifyOnReset)
{
//randomize();
- numbers = NULL;
+ numbers = nullptr;
UpdateLength();
}
|