From 25bb667cff3cdd5d2a446f5eea036f9084a3fa17 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:16:46 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: Idb2987dc7641c5b07d8bb99546cf5e5402032476 --- i18nlangtag/source/isolang/inunx.cxx | 4 ++-- i18nlangtag/source/isolang/isolang.cxx | 14 +++++++------- i18nlangtag/source/languagetag/languagetag.cxx | 8 ++++---- include/i18nlangtag/languagetag.hxx | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx index fd62c9462c37..fb91b090222b 100644 --- a/i18nlangtag/source/isolang/inunx.cxx +++ b/i18nlangtag/source/isolang/inunx.cxx @@ -45,7 +45,7 @@ static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; static const sal_Char* getLangFromEnvironment() { static const sal_Char* pFallback = "C"; - const sal_Char *pLang = NULL; + const sal_Char *pLang = nullptr; pLang = getenv ( "LC_ALL" ); if (! pLang || pLang[0] == 0) @@ -64,7 +64,7 @@ static const sal_Char* getLangFromEnvironment() static const sal_Char* getUILangFromEnvironment() { static const sal_Char* pFallback = "C"; - const sal_Char *pLang = NULL; + const sal_Char *pLang = nullptr; pLang = getenv ( "LANGUAGE" ); // respect the GNU extension if (! pLang || pLang[0] == 0) diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index d5589be49ce6..3b50dd58d994 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -904,7 +904,7 @@ static IsoLangOtherEntry const aImplOtherEntries[] = { LANGUAGE_KOREAN, "korean" }, { LANGUAGE_ENGLISH_US, "posix" }, { LANGUAGE_CHINESE_TRADITIONAL, "tchinese" }, - { LANGUAGE_DONTKNOW, NULL } // marks end of table + { LANGUAGE_DONTKNOW, nullptr } // marks end of table }; @@ -915,7 +915,7 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] = { LANGUAGE_USER_PRIV_DEFAULT, "x-default" }, { LANGUAGE_USER_PRIV_COMMENT, "x-comment" }, { LANGUAGE_USER_PRIV_JOKER, "*" }, //! not BCP47 but transferable in configmgr - { LANGUAGE_DONTKNOW, NULL } // marks end of table + { LANGUAGE_DONTKNOW, nullptr } // marks end of table }; @@ -924,8 +924,8 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] = void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang, css::lang::Locale & rLocale, bool bIgnoreOverride ) { - const IsoLanguageScriptCountryEntry* pScriptEntryOverride = NULL; - const IsoLanguageCountryEntry* pEntryOverride = NULL; + const IsoLanguageScriptCountryEntry* pScriptEntryOverride = nullptr; + const IsoLanguageCountryEntry* pEntryOverride = nullptr; Label_Override_Lang_Locale: @@ -1053,7 +1053,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale( } // Search in ISO lll-Ssss-CC - const IsoLanguageScriptCountryEntry* pFirstScript = NULL; + const IsoLanguageScriptCountryEntry* pFirstScript = nullptr; for (const IsoLanguageScriptCountryEntry* pScriptEntry = aImplIsoLangScriptEntries; pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry) { @@ -1097,7 +1097,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale( } // Search for locale and remember first lang-only. - const IsoLanguageCountryEntry* pFirstLang = NULL; + const IsoLanguageCountryEntry* pFirstLang = nullptr; const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; for ( ; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) { @@ -1271,7 +1271,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL OUString aUpperCountry = rCountry.toAsciiUpperCase(); // first look for exact match - const IsoLanguageCountryEntry* pFirstLang = NULL; + const IsoLanguageCountryEntry* pFirstLang = nullptr; for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) { diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 2b3567dd2766..bca22d5c1732 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; struct myLtError { lt_error_t* p; - myLtError() : p(NULL) {} + myLtError() : p(nullptr) {} ~myLtError() { if (p) lt_error_unref( p); } }; @@ -369,7 +369,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & rLanguageTag ) : maLocale( rLanguageTag.maLocale), maBcp47( rLanguageTag.maBcp47), - mpImplLangtag( NULL), + mpImplLangtag( nullptr), mnLangID( rLanguageTag.mnLangID), meIsValid( DECISION_DONTKNOW), meIsIsoLocale( DECISION_DONTKNOW), @@ -396,7 +396,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & rLanguageTagImpl ) maCachedCountry( rLanguageTagImpl.maCachedCountry), maCachedVariants( rLanguageTagImpl.maCachedVariants), mpImplLangtag( rLanguageTagImpl.mpImplLangtag ? - lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL), + lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr), mnLangID( rLanguageTagImpl.mnLangID), meIsValid( rLanguageTagImpl.meIsValid), meIsIsoLocale( rLanguageTagImpl.meIsIsoLocale), @@ -429,7 +429,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const LanguageTagImpl & rLanguageTa maCachedVariants = rLanguageTagImpl.maCachedVariants; lt_tag_t * oldTag = mpImplLangtag; mpImplLangtag = rLanguageTagImpl.mpImplLangtag ? - lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL; + lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr; lt_tag_unref(oldTag); mnLangID = rLanguageTagImpl.mnLangID; meIsValid = rLanguageTagImpl.meIsValid; diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index 03531d8c374c..0c54bfd6d110 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -498,7 +498,7 @@ public: private use, like 'x-...', are not allowed and FALSE is returned in this case. */ - static bool isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = NULL, + static bool isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = nullptr, bool bDisallowPrivate = false ); /** If nLang is a generated on-the-fly LangID */ -- cgit