diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:18:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:30 +0100 |
| commit | 8980565881fcc484bb506b3135223b6a42aefbf0 (patch) | |
| tree | a7a51e0cb37b86a7eb5410d6f34c51821c41df32 /jvmfwk/source/fwkbase.cxx | |
| parent | 81da71b64098e3f0d5ebe61d0c94c73e316c21b3 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I9dfcec9488b2a25e32d3934766d6d4b208a8c2dc
Diffstat (limited to 'jvmfwk/source/fwkbase.cxx')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index ff178a18166a..b7d1d91cda2a 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -103,7 +103,7 @@ VendorSettings::VendorSettings(): if (!sSettingsPath.isEmpty()) { m_xmlDocVendorSettings = xmlParseFile(sSettingsPath.getStr()); - if (m_xmlDocVendorSettings == NULL) + if (m_xmlDocVendorSettings == nullptr) throw FrameworkException( JFW_E_ERROR, OString("[Java framework] Error while parsing file: ") @@ -179,7 +179,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) if (!xmlXPathNodeSetIsEmpty(xPathObjectVersions->nodesetval)) { xmlNode* cur = xPathObjectVersions->nodesetval->nodeTab[0]; - while (cur != NULL) + while (cur != nullptr) { if (cur->type == XML_ELEMENT_NODE ) { @@ -212,7 +212,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors() { //get the values of the vendor elements + name attribute xmlNode* cur = result->nodesetval->nodeTab[0]; - while (cur != NULL) + while (cur != nullptr) { //between vendor elements are also text elements if (cur->type == XML_ELEMENT_NODE) @@ -346,7 +346,7 @@ OUString BootParams::getJREHome() else if (bEnvJRE) { const char * pJRE = getenv("JAVA_HOME"); - if (pJRE == NULL) + if (pJRE == nullptr) { throw FrameworkException( JFW_E_CONFIGURATION, |