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 --- qmake/generators/win32/cesdkhandler.cpp | 2 +- src/corelib/io/qloggingregistry.cpp | 6 +++--- src/network/socket/qnativesocketengine_win.cpp | 2 +- src/plugins/imageformats/ico/qicohandler.cpp | 8 ++++---- src/sql/drivers/ibase/qsql_ibase.cpp | 2 +- src/testlib/qtestelementattribute.cpp | 2 +- src/tools/qdoc/config.cpp | 2 +- src/tools/qdoc/cppcodeparser.cpp | 2 +- src/tools/uic/ui4.cpp | 14 +++++++------- src/widgets/accessible/qaccessiblemenu.cpp | 2 +- src/widgets/widgets/qcombobox.cpp | 2 +- src/widgets/widgets/qmdiarea.cpp | 4 ++-- src/widgets/widgets/qwidgettextcontrol.cpp | 2 +- tests/auto/network/access/spdy/tst_spdy.cpp | 3 +-- .../qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 4 ++-- .../auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 2 +- tests/manual/qnetworkreply/main.cpp | 3 +-- 17 files changed, 30 insertions(+), 32 deletions(-) diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp index 97ee4eca09..f2e6758704 100644 --- a/qmake/generators/win32/cesdkhandler.cpp +++ b/qmake/generators/win32/cesdkhandler.cpp @@ -97,7 +97,7 @@ bool CeSdkHandler::parse() return false; } - return m_list.size() > 0 ? true : false; + return m_list.size() > 0; } QString CeSdkHandler::fixPaths(QString path) const diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 4ee3068e27..e9ee8d9458 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -391,9 +391,9 @@ void QLoggingRegistry::defaultCategoryFilter(QLoggingCategory *cat) Q_ASSERT(reg->categories.contains(cat)); QtMsgType enableForLevel = reg->categories.value(cat); - bool debug = (enableForLevel == QtDebugMsg) ? true : false; - bool warning = (enableForLevel <= QtWarningMsg) ? true : false; - bool critical = (enableForLevel <= QtCriticalMsg) ? true : false; + bool debug = (enableForLevel == QtDebugMsg); + bool warning = (enableForLevel <= QtWarningMsg); + bool critical = (enableForLevel <= QtCriticalMsg); // hard-wired implementation of // qt.*.debug=false diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 0d6af80858..85ec2012b8 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -1163,7 +1163,7 @@ bool QNativeSocketEnginePrivate::nativeHasPendingDatagrams() const timeout.tv_sec = 0; timeout.tv_usec = 5000; int available = ::select(1, &readS, 0, 0, &timeout); - result = available > 0 ? true : false; + result = available > 0; #endif #if defined (QNATIVESOCKETENGINE_DEBUG) diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 73deb00941..00de0c80ad 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -163,7 +163,7 @@ static bool writeIconDirEntry(QIODevice *iodev, const ICONDIRENTRY &iconEntry) qToLittleEndian(iconEntry.wBitCount, &tmp[6]); qToLittleEndian(iconEntry.dwBytesInRes, &tmp[8]); qToLittleEndian(iconEntry.dwImageOffset, &tmp[12]); - return (iodev->write((char*)tmp, ICONDIRENTRY_SIZE) == ICONDIRENTRY_SIZE) ? true : false; + return iodev->write((char*)tmp, ICONDIRENTRY_SIZE) == ICONDIRENTRY_SIZE; } return false; @@ -190,7 +190,7 @@ static bool writeIconDir(QIODevice *iodev, const ICONDIR &iconDir) qToLittleEndian(iconDir.idReserved, tmp); qToLittleEndian(iconDir.idType, &tmp[2]); qToLittleEndian(iconDir.idCount, &tmp[4]); - return (iodev->write((char*)tmp, 6) == 6) ? true : false; + return iodev->write((char*)tmp, 6) == 6; } return false; } @@ -233,7 +233,7 @@ static bool writeBMPInfoHeader(QIODevice *iodev, const BMP_INFOHDR &header) qToLittleEndian(header.biClrUsed, &tmp[32]); qToLittleEndian(header.biClrImportant, &tmp[36]); - return (iodev->write((char*)tmp, BMP_INFOHDR_SIZE) == BMP_INFOHDR_SIZE) ? true : false; + return iodev->write((char*)tmp, BMP_INFOHDR_SIZE) == BMP_INFOHDR_SIZE; } return false; } @@ -881,7 +881,7 @@ bool QtIcoHandler::jumpToImage(int imageNumber) m_currentIconIndex = imageNumber; } - return (imageNumber < imageCount()) ? true : false; + return imageNumber < imageCount(); } /*! \reimp diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index bb3ffe619e..cf1f927070 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -1679,7 +1679,7 @@ QSqlRecord QIBaseDriver::record(const QString& tablename) const f.setLength(q.value(2).toInt()); f.setPrecision(0); } - f.setRequired(q.value(5).toInt() > 0 ? true : false); + f.setRequired(q.value(5).toInt() > 0); f.setSqlType(type); rec.append(f); diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp index c84e8023f3..357902c285 100644 --- a/src/testlib/qtestelementattribute.cpp +++ b/src/testlib/qtestelementattribute.cpp @@ -162,7 +162,7 @@ bool QTestElementAttribute::setPair(QTest::AttributeIndex index, const char *val attributeIndex = index; attributeValue = qstrdup(value); - return (attributeValue!=0) ? true:false; + return attributeValue != 0; } QT_END_NAMESPACE diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp index 5c12458cac..51ab341869 100644 --- a/src/tools/qdoc/config.cpp +++ b/src/tools/qdoc/config.cpp @@ -1101,7 +1101,7 @@ void Config::load(Location location, const QString& fileName) ConfigVarMultimap::Iterator i; i = configVars_.insert(*key, ConfigVar(*key, rhsValues, QDir::currentPath(), keyLoc)); - i.value().plus_ = (plus ? true : false); + i.value().plus_ = plus; ++key; } } diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index 66dfa3290f..22aae609ae 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -1076,7 +1076,7 @@ bool CppCodeParser::skipTo(int target) { while ((tok != Tok_Eoi) && (tok != target)) readToken(); - return (tok == target ? true : false); + return tok == target; } /*! diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 352cd34b68..01b4437db7 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -3471,7 +3471,7 @@ void DomWidget::read(QXmlStreamReader &reader) continue; } if (name == QStringLiteral("native")) { - setAttributeNative((attribute.value().toString() == QStringLiteral("true") ? true : false)); + setAttributeNative(attribute.value().toString() == QStringLiteral("true")); continue; } reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString()); @@ -4845,23 +4845,23 @@ void DomFont::read(QXmlStreamReader &reader) continue; } if (tag == QStringLiteral("italic")) { - setElementItalic((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementItalic(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("bold")) { - setElementBold((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementBold(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("underline")) { - setElementUnderline((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementUnderline(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("strikeout")) { - setElementStrikeOut((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementStrikeOut(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("antialiasing")) { - setElementAntialiasing((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementAntialiasing(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("stylestrategy")) { @@ -4869,7 +4869,7 @@ void DomFont::read(QXmlStreamReader &reader) continue; } if (tag == QStringLiteral("kerning")) { - setElementKerning((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementKerning(reader.readElementText() == QStringLiteral("true")); continue; } reader.raiseError(QStringLiteral("Unexpected element ") + tag); diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index 2a8b364b1c..e5e784d483 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -198,7 +198,7 @@ int QAccessibleMenuItem::indexOfChild(const QAccessibleInterface * child) const bool QAccessibleMenuItem::isValid() const { - return m_action && m_owner ? true : false; + return m_action && m_owner; } QAccessibleInterface *QAccessibleMenuItem::parent() const diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 4db3ab38a6..2fa197b2c8 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -295,7 +295,7 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const { Q_Q(const QComboBox); if (!sh.isValid()) { - bool hasIcon = sizeAdjustPolicy == QComboBox::AdjustToMinimumContentsLengthWithIcon ? true : false; + bool hasIcon = sizeAdjustPolicy == QComboBox::AdjustToMinimumContentsLengthWithIcon; int count = q->count(); QSize iconSize = q->iconSize(); const QFontMetrics &fm = q->fontMetrics(); diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 431e67e7a8..1e291f469e 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -1466,7 +1466,7 @@ QMdiSubWindow *QMdiAreaPrivate::nextVisibleSubWindow(int increaseFactor, QMdiAre // Find the index for the current sub-window in the given activation order const int indexToCurrent = subWindows.indexOf(current); - const bool increasing = increaseFactor > 0 ? true : false; + const bool increasing = increaseFactor > 0; // and use that index + increseFactor as a candidate. int index = -1; @@ -2553,7 +2553,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event) if (!area) return QAbstractScrollArea::eventFilter(object, event); - const bool keyPress = (event->type() == QEvent::KeyPress) ? true : false; + const bool keyPress = (event->type() == QEvent::KeyPress); // 1) Ctrl-Tab once -> activate the previously active window. // 2) Ctrl-Tab (Tab, Tab, ...) -> iterate through all windows (activateNextSubWindow()). diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 4c11434fe9..dfec6a14d4 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -2188,7 +2188,7 @@ void QWidgetTextControlPrivate::editFocusEvent(QEvent *e) setBlinkingCursorEnabled(false); } - hasEditFocus = e->type() == QEvent::EnterEditFocus ? true : false; + hasEditFocus = e->type() == QEvent::EnterEditFocus; } #endif 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; } }; diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp index f3bbd0887f..9d199c3755 100644 --- a/tests/manual/qnetworkreply/main.cpp +++ b/tests/manual/qnetworkreply/main.cpp @@ -381,8 +381,7 @@ void tst_qnetworkreply::spdy() QFETCH(QByteArray, expectedProtocol); - bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0) - ? true : false; + bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0); QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), expectedSpdyUsed); QCOMPARE(metaDataChangedSpy.count(), 1); -- cgit v1.2.3