From 4997b22f84307521a62838f874928bf56cd3423c Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 7 Jun 2016 10:46:22 -0700 Subject: Get rid of NULLs in core/ Review-Url: https://codereview.chromium.org/2032613003 --- core/fxge/ge/fx_ge.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'core/fxge/ge/fx_ge.cpp') diff --git a/core/fxge/ge/fx_ge.cpp b/core/fxge/ge/fx_ge.cpp index 9e45dc7434..360a4eb417 100644 --- a/core/fxge/ge/fx_ge.cpp +++ b/core/fxge/ge/fx_ge.cpp @@ -8,20 +8,20 @@ #include "core/fxge/ge/fx_text_int.h" -static CFX_GEModule* g_pGEModule = NULL; +static CFX_GEModule* g_pGEModule = nullptr; CFX_GEModule::CFX_GEModule(const char** pUserFontPaths) { - m_pFontCache = NULL; - m_pFontMgr = NULL; - m_FTLibrary = NULL; - m_pCodecModule = NULL; - m_pPlatformData = NULL; + m_pFontCache = nullptr; + m_pFontMgr = nullptr; + m_FTLibrary = nullptr; + m_pCodecModule = nullptr; + m_pPlatformData = nullptr; m_pUserFontPaths = pUserFontPaths; } CFX_GEModule::~CFX_GEModule() { delete m_pFontCache; - m_pFontCache = NULL; + m_pFontCache = nullptr; delete m_pFontMgr; - m_pFontMgr = NULL; + m_pFontMgr = nullptr; DestroyPlatform(); } CFX_GEModule* CFX_GEModule::Get() { @@ -38,7 +38,7 @@ void CFX_GEModule::Use(CFX_GEModule* pModule) { } void CFX_GEModule::Destroy() { delete g_pGEModule; - g_pGEModule = NULL; + g_pGEModule = nullptr; } CFX_FontCache* CFX_GEModule::GetFontCache() { if (!m_pFontCache) { -- cgit v1.2.3