Merge branch 'master' into lpc2012

1 files changed, 3 insertions, 3 deletions

diff --git a/src/utils/tokencollector.cpp b/src/utils/tokencollector.cpp
index e41d228e..691eca20 100644
--- a/src/utils/tokencollector.cpp
+++ b/src/utils/tokencollector.cpp
@@ -40,7 +40,7 @@ void TokenCollectorBase::insertClient(const std::string &token, intptr_t data)
         }
     }
 
-    time_t current = time(NULL);
+    time_t current = time(nullptr);
 
     Item item;
     item.token = token;
@@ -64,7 +64,7 @@ void TokenCollectorBase::insertConnect(const std::string &token, intptr_t data)
         }
     }
 
-    time_t current = time(NULL);
+    time_t current = time(nullptr);
 
     Item item;
     item.token = token;
@@ -114,7 +114,7 @@ void TokenCollectorBase::removeOutdated(time_t current)
 }
 
 TokenCollectorBase::TokenCollectorBase():
-    mLastCheck(time(NULL))
+    mLastCheck(time(nullptr))
 {
 }