From 106487387d493dab934e19b33bfed55b8df62d67 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 9 Sep 2014 15:18:54 +0200 Subject: Removing a few unneeded "? true : false" Change-Id: Ib13f0ddd65fe78f5559f343f2fc30756b1d3ef76 Reviewed-by: Oswald Buddenhagen Reviewed-by: Orgad Shaneh Reviewed-by: Marc Mutz --- tests/auto/network/access/spdy/tst_spdy.cpp | 3 +-- .../graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 4 ++-- tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/network/access/spdy/tst_spdy.cpp b/tests/auto/network/access/spdy/tst_spdy.cpp index b68bb90123..34e5ab4a88 100644 --- a/tests/auto/network/access/spdy/tst_spdy.cpp +++ b/tests/auto/network/access/spdy/tst_spdy.cpp @@ -166,8 +166,7 @@ void tst_Spdy::settingsAndNegotiation() QFETCH(QByteArray, expectedProtocol); #ifndef QT_NO_OPENSSL - bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0) - ? true : false; + bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0); QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), expectedSpdyUsed); #endif // QT_NO_OPENSSL diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index ec3335e143..ab84c9e482 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -984,7 +984,7 @@ void tst_QGraphicsProxyWidget::hoverEnterLeaveEvent() // in QTest::mouseMove(&view, QPoint(50, 50)); QSKIP("QTBUG-25294"); - QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), hasWidget ? true : false); + QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), hasWidget); // ### this attribute isn't supported QCOMPARE(widget->enterCount, hasWidget ? 1 : 0); QCOMPARE(widget->hoverEnter, (hasWidget && hoverEnabled) ? 1 : 0); @@ -1366,7 +1366,7 @@ void tst_QGraphicsProxyWidget::sizeHint() void tst_QGraphicsProxyWidget::sizePolicy() { for (int p = 0; p < 2; ++p) { - bool hasWidget = (p == 0 ? true : false); + bool hasWidget = (p == 0); SubQGraphicsProxyWidget proxy; QWidget *widget = new QWidget; QSizePolicy proxyPol(QSizePolicy::Maximum, QSizePolicy::Expanding); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 1237cd708a..6428bbba10 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1080,7 +1080,7 @@ public: bool isEditingState(QListWidgetItem *item) { Q_UNUSED(item); - return (QListWidget::state() == QListWidget::EditingState ? true : false); + return QListWidget::state() == QListWidget::EditingState; } }; -- cgit v1.2.3