diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:51:49 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-17 19:57:54 +0000 |
commit | 86c5a337e3b123f2e41c8b15b416f39655519acd (patch) | |
tree | efa0f720a190889b3d31ddbd07cee0495b8a15d4 /src/widgets/widgets | |
parent | 47ca3f78139ad51a5018dcdad27fa5caf817f08d (diff) | |
parent | 6620045fcaada61a2897195f32c0ee35beebc37b (diff) |
Merge "Merge dev into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qcheckbox.cpp | 5 | ||||
-rw-r--r-- | src/widgets/widgets/qgroupbox.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 14 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 10 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 5 | ||||
-rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 5 | ||||
-rw-r--r-- | src/widgets/widgets/qmdisubwindow.cpp | 15 | ||||
-rw-r--r-- | src/widgets/widgets/qradiobutton.cpp | 5 |
8 files changed, 14 insertions, 51 deletions
diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index 6ce6d288ff..ad2d019c4a 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -177,10 +177,7 @@ void QCheckBox::initStyleOption(QStyleOptionButton *option) const else option->state |= d->checked ? QStyle::State_On : QStyle::State_Off; if (testAttribute(Qt::WA_Hover) && underMouse()) { - if (d->hovering) - option->state |= QStyle::State_MouseOver; - else - option->state &= ~QStyle::State_MouseOver; + option->state.setFlag(QStyle::State_MouseOver, d->hovering); } option->text = d->text; option->icon = d->icon; diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 0b4add4eb3..5bdd6f20e6 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -103,11 +103,7 @@ void QGroupBox::initStyleOption(QStyleOptionGroupBox *option) const option->activeSubControls |= d->pressedControl; option->subControls = QStyle::SC_GroupBoxFrame; - if (d->hover) - option->state |= QStyle::State_MouseOver; - else - option->state &= ~QStyle::State_MouseOver; - + option->state.setFlag(QStyle::State_MouseOver, d->hover); if (d->flat) option->features |= QStyleOptionFrame::Flat; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index fb2818de83..3cdd7dc0f0 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -568,16 +568,10 @@ void QLineEdit::setEchoMode(EchoMode mode) if (mode == (EchoMode)d->control->echoMode()) return; Qt::InputMethodHints imHints = inputMethodHints(); - if (mode == Password || mode == NoEcho) { - imHints |= Qt::ImhHiddenText; - } else { - imHints &= ~Qt::ImhHiddenText; - } - if (mode != Normal) { - imHints |= (Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText | Qt::ImhSensitiveData); - } else { - imHints &= ~(Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText | Qt::ImhSensitiveData); - } + imHints.setFlag(Qt::ImhHiddenText, mode == Password || mode == NoEcho); + imHints.setFlag(Qt::ImhNoAutoUppercase, mode != Normal); + imHints.setFlag(Qt::ImhNoPredictiveText, mode != Normal); + imHints.setFlag(Qt::ImhSensitiveData, mode != Normal); setInputMethodHints(imHints); d->control->setEchoMode(mode); update(); diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index a448f2fe72..4ee22dc235 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -922,10 +922,7 @@ void QMainWindow::setAnimated(bool enabled) Q_D(QMainWindow); DockOptions opts = d->layout->dockOptions; - if (enabled) - opts |= AnimatedDocks; - else - opts &= ~AnimatedDocks; + opts.setFlag(AnimatedDocks, enabled); d->layout->setDockOptions(opts); } @@ -961,10 +958,7 @@ void QMainWindow::setDockNestingEnabled(bool enabled) Q_D(QMainWindow); DockOptions opts = d->layout->dockOptions; - if (enabled) - opts |= AllowNestedDocks; - else - opts &= ~AllowNestedDocks; + opts.setFlag(AllowNestedDocks, enabled); d->layout->setDockOptions(opts); } diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index b695918406..ae87ea526d 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -375,10 +375,7 @@ void QDockWidgetGroupWindow::adjustFlags() Qt::WindowFlags flags = oldFlags; if (nativeDeco) { flags |= Qt::CustomizeWindowHint | Qt::WindowTitleHint; - if (top->features() & QDockWidget::DockWidgetClosable) - flags |= Qt::WindowCloseButtonHint; - else - flags &= ~Qt::WindowCloseButtonHint; + flags.setFlag(Qt::WindowCloseButtonHint, top->features() & QDockWidget::DockWidgetClosable); flags &= ~Qt::FramelessWindowHint; } else { flags |= Qt::FramelessWindowHint; diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index bb43abf34c..2b734b603f 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -2104,10 +2104,7 @@ void QMdiArea::setActivationOrder(WindowOrder order) void QMdiArea::setOption(AreaOption option, bool on) { Q_D(QMdiArea); - if (on && !(d->options & option)) - d->options |= option; - else if (!on && (d->options & option)) - d->options &= ~option; + d->options.setFlag(option, on); } /*! 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)) diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 37f8c2eef2..125182f79f 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -182,10 +182,7 @@ void QRadioButton::initStyleOption(QStyleOptionButton *option) const option->state |= QStyle::State_Sunken; option->state |= (d->checked) ? QStyle::State_On : QStyle::State_Off; if (testAttribute(Qt::WA_Hover) && underMouse()) { - if (d->hovering) - option->state |= QStyle::State_MouseOver; - else - option->state &= ~QStyle::State_MouseOver; + option->state.setFlag(QStyle::State_MouseOver, d->hovering); } } |