diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-01 21:50:36 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-04 06:50:30 +0000 |
| commit | 21c7879df078256ea42c4f5480679a5a01281abc (patch) | |
| tree | c13693ed2e9590886ae9ee694cb6af5ba6c547c4 | |
| parent | 9eabf54818504b74771e4fd3e06e6bdcf37afb9d (diff) | |
Fix warning about && inside ||
stackedbarchartitem.cpp:172:38: warning: '&&' within '||' [-Wlogical-op-parentheses]
Change-Id: I27b55fdf514247549455fffd14b17b67ae3feb34
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp | 4 | ||||
| -rw-r--r-- | src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp index 211aa4e5..7b1a57e9 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp @@ -165,8 +165,8 @@ QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout() if (m_animation && value != 0.0) { const QRectF &checkRect = m_layout.at(bar->layoutIndex()); if (checkRect.isEmpty() && - (value < 0.0 && !qFuzzyCompare(checkRect.right(), rect.right()) - || value > 0.0 && !qFuzzyCompare(checkRect.left(), rect.left()))) { + ((value < 0.0 && !qFuzzyCompare(checkRect.right(), rect.right())) + || (value > 0.0 && !qFuzzyCompare(checkRect.left(), rect.left())))) { initializeLayout(set, category, bar->layoutIndex(), true); } } diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp index 51ab680d..bf809d56 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -169,8 +169,8 @@ QVector<QRectF> StackedBarChartItem::calculateLayout() if (m_animation && value != 0.0) { const QRectF &checkRect = m_layout.at(bar->layoutIndex()); if (checkRect.isEmpty() && - (value < 0.0 && !qFuzzyCompare(checkRect.top(), rect.top()) - || value > 0.0 && !qFuzzyCompare(checkRect.bottom(), rect.bottom()))) { + ((value < 0.0 && !qFuzzyCompare(checkRect.top(), rect.top())) + || (value > 0.0 && !qFuzzyCompare(checkRect.bottom(), rect.bottom())))) { initializeLayout(set, category, bar->layoutIndex(), true); } } |