summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorBenjamin Ni <benjaminniri@hotmail.com>2015-09-25 11:41:53 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-02 23:40:57 +0100
commitbe729e772196f33543e21cb9bac21add87726b20 (patch)
treef2150f458e2b07f8924b4702d37c09c8dd52215a /desktop
parent6ccf68622e51c1b727dd042c1c1a71b5d1fd6a12 (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 'desktop')
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 35bdd1701e6c..fd183ace4af2 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -85,7 +85,7 @@ void getOwnUpdateInfos(
UpdateInfoMap& inout_map, std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors,
bool & out_allFound)
{
- bool allHaveOwnUpdateInformation = true;
+ bool bAllHaveOwnUpdateInformation = true;
for (UpdateInfoMap::iterator i = inout_map.begin(); i != inout_map.end(); ++i)
{
OSL_ASSERT(i->second.extension.is());
@@ -122,10 +122,10 @@ void getOwnUpdateInfos(
}
else
{
- allHaveOwnUpdateInformation &= false;
+ bAllHaveOwnUpdateInformation &= false;
}
}
- out_allFound = allHaveOwnUpdateInformation;
+ out_allFound = bAllHaveOwnUpdateInformation;
}
void getDefaultUpdateInfos(
@@ -186,16 +186,16 @@ bool onlyBundledExtensions(
std::vector< Reference<deployment::XPackage > > const * extensionList)
{
OSL_ASSERT(xExtMgr.is());
- bool onlyBundled = true;
+ bool bOnlyBundled = true;
if (extensionList)
{
typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT;
- for (CIT i(extensionList->begin()), aEnd(extensionList->end()); onlyBundled && i != aEnd; ++i)
+ for (CIT i(extensionList->begin()), aEnd(extensionList->end()); bOnlyBundled && i != aEnd; ++i)
{
Sequence<Reference<deployment::XPackage> > seqExt = xExtMgr->getExtensionsWithSameIdentifier(
dp_misc::getIdentifier(*i), (*i)->getName(), Reference<ucb::XCommandEnvironment>());
- onlyBundled = containsBundledOnly(seqExt);
+ bOnlyBundled = containsBundledOnly(seqExt);
}
}
else
@@ -203,12 +203,12 @@ bool onlyBundledExtensions(
const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt =
xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>());
- for (int pos(0), nLen(seqAllExt.getLength()); onlyBundled && pos != nLen; ++pos)
+ for (int pos(0), nLen(seqAllExt.getLength()); bOnlyBundled && pos != nLen; ++pos)
{
- onlyBundled = containsBundledOnly(seqAllExt[pos]);
+ bOnlyBundled = containsBundledOnly(seqAllExt[pos]);
}
}
- return onlyBundled;
+ return bOnlyBundled;
}
} // anon namespace
@@ -381,10 +381,10 @@ UpdateInfoMap getOnlineUpdateInfos(
//Now find the update information for the extensions which provide their own
//URLs to update information.
- bool allInfosObtained = false;
- getOwnUpdateInfos(xContext, updateInformation, infoMap, out_errors, allInfosObtained);
+ bool bAllInfosObtained = false;
+ getOwnUpdateInfos(xContext, updateInformation, infoMap, out_errors, bAllInfosObtained);
- if (!allInfosObtained)
+ if (!bAllInfosObtained)
getDefaultUpdateInfos(xContext, updateInformation, infoMap, out_errors);
return infoMap;
}