summaryrefslogtreecommitdiffstats
path: root/src/extension/param/bool.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/param/bool.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/extension/param/bool.cpp')
-rw-r--r--src/extension/param/bool.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index 80bc89138..eea660f69 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -33,12 +33,12 @@ ParamBool::ParamBool(const gchar * name,
: Parameter(name, text, description, hidden, indent, ext)
, _value(false)
{
- const char * defaultval = NULL;
- if (xml->firstChild() != NULL) {
+ const char * defaultval = nullptr;
+ if (xml->firstChild() != nullptr) {
defaultval = xml->firstChild()->content();
}
- if (defaultval != NULL && (!strcmp(defaultval, "true") || !strcmp(defaultval, "1"))) {
+ if (defaultval != nullptr && (!strcmp(defaultval, "true") || !strcmp(defaultval, "1"))) {
_value = true;
} else {
_value = false;
@@ -85,7 +85,7 @@ public:
*/
ParamBoolCheckButton (ParamBool * param, gchar * label, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) :
Gtk::CheckButton(label), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
- this->set_active(_pref->get(NULL, NULL) /**\todo fix */);
+ this->set_active(_pref->get(nullptr, nullptr) /**\todo fix */);
this->signal_toggled().connect(sigc::mem_fun(this, &ParamBoolCheckButton::on_toggle));
return;
}
@@ -106,8 +106,8 @@ private:
void ParamBoolCheckButton::on_toggle(void)
{
- _pref->set(this->get_active(), NULL /**\todo fix this */, NULL);
- if (_changeSignal != NULL) {
+ _pref->set(this->get_active(), nullptr /**\todo fix this */, nullptr);
+ if (_changeSignal != nullptr) {
_changeSignal->emit();
}
return;
@@ -127,7 +127,7 @@ void ParamBool::string(std::string &string) const
Gtk::Widget *ParamBool::get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
{
if (_hidden) {
- return NULL;
+ return nullptr;
}
auto hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, Parameter::GUI_PARAM_WIDGETS_SPACING));