From 99e52b368eb03e2c8580bcaedb5b592ad49bb47c Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 4 Sep 2020 17:04:06 +0200 Subject: [PATCH] QStyle: remove deprecated SH_SpellCheckUnderlineStyle It was deprecated with 88e6f8cff2974c46b1262f3a1a61e1440c664e0c and is not used anywhere anymore so it can be safely removed. Change-Id: If4050ac8bf116fb31491b3b08096554c5ea3e4d5 Reviewed-by: Volker Hilsheimer --- src/plugins/styles/mac/qmacstyle_mac.mm | 3 --- src/widgets/styles/qcommonstyle.cpp | 3 --- src/widgets/styles/qstyle.cpp | 3 --- src/widgets/styles/qstyle.h | 1 - 4 files changed, 10 deletions(-) diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index b78a977e2a..7b34d3c8a7 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -2823,9 +2823,6 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w case SH_MessageBox_TextInteractionFlags: ret = Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse | Qt::TextSelectableByKeyboard; break; - case SH_SpellCheckUnderlineStyle: - ret = QTextCharFormat::DashUnderline; - break; case SH_MessageBox_CenterButtons: ret = false; break; diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 37f17f784a..bf4b383ab7 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5272,9 +5272,6 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) ret = theme->themeHint(QPlatformTheme::DialogButtonBoxButtonsHaveIcons).toBool() ? 1 : 0; break; - case SH_SpellCheckUnderlineStyle: - ret = QTextCharFormat::WaveUnderline; - break; case SH_MessageBox_CenterButtons: ret = true; break; diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 14dd8ad2be..5f58540eb6 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1814,9 +1814,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_UnderlineShortcut Whether shortcuts are underlined. - \value SH_SpellCheckUnderlineStyle Obsolete. Use SpellCheckUnderlineStyle - hint in QPlatformTheme instead. - \value SH_SpinBox_AnimateButton Animate a click when up or down is pressed in a spin box. \value SH_SpinBox_KeyPressAutoRepeatRate Auto-repeat interval for diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index b965309d92..0e3495306c 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -684,7 +684,6 @@ public: SH_ComboBox_PopupFrameStyle, SH_MessageBox_TextInteractionFlags, SH_DialogButtonBox_ButtonsHaveIcons, - SH_SpellCheckUnderlineStyle, SH_MessageBox_CenterButtons, SH_Menu_SelectionWrap, SH_ItemView_MovementWithoutUpdatingSelection,