diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-15 10:46:15 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:01 +0000 |
| commit | f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch) | |
| tree | 7c6044fd3a17a2665841959dac9b3b2110b27924 /src/svg-view-slideshow.cpp | |
| parent | Run clang-tidy’s modernize-use-override pass. (diff) | |
| download | inkscape-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 'src/svg-view-slideshow.cpp')
| -rw-r--r-- | src/svg-view-slideshow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp index 430fd9ce5..ba59be2ef 100644 --- a/src/svg-view-slideshow.cpp +++ b/src/svg-view-slideshow.cpp @@ -52,8 +52,8 @@ SPSlideShow::SPSlideShow(std::vector<Glib::ustring> const &slides, bool full_scr , _fullscreen(full_screen) , _timer(timer) , _scale(scale) - , _view(NULL) - , _ctrlwin(NULL) + , _view(nullptr) + , _ctrlwin(nullptr) { // setup initial document Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_primary(); // TODO: is inkview always launched on primary monitor? @@ -184,7 +184,7 @@ void SPSlideShow::show_next() { waiting_cursor(); - SPDocument *doc = NULL; + SPDocument *doc = nullptr; while (!doc && (_current < _slides.size() - 1)) { doc = SPDocument::createNewDoc ((_slides[++_current]).c_str(), TRUE, false); } @@ -200,7 +200,7 @@ void SPSlideShow::show_prev() { waiting_cursor(); - SPDocument *doc = NULL; + SPDocument *doc = nullptr; while (!doc && (_current > 0)) { doc = SPDocument::createNewDoc ((_slides[--_current]).c_str(), TRUE, false); } @@ -216,7 +216,7 @@ void SPSlideShow::goto_first() { waiting_cursor(); - SPDocument *doc = NULL; + SPDocument *doc = nullptr; int current = 0; while ( !doc && (current < _slides.size() - 1)) { doc = SPDocument::createNewDoc((_slides[current++]).c_str(), TRUE, false); @@ -234,7 +234,7 @@ void SPSlideShow::goto_last() { waiting_cursor(); - SPDocument *doc = NULL; + SPDocument *doc = nullptr; int current = _slides.size() - 1; while (!doc && (current >= 0)) { doc = SPDocument::createNewDoc((_slides[current--]).c_str(), TRUE, false); @@ -260,7 +260,7 @@ bool SPSlideShow::timer_callback() bool SPSlideShow::ctrlwin_delete (GdkEventAny */*event*/) { if(_ctrlwin) delete _ctrlwin; - _ctrlwin = NULL; + _ctrlwin = nullptr; return true; } |