diff options
author | Benjamin Ni <benjaminniri@hotmail.com> | 2015-09-25 11:41:53 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-11-02 23:40:57 +0100 |
commit | be729e772196f33543e21cb9bac21add87726b20 (patch) | |
tree | f2150f458e2b07f8924b4702d37c09c8dd52215a /configmgr | |
parent | 6ccf68622e51c1b727dd042c1c1a71b5d1fd6a12 (diff) |
tdf#94269: Replace "n" prefix for bool variables with "b"
Change-Id: I178545792c7354a362658ac7ef8b1d4cf0865797
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/source/childaccess.cxx | 8 | ||||
-rw-r--r-- | configmgr/source/components.cxx | 6 | ||||
-rw-r--r-- | configmgr/source/partial.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 7295f8908b1b..756bc21d1f9d 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -212,13 +212,13 @@ void ChildAccess::setProperty( { assert(localModifications != 0); Type type = TYPE_ERROR; - bool nillable = false; + bool isNillable = false; switch (node_->kind()) { case Node::KIND_PROPERTY: { PropertyNode * prop = static_cast< PropertyNode * >(node_.get()); type = prop->getStaticType(); - nillable = prop->isNillable(); + isNillable = prop->isNillable(); } break; case Node::KIND_LOCALIZED_PROPERTY: @@ -241,13 +241,13 @@ void ChildAccess::setProperty( LocalizedPropertyNode * locprop = static_cast< LocalizedPropertyNode * >(getParentNode().get()); type = locprop->getStaticType(); - nillable = locprop->isNillable(); + isNillable = locprop->isNillable(); } break; default: break; } - checkValue(value, type, nillable); + checkValue(value, type, isNillable); getParentAccess()->markChildAsModified(this); changedValue_.reset(new css::uno::Any(value)); localModifications->add(getRelativePath()); diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 40e1eb610ff2..386b272428f1 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -770,17 +770,17 @@ void Components::parseXcdFiles(int layer, OUString const & url) { } } while (!unres.empty()) { - bool resolved = false; + bool isResolved = false; for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) { if (i->manager->parse(&existingDeps)) { processedDeps.insert(i->name); unres.erase(i++); - resolved = true; + isResolved = true; } else { ++i; } } - if (!resolved) { + if (!isResolved) { throw css::uno::RuntimeException( "xcd: unresolved dependencies in " + url); } diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx index 44537aae5f7a..14ba0d61343c 100644 --- a/configmgr/source/partial.cxx +++ b/configmgr/source/partial.cxx @@ -120,18 +120,18 @@ Partial::Containment Partial::contains(Path const & path) const { // ** If there is some startInclude along its trace: => CONTAINS_NODE // ** If there is no startInclude along its trace: => CONTAINS_SUBNODES Node const * p = &root_; - bool includes = false; + bool bIncludes = false; for (Path::const_iterator i(path.begin()); i != path.end(); ++i) { Node::Children::const_iterator j(p->children.find(*i)); if (j == p->children.end()) { return p->startInclude ? CONTAINS_NODE : CONTAINS_NOT; } p = &j->second; - includes |= p->startInclude; + bIncludes |= p->startInclude; } return p->children.empty() && !p->startInclude ? CONTAINS_NOT - : includes ? CONTAINS_NODE : CONTAINS_SUBNODES; + : bIncludes ? CONTAINS_NODE : CONTAINS_SUBNODES; } } |