From d6a9571641bcb34acb3521feb08eea33195fd9ca Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 25 Dec 2017 13:59:47 -0500 Subject: Use nullptr --- src/gui/WindowFactory.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/gui/WindowFactory.cpp') diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 814123fb..3e3ba199 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -41,11 +41,11 @@ namespace GUI { WindowFactory::WindowFactory(App& app) : _app(app) - , _main_box(NULL) - , _load_plugin_win(NULL) - , _load_graph_win(NULL) - , _new_subgraph_win(NULL) - , _properties_win(NULL) + , _main_box(nullptr) + , _load_plugin_win(nullptr) + , _load_graph_win(nullptr) + , _new_subgraph_win(nullptr) + , _properties_win(nullptr) { WidgetFactory::get_widget_derived("load_plugin_win", _load_plugin_win); WidgetFactory::get_widget_derived("load_graph_win", _load_graph_win); @@ -108,18 +108,18 @@ GraphWindow* WindowFactory::graph_window(SPtr graph) { if (!graph) - return NULL; + return nullptr; GraphWindowMap::iterator w = _graph_windows.find(graph->path()); - return (w == _graph_windows.end()) ? NULL : w->second; + return (w == _graph_windows.end()) ? nullptr : w->second; } GraphWindow* WindowFactory::parent_graph_window(SPtr block) { if (!block) - return NULL; + return nullptr; return graph_window(dynamic_ptr_cast(block->parent())); } @@ -162,11 +162,11 @@ WindowFactory::new_graph_window(SPtr graph, { assert(!view || view->graph() == graph); - GraphWindow* win = NULL; + GraphWindow* win = nullptr; WidgetFactory::get_widget_derived("graph_win", win); if (!win) { _app.log().error("Failed to load graph window widget\n"); - return NULL; + return nullptr; } win->init_window(_app); -- cgit v1.2.1