summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-27 15:27:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-27 15:30:54 +0200
commit510f056d3c85cbb9965f85c4c4c57542b462e01e (patch)
treef6235ab9eff58b6cf661a4fd716cf0fd37de7fab /desktop
parent756a93250bce8d424992cad6e9164398cf6703aa (diff)
More loplugin:simplifybool
Change-Id: If4b4f706152876e8b5631343fc7e39eeaa04964b
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx4
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 203c061ff315..adcb6c740fa3 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -511,7 +511,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
approve = true;
}
- if (approve == false && abort == false)
+ if (!approve && !abort)
{
// forward to UUI handler:
if (! m_xHandler.is()) {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index b9500a1a4a35..ade275724174 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1180,7 +1180,7 @@ void ExtensionBox_Impl::checkEntries()
ITER iIndex = m_vEntries.begin();
while ( iIndex < m_vEntries.end() )
{
- if ( (*iIndex)->m_bChecked == false )
+ if ( !(*iIndex)->m_bChecked )
{
(*iIndex)->m_bChecked = true;
bNeedsUpdate = true;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 0dd3e5a97c5e..e844e35fa5bd 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -657,7 +657,7 @@ void UpdateCommandEnv::handle(
approve = true;
}
- if (approve == false)
+ if (!approve)
{
//forward to interaction handler for main dialog.
handleInteractionRequest( m_xContext, xRequest );
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 8393890e435b..0f84ee89076e 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -76,7 +76,7 @@ void BaseCommandEnv::handle(
void BaseCommandEnv::handle_(bool approve, bool abort,
Reference< task::XInteractionRequest> const & xRequest )
{
- if (approve == false && abort == false)
+ if (!approve && !abort)
{
//not handled so far -> forwarding
if (m_forwardHandler.is())
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 3ce55eaf0252..4ec7b373a61c 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -362,7 +362,7 @@ UpdateInfoMap getOnlineUpdateInfos(
std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
UpdateInfoMap::value_type(
dp_misc::getIdentifier(extension), UpdateInfo(extension)));
- OSL_ASSERT(insertRet.second == true);
+ OSL_ASSERT(insertRet.second);
(void)insertRet;
}
}
@@ -375,7 +375,7 @@ UpdateInfoMap getOnlineUpdateInfos(
std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
UpdateInfoMap::value_type(
dp_misc::getIdentifier(*i), UpdateInfo(*i)));
- OSL_ASSERT(insertRet.second == true);
+ OSL_ASSERT(insertRet.second);
(void)insertRet;
}
}
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index b37b1fd96551..ff52a843ed95 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -706,7 +706,7 @@ bool BackendImpl::PackageImpl::checkLicense(
throw css::deployment::DeploymentException(
"Could not interact with user.", 0, Any());
- if (approve == true)
+ if (approve)
return true;
else
return false;