From e65d94fe54e03f420035d7ebb55fc5d1896f077b Mon Sep 17 00:00:00 2001 From: Aloshi Date: Sun, 22 Sep 2013 19:40:51 -0500 Subject: [PATCH] Initialize std::functions with nullptr instead of NULL. --- src/components/AsyncReqComponent.h | 2 +- src/components/GuiGameScraper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AsyncReqComponent.h b/src/components/AsyncReqComponent.h index 47b43fdfb..55a5624f7 100644 --- a/src/components/AsyncReqComponent.h +++ b/src/components/AsyncReqComponent.h @@ -24,7 +24,7 @@ class AsyncReqComponent : public GuiComponent { public: - AsyncReqComponent(Window* window, std::shared_ptr req, std::function)> onSuccess, std::function onCancel = NULL); + AsyncReqComponent(Window* window, std::shared_ptr req, std::function)> onSuccess, std::function onCancel = nullptr); bool input(InputConfig* config, Input input) override; void update(int deltaTime) override; diff --git a/src/components/GuiGameScraper.h b/src/components/GuiGameScraper.h index c70052bed..db8d0191f 100644 --- a/src/components/GuiGameScraper.h +++ b/src/components/GuiGameScraper.h @@ -14,7 +14,7 @@ class GuiGameScraper : public GuiComponent { public: - GuiGameScraper(Window* window, ScraperSearchParams params, std::function doneFunc, std::function skipFunc = NULL); + GuiGameScraper(Window* window, ScraperSearchParams params, std::function doneFunc, std::function skipFunc = nullptr); bool input(InputConfig* config, Input input) override; void update(int deltaTime) override;