summaryrefslogtreecommitdiffstats
path: root/src/extension/timer.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/extension/timer.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to '')
-rw-r--r--src/extension/timer.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/timer.cpp b/src/extension/timer.cpp
index b32c04f30..5fb727409 100644
--- a/src/extension/timer.cpp
+++ b/src/extension/timer.cpp
@@ -20,8 +20,8 @@ namespace Extension {
#define TIMER_SCALE_VALUE 20
-ExpirationTimer * ExpirationTimer::timer_list = NULL;
-ExpirationTimer * ExpirationTimer::idle_start = NULL;
+ExpirationTimer * ExpirationTimer::timer_list = nullptr;
+ExpirationTimer * ExpirationTimer::idle_start = nullptr;
long ExpirationTimer::timeout = 240;
bool ExpirationTimer::timer_started = false;
@@ -38,7 +38,7 @@ ExpirationTimer::ExpirationTimer (Extension * in_extension):
extension(in_extension)
{
/* Fix Me! */
- if (timer_list == NULL) {
+ if (timer_list == nullptr) {
next = this;
timer_list = this;
} else {
@@ -86,8 +86,8 @@ ExpirationTimer::~ExpirationTimer(void)
} else {
/* If we're the only entry in the list, the list needs to go
to NULL */
- timer_list = NULL;
- idle_start = NULL;
+ timer_list = nullptr;
+ idle_start = nullptr;
}
return;
@@ -151,7 +151,7 @@ ExpirationTimer::idle_func (void)
// std::cout << "Idle func pass: " << idle_cnt++ << " timer list: " << timer_list << std::endl;
/* see if this is the last */
- if (timer_list == NULL) {
+ if (timer_list == nullptr) {
timer_started = false;
return false;
}
@@ -162,7 +162,7 @@ ExpirationTimer::idle_func (void)
}
/* see if this is the last */
- if (timer_list == NULL) {
+ if (timer_list == nullptr) {
timer_started = false;
return false;
}