From f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Jun 2018 12:46:15 +0200 Subject: =?UTF-8?q?Run=20clang-tidy=E2=80=99s=20modernize-use-nullptr=20pa?= =?UTF-8?q?ss.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer. --- src/ui/widget/style-swatch.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ui/widget/style-swatch.cpp') diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index 15928e300..04a63271e 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -106,13 +106,13 @@ void StyleSwatch::ToolObserver::notify(Inkscape::Preferences::Entry const &val) StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip) : - _desktop(NULL), + _desktop(nullptr), _verb_t(0), - _css(NULL), - _tool_obs(NULL), - _style_obs(NULL), + _css(nullptr), + _tool_obs(nullptr), + _style_obs(nullptr), _table(Gtk::manage(new Gtk::Grid())), - _sw_unit(NULL) + _sw_unit(nullptr) { set_name("StyleSwatch"); @@ -201,7 +201,7 @@ StyleSwatch::on_click(GdkEventButton */*event*/) if (this->_desktop && this->_verb_t != SP_VERB_NONE) { Inkscape::Verb *verb = Inkscape::Verb::get(this->_verb_t); SPAction *action = verb->get_action(Inkscape::ActionContext((Inkscape::UI::View::View *) this->_desktop)); - sp_action_perform (action, NULL); + sp_action_perform (action, nullptr); return true; } return false; @@ -227,7 +227,7 @@ StyleSwatch::setWatchedTool(const char *path, bool synthesize) if (_tool_obs) { delete _tool_obs; - _tool_obs = NULL; + _tool_obs = nullptr; } if (path) { -- cgit v1.2.3