summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/style-swatch.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/ui/widget/style-swatch.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 'src/ui/widget/style-swatch.cpp')
-rw-r--r--src/ui/widget/style-swatch.cpp14
1 files changed, 7 insertions, 7 deletions
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) {