1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated PE_IndicatorViewItemCheck and PE_FrameStatusBar

Browse Source 
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 <timur.pocheptsov@qt.io>
This commit is contained in:
Volker Hilsheimer 2019-10-09 12:40:10 +02:00
parent b5ff4c9f18
commit 0e12c8b020
6 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/styles/android/qandroidstyle.cpp
View File

@ -248,7 +248,7 @@ QAndroidStyle::ItemType QAndroidStyle::qtControl(QStyle::PrimitiveElement primit
case QStyle::PE_FrameLineEdit: case QStyle::PE_FrameLineEdit:
return QC_EditText; return QC_EditText;
case QStyle::PE_IndicatorViewItemCheck: case QStyle::PE_IndicatorItemViewItemCheck:
case QStyle::PE_IndicatorCheckBox: case QStyle::PE_IndicatorCheckBox:
return QC_Checkbox; return QC_Checkbox;

2
src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -3211,7 +3211,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
CGContextRestoreGState(cg); CGContextRestoreGState(cg);
break; } break; }
case PE_IndicatorViewItemCheck: case PE_IndicatorItemViewItemCheck:
case PE_IndicatorRadioButton: case PE_IndicatorRadioButton:
case PE_IndicatorCheckBox: { case PE_IndicatorCheckBox: {
const bool isEnabled = opt->state & State_Enabled; const bool isEnabled = opt->state & State_Enabled;

2
src/widgets/doc/snippets/javastyle.cpp
View File

@ -2130,7 +2130,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
painter->restore(); painter->restore();
break; break;
} }
case PE_IndicatorViewItemCheck: { case PE_IndicatorItemViewItemCheck: {
break; break;
} }
case PE_FrameWindow: { case PE_FrameWindow: {

2
src/widgets/doc/src/widgets-and-layouts/styles.qdoc
View File

@ -1837,7 +1837,7 @@
item views keep the dimensions on individual sections. Also item views keep the dimensions on individual sections. Also
note that the delegates may use the style to paint decorations note that the delegates may use the style to paint decorations
and frames around items. QItemDelegate, for instance, draws 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 \image javastyle/header.png

1
src/widgets/styles/qstyle.cpp
View File

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

6
src/widgets/styles/qstyle.h
View File

@ -142,9 +142,6 @@ public:
PE_FrameLineEdit, PE_FrameLineEdit,
PE_FrameMenu, PE_FrameMenu,
PE_FrameStatusBarItem, PE_FrameStatusBarItem,
#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
PE_FrameStatusBar Q_DECL_ENUMERATOR_DEPRECATED = PE_FrameStatusBarItem,
#endif
PE_FrameTabWidget, PE_FrameTabWidget,
PE_FrameWindow, PE_FrameWindow,
PE_FrameButtonBevel, PE_FrameButtonBevel,
@ -165,9 +162,6 @@ public:
PE_IndicatorBranch, PE_IndicatorBranch,
PE_IndicatorButtonDropDown, PE_IndicatorButtonDropDown,
PE_IndicatorItemViewItemCheck, PE_IndicatorItemViewItemCheck,
#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
PE_IndicatorViewItemCheck Q_DECL_ENUMERATOR_DEPRECATED = PE_IndicatorItemViewItemCheck,
#endif
PE_IndicatorCheckBox, PE_IndicatorCheckBox,
PE_IndicatorDockWidgetResizeHandle, PE_IndicatorDockWidgetResizeHandle,
PE_IndicatorHeaderArrow, PE_IndicatorHeaderArrow,