diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-02 15:42:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-05-05 12:47:48 +0200 |
| commit | 4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch) | |
| tree | b059d288339a68aa4c3901f1100e99b04d05a23d /forms | |
| parent | b4107411900f5bb4c215e2d9db09fc2b2b82939b (diff) | |
simplify ternary conditions "xxx ? yyy : false"
Look for code like:
xxx ? yyy : false;
Which can be simplified to:
xxx && yyy
Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/binding.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index cc8382d2a812..c1ad14096799 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -190,7 +190,7 @@ namespace frm continue; // is this item enabled? - bool bEnabled = m_pDispatcher ? m_pDispatcher->isEnabled( nItemId ) : false; + bool bEnabled = m_pDispatcher && m_pDispatcher->isEnabled( nItemId ); implEnableItem( nItemId, bEnabled ); } } diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index eb5ea49c78ff..72806b0593fb 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -498,7 +498,7 @@ void Binding::checkModel() bool Binding::isLive() const { const Model* pModel = getModelImpl(); - return ( pModel != NULL ) ? pModel->isInitialized() : false; + return pModel && pModel->isInitialized(); } Model* Binding::getModelImpl() const |