From ef96489edeaa9dc9f29f5d5a1ba6e96e0c7b3d45 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 15 Oct 2014 21:21:08 +0200 Subject: Fix instances of !var & const that should be !(var & const) GCC recently started warning about these. Change-Id: I7b30c79f7f2b66b99e54354224700d54ace6ebec Reviewed-by: Jens Bache-Wiig Reviewed-by: Friedemann Kleint Reviewed-by: Gunnar Sletta --- src/gui/painting/qpainter.cpp | 2 +- src/widgets/styles/qgtkstyle.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 57079a5b21..f151463e30 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -6362,7 +6362,7 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText return; const QPainter::RenderHints oldRenderHints = state->renderHints; - if (!state->renderHints & QPainter::Antialiasing && state->matrix.type() >= QTransform::TxScale) { + if (!(state->renderHints & QPainter::Antialiasing) && state->matrix.type() >= QTransform::TxScale) { // draw antialias decoration (underline/overline/strikeout) with // transformed text diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 6f2a2046b7..9e120e3b57 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -1049,7 +1049,7 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element, // The reason for this is that a lot of code that relies on custom item delegates will look odd having // a gradient on the branch but a flat shaded color on the item itself. QCommonStyle::drawPrimitive(element, option, painter, widget); - if (!option->state & State_Selected) { + if (!(option->state & State_Selected)) { break; } else { if (const QAbstractItemView *view = qobject_cast(widget)) { -- cgit v1.2.3