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/ui/widget/registered-widget.h | |
| 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/ui/widget/registered-widget.h')
| -rw-r--r-- | src/ui/widget/registered-widget.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index ca55e5397..bb0f6da8a 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -135,9 +135,9 @@ protected: private: void construct() { - _wr = NULL; - repr = NULL; - doc = NULL; + _wr = nullptr; + repr = nullptr; + doc = nullptr; write_undo = false; event_type = 0; //SP_VERB_INVALID } @@ -148,7 +148,7 @@ private: class RegisteredCheckButton : public RegisteredWidget<Gtk::CheckButton> { public: ~RegisteredCheckButton() override; - RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *active_str = "true", char const *inactive_str = "false"); + RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=nullptr, SPDocument *doc_in=nullptr, char const *active_str = "true", char const *inactive_str = "false"); void setActive (bool); @@ -173,7 +173,7 @@ protected: class RegisteredToggleButton : public RegisteredWidget<Gtk::ToggleButton> { public: ~RegisteredToggleButton() override; - RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL, char const *icon_active = "true", char const *icon_inactive = "false"); + RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=nullptr, SPDocument *doc_in=nullptr, char const *icon_active = "true", char const *icon_inactive = "false"); void setActive (bool); @@ -200,8 +200,8 @@ public: RegisteredUnitMenu ( const Glib::ustring& label, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); void setUnit (const Glib::ustring); Unit const * getUnit() const { return static_cast<UnitMenu*>(_widget)->getUnit(); }; @@ -228,8 +228,8 @@ public: const Glib::ustring& key, const RegisteredUnitMenu &rum, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL, + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr, RSU_UserUnits _user_units = RSU_none ); protected: @@ -246,8 +246,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); protected: sigc::connection _value_changed_connection; void on_value_changed(); @@ -260,8 +260,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); protected: sigc::connection _activate_connection; @@ -278,8 +278,8 @@ public: const Glib::ustring& ckey, const Glib::ustring& akey, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr); void setRgba32 (guint32); void closeWindow(); @@ -298,8 +298,8 @@ public: const Glib::ustring& suffix, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); bool setProgrammatically; // true if the value was set by setValue, not changed by the user; // if a callback checks it, it must reset it back to false @@ -319,8 +319,8 @@ public: const Glib::ustring& tip2, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); void setValue (bool second); @@ -339,8 +339,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); protected: sigc::connection _value_x_changed_connection; @@ -356,8 +356,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); // redefine setValue, because transform must be applied void setValue(Geom::Point const & p); @@ -380,8 +380,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr ); // redefine setValue, because transform must be applied void setValue(Geom::Point const & p); @@ -411,8 +411,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr); void setValue (double val, long startseed); @@ -429,8 +429,8 @@ public: const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, - Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL); + Inkscape::XML::Node* repr_in = nullptr, + SPDocument *doc_in = nullptr); void setValue (Glib::ustring fontspec); |
