summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-05-06 16:24:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-05-06 17:22:18 +0200
commit8fa958d7d7f454cbea83fdafdde295ffd960787e (patch)
treedae854a6f78cbcd8d1eac2fb77654b83e7bea23f /configmgr
parent023621fea5dff2713abe42312b04edc9531426d4 (diff)
"resolved" is a better name than "isResolved" here
...as the variable is true if any of the unresolved depedencies got resolved now, rather than anything specific that "is resolved" now. This partially reverts be729e772196f33543e21cb9bac21add87726b20 "tdf#94269: Replace 'n' prefix for bool variables with 'b'". Change-Id: I14c0b3872aaf320baedb349b1cfdd1ed29417dfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93569 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/components.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5dfb8c281cb7..7f629bc8afbe 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -796,17 +796,17 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
}
}
while (!unres.empty()) {
- bool isResolved = false;
+ bool resolved = false;
for (UnresolvedVector::iterator i(unres.begin()); i != unres.end();) {
if (i->manager->parse(&existingDeps)) {
processedDeps.insert(i->name);
i = unres.erase(i);
- isResolved = true;
+ resolved = true;
} else {
++i;
}
}
- if (!isResolved) {
+ if (!resolved) {
throw css::uno::RuntimeException(
"xcd: unresolved dependencies in " + url);
}