[Libreoffice-commits] core.git: configmgr/source

[Stephan Bergmann (via logerrit)]

 configmgr/source/components.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8fa958d7d7f454cbea83fdafdde295ffd960787e
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed May 6 16:24:48 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed May 6 17:22:18 2020 +0200

    "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 at redhat.com>

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);
         }