diff options
| author | Andre Somers <andre.somers@kdab.com> | 2016-02-02 14:40:29 +0100 |
|---|---|---|
| committer | Andre Somers <andre@familiesomers.nl> | 2016-02-12 19:32:05 +0000 |
| commit | 0df5c366e50b9533fd8ea3f31c4c360ae7f4c5b6 (patch) | |
| tree | 301cb4fa308fb306f65ca2fa55a157ab6a46798d /src/widgets/widgets/qmdisubwindow.cpp | |
| parent | c5d49725779292a04fed599eb7f508d334ffc5c3 (diff) | |
Use QFlags::setFlag where prudent in qtbase
QFlags::setFlag is most useful to replace explicit constructs like
if (condition) {
someFlags |= TheConditionFlag;
} else {
someFlags &= ~TheConditionFlag;
}
with
someFlags.setFlag(TheConditionFlag, condition);
Change-Id: Ie4586681c83e0af812d5bbf14965aad51941a960
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/widgets/qmdisubwindow.cpp')
| -rw-r--r-- | src/widgets/widgets/qmdisubwindow.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index cda61e8181..610cb1201f 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -575,10 +575,7 @@ void ControllerWidget::setControlVisible(QMdiSubWindowPrivate::WindowStateAction if (subControl == QStyle::SC_None) return; - if (visible && !(visibleControls & subControl)) - visibleControls |= subControl; - else if (!visible && (visibleControls & subControl)) - visibleControls &= ~subControl; + visibleControls.setFlag(subControl, visible && !(visibleControls & subControl)); } /* @@ -2417,10 +2414,7 @@ bool QMdiSubWindow::isShaded() const void QMdiSubWindow::setOption(SubWindowOption option, bool on) { Q_D(QMdiSubWindow); - if (on && !(d->options & option)) - d->options |= option; - else if (!on && (d->options & option)) - d->options &= ~option; + d->options.setFlag(option, on); #ifndef QT_NO_RUBBERBAND if ((option & (RubberBandResize | RubberBandMove)) && !on && d->isInRubberBandMode) @@ -3172,10 +3166,7 @@ void QMdiSubWindow::paintEvent(QPaintEvent *paintEvent) QStyleOptionFrame frameOptions; frameOptions.initFrom(this); frameOptions.lineWidth = style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, 0, this); - if (d->isActive) - frameOptions.state |= QStyle::State_Active; - else - frameOptions.state &= ~QStyle::State_Active; + frameOptions.state.setFlag(QStyle::State_Active, d->isActive); // ### Ensure that we do not require setting the cliprect for 4.4 if (!isMinimized() && !d->hasBorder(d->cachedStyleOptions)) |