From 6244d73850074631ceaaccdf7f755970323f8de2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 29 Sep 2018 12:34:41 +0200 Subject: Use nullptr --- src/gui/Arc.cpp | 2 +- src/gui/GraphBox.cpp | 2 +- src/gui/GraphTreeWindow.hpp | 2 +- src/gui/WindowFactory.cpp | 2 +- src/gui/WindowFactory.hpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp index db8b3a85..339a1248 100644 --- a/src/gui/Arc.cpp +++ b/src/gui/Arc.cpp @@ -34,7 +34,7 @@ Arc::Arc(Ganv::Canvas& canvas, SPtr tparent_block; if ((tparent_block = dynamic_ptr_cast(tparent))) { if (tparent_block->plugin_uri() == NS_INTERNALS "BlockDelay") { - g_object_set(_gobj, "dash-length", 4.0, NULL); + g_object_set(_gobj, "dash-length", 4.0, nullptr); set_constraining(false); } } diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index be076f6c..966e8b9c 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -265,7 +265,7 @@ GraphBox::set_graph_from_path(const Raul::Path& path, SPtr view) /** Sets the graph for this box and initializes everything. * - * If `view` is NULL, a new view will be created. + * If `view` is null, a new view will be created. */ void GraphBox::set_graph(SPtr graph, diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index 9ab05f94..0df5d01c 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -98,7 +98,7 @@ public: GraphTreeView(BaseObjectType* cobject, const Glib::RefPtr& xml) : Gtk::TreeView(cobject) - , _window(NULL) + , _window(nullptr) {} void set_window(GraphTreeWindow* win) { _window = win; } diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index c5f9c089..06c8266a 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -130,7 +130,7 @@ WindowFactory::parent_graph_window(SPtr block) /** Present a GraphWindow for a Graph. * - * If `preferred` is not NULL, it will be set to display `graph` if the graph + * If `preferred` is not null, it will be set to display `graph` if the graph * does not already have a visible window, otherwise that window will be * presented and `preferred` left unmodified. */ diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index a6ddb682..4e71c7cf 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -61,7 +61,7 @@ public: void present_graph( SPtr graph, - GraphWindow* preferred = NULL, + GraphWindow* preferred = nullptr, SPtr view = SPtr()); void present_load_plugin(SPtr graph, Properties data=Properties()); @@ -71,7 +71,7 @@ public: void present_rename(SPtr object); void present_properties(SPtr object); - bool remove_graph_window(GraphWindow* win, GdkEventAny* ignored = NULL); + bool remove_graph_window(GraphWindow* win, GdkEventAny* ignored = nullptr); void set_main_box(GraphBox* box) { _main_box = box; } -- cgit v1.2.1