diff options
| author | Alessandro Portale <alessandro.portale@digia.com> | 2014-09-09 15:18:54 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2014-10-09 09:43:26 +0200 |
| commit | 106487387d493dab934e19b33bfed55b8df62d67 (patch) | |
| tree | ac2dfad985759a609454179082de9f7e97e1b73d /src/widgets | |
| parent | e5f528fb0ea09ec839853575c1154f9101303a84 (diff) | |
Removing a few unneeded "? true : false"
Change-Id: Ib13f0ddd65fe78f5559f343f2fc30756b1d3ef76
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/accessible/qaccessiblemenu.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
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 |