Remove deprecated PE_IndicatorViewItemCheck and PE_FrameStatusBar

They have been marked as deprecated since 5.13, and can be removed from Qt 6 codebase, which silences the respective compiler warnings. Change-Id: I3443c7bfa8db148b0b48957e2adc5eb131197faf Reviewed-by: Timur Pocheptsov <[email protected]>
dougcooper · Oct 9, 2019 · 0e12c8b · 0e12c8b
1 parent b5ff4c9
commit 0e12c8b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp
@@ -248,7 +248,7 @@ QAndroidStyle::ItemType QAndroidStyle::qtControl(QStyle::PrimitiveElement primit
     case QStyle::PE_FrameLineEdit:
         return QC_EditText;
 
-    case QStyle::PE_IndicatorViewItemCheck:
+    case QStyle::PE_IndicatorItemViewItemCheck:
     case QStyle::PE_IndicatorCheckBox:
         return QC_Checkbox;
 

diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -3211,7 +3211,7 @@ const QPen arrowPen(opt->palette.text(), penWidth,
 
         CGContextRestoreGState(cg);
         break; }
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
     case PE_IndicatorRadioButton:
     case PE_IndicatorCheckBox: {
         const bool isEnabled = opt->state & State_Enabled;

diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
@@ -2130,7 +2130,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
             painter->restore();
             break;
         }
-        case PE_IndicatorViewItemCheck: {
+        case PE_IndicatorItemViewItemCheck: {
             break;
         }
         case PE_FrameWindow: {

diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -1837,7 +1837,7 @@
     item views keep the dimensions on individual sections. Also
     note that the delegates may use the style to paint decorations
     and frames around items. QItemDelegate, for instance, draws
-    \c PE_FrameFocusRect and \c PE_IndicatorViewItemCheck.
+    \c PE_FrameFocusRect and \c PE_IndicatorItemViewItemCheck.
 
     \image javastyle/header.png
 

diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
@@ -638,7 +638,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     indicator or button bevel.
 
     \omitvalue PE_IndicatorViewItemCheck
-    \value PE_FrameStatusBar  Obsolete. Use PE_FrameStatusBarItem instead.
 
     \value PE_PanelButtonCommand  Button used to initiate an action, for
         example, a QPushButton.

diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
@@ -142,9 +142,6 @@ class Q_WIDGETS_EXPORT QStyle : public QObject
         PE_FrameLineEdit,
         PE_FrameMenu,
         PE_FrameStatusBarItem,
-#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
-        PE_FrameStatusBar Q_DECL_ENUMERATOR_DEPRECATED = PE_FrameStatusBarItem,
-#endif
         PE_FrameTabWidget,
         PE_FrameWindow,
         PE_FrameButtonBevel,
@@ -165,9 +162,6 @@ class Q_WIDGETS_EXPORT QStyle : public QObject
         PE_IndicatorBranch,
         PE_IndicatorButtonDropDown,
         PE_IndicatorItemViewItemCheck,
-#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
-        PE_IndicatorViewItemCheck Q_DECL_ENUMERATOR_DEPRECATED = PE_IndicatorItemViewItemCheck,
-#endif
         PE_IndicatorCheckBox,
         PE_IndicatorDockWidgetResizeHandle,
         PE_IndicatorHeaderArrow,