Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 2 insertions, 2 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
index bda3040..a0da399 100644
--- a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
@@ -51,7 +51,7 @@ void CompleterItemDelegate::paintIcon(QPainter* painter, const QStyleOptionViewI
     iconRect.setSize(iconSize + QSize(spacer*2, spacer*2));
     iconRect.setTopLeft(iconRect.topLeft() + QPoint(spacer, spacer));
 
-    QIcon::State state = option.state & QStyle::State_Open ? QIcon::On : QIcon::Off;
+    QIcon::State state = (option.state & QStyle::State_Open) ? QIcon::On : QIcon::Off;
     icon.paint(painter, iconRect, option.decorationAlignment, mode, state);
 }
 
@@ -60,7 +60,7 @@ void CompleterItemDelegate::paintText(QPainter* painter, const QStyleOptionViewI
     painter->save();
 
     // Colors
-    QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
+    QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ? QPalette::Normal : QPalette::Disabled;
     if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
         cg = QPalette::Inactive;