diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-02 14:39:28 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-03 09:52:10 (GMT) |
| commit | 6e0565eaa293b84f7583947822fe5939cb47af89 (patch) | |
| tree | f477b285412fb7bec0c27b006eba961b7245929d | |
| parent | 2808823eafe3b9773a84039c38e9f149a578a4f3 (diff) | |
| download | Qt-6e0565eaa293b84f7583947822fe5939cb47af89.zip Qt-6e0565eaa293b84f7583947822fe5939cb47af89.tar.gz Qt-6e0565eaa293b84f7583947822fe5939cb47af89.tar.bz2 | |
remove a warning on windows and simplify a bit the code
| -rw-r--r-- | src/gui/dialogs/qfontdialog.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index a4bf15d..b987611 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -988,13 +988,10 @@ void QFontDialog::open(QObject *receiver, const char *member) */ void QFontDialog::setVisible(bool visible) { - Q_D(QFontDialog); - if (visible) { - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden)) - return; - } else if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) + if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden) != visible) return; #ifdef Q_WS_MAC + Q_D(QFontDialog); if (d->canBeNativeDialog()){ if (d->setVisible_sys(visible)){ d->nativeDialogInUse = true; |