diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-06-23 12:40:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-23 12:40:16 -0700 |
| commit | 85d1f2c2f9f1e746bedb1b6f03576613f54fbc27 (patch) | |
| tree | ff5b393fb9b89f006327bee7bc8c955522defb67 /xfa/fgas/localization | |
| parent | 6e12478cb298c3a8277493ee79ae0b73d6df8554 (diff) | |
| download | pdfium-85d1f2c2f9f1e746bedb1b6f03576613f54fbc27.tar.xz | |
Remove NULL in xfa/
This CL converts all NULL's to nullptr. All instances of comparison to nullptr
have been removed.
Review-Url: https://codereview.chromium.org/2095653002
Diffstat (limited to 'xfa/fgas/localization')
| -rw-r--r-- | xfa/fgas/localization/fgas_datetime.cpp | 4 | ||||
| -rw-r--r-- | xfa/fgas/localization/fgas_locale.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/xfa/fgas/localization/fgas_datetime.cpp b/xfa/fgas/localization/fgas_datetime.cpp index f3c560b823..f658d3597d 100644 --- a/xfa/fgas/localization/fgas_datetime.cpp +++ b/xfa/fgas/localization/fgas_datetime.cpp @@ -142,7 +142,7 @@ void CFX_Unitime::Now() { #elif _FX_OS_ != _FX_EMBEDDED_ #if 1 timeval curTime; - gettimeofday(&curTime, NULL); + gettimeofday(&curTime, nullptr); #else struct timespec curTime; clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &curTime); @@ -170,7 +170,7 @@ void CFX_Unitime::SetGMTime() { #elif _FX_OS_ != _FX_EMBEDDED_ #if 1 timeval curTime; - gettimeofday(&curTime, NULL); + gettimeofday(&curTime, nullptr); #else struct timespec curTime; clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &curTime); diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index ecd33e27cf..d61f6b53ed 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -478,7 +478,7 @@ CFX_WideString CFX_FormatString::GetLocaleName( IFX_Locale* CFX_FormatString::GetTextFormat(const CFX_WideString& wsPattern, const CFX_WideStringC& wsCategory, CFX_WideString& wsPurgePattern) { - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); const FX_WCHAR* pStr = wsPattern.c_str(); @@ -535,7 +535,7 @@ IFX_Locale* CFX_FormatString::GetNumericFormat(const CFX_WideString& wsPattern, uint32_t& dwStyle, CFX_WideString& wsPurgePattern) { dwStyle = 0; - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); const FX_WCHAR* pStr = wsPattern.c_str(); @@ -591,7 +591,7 @@ IFX_Locale* CFX_FormatString::GetNumericFormat(const CFX_WideString& wsPattern, if (!pLocale) { pLocale = m_pLocaleMgr->GetDefLocale(); } - ASSERT(pLocale != NULL); + ASSERT(pLocale); pLocale->GetNumPattern(eSubCategory, wsSubCategory); iDotIndex = wsSubCategory.Find('.'); if (iDotIndex > 0) { @@ -1922,7 +1922,7 @@ FX_DATETIMETYPE CFX_FormatString::GetDateTimeFormat( IFX_Locale*& pLocale, CFX_WideString& wsDatePattern, CFX_WideString& wsTimePattern) { - pLocale = NULL; + pLocale = nullptr; CFX_WideString wsTempPattern; FX_LOCALECATEGORY eCategory = FX_LOCALECATEGORY_Unknown; int32_t ccf = 0; @@ -2001,7 +2001,7 @@ FX_DATETIMETYPE CFX_FormatString::GetDateTimeFormat( if (!pLocale) { pLocale = m_pLocaleMgr->GetDefLocale(); } - ASSERT(pLocale != NULL); + ASSERT(pLocale); switch (eCategory) { case FX_LOCALECATEGORY_Date: pLocale->GetDatePattern(eSubCategory, wsDatePattern); @@ -2476,7 +2476,7 @@ FX_BOOL CFX_FormatString::ParseDateTime(const CFX_WideString& wsSrcDateTime, return FALSE; } CFX_WideString wsDatePattern, wsTimePattern; - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; FX_DATETIMETYPE eCategory = GetDateTimeFormat(wsPattern, pLocale, wsDatePattern, wsTimePattern); if (!pLocale) { @@ -3991,10 +3991,10 @@ FX_BOOL CFX_FormatString::FormatDateTime(const CFX_WideString& wsSrcDateTime, return FALSE; } CFX_WideString wsDatePattern, wsTimePattern; - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; FX_DATETIMETYPE eCategory = GetDateTimeFormat(wsPattern, pLocale, wsDatePattern, wsTimePattern); - if (pLocale == NULL || eCategory == FX_DATETIMETYPE_Unknown) { + if (!pLocale || eCategory == FX_DATETIMETYPE_Unknown) { return FALSE; } CFX_Unitime dt(0); @@ -4023,7 +4023,7 @@ FX_BOOL CFX_FormatString::FormatDateTime(const CFX_WideString& wsSrcDateTime, return FALSE; } CFX_WideString wsDatePattern, wsTimePattern; - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; FX_DATETIMETYPE eCategory = GetDateTimeFormat(wsPattern, pLocale, wsDatePattern, wsTimePattern); if (!pLocale) { @@ -4074,7 +4074,7 @@ FX_BOOL CFX_FormatString::FormatDateTime(const CFX_Unitime& dt, return FALSE; } CFX_WideString wsDatePattern, wsTimePattern; - IFX_Locale* pLocale = NULL; + IFX_Locale* pLocale = nullptr; FX_DATETIMETYPE eCategory = GetDateTimeFormat(wsPattern, pLocale, wsDatePattern, wsTimePattern); if (!pLocale) { |