From 01e0f63c6aa1501b0a5aa0b499784c3942e6dd04 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 15 Mar 2024 07:15:31 +0200 Subject: [PATCH] drop QStyleOptionTabWidgetFrameV2 typedef Signed-off-by: Ivailo Monev --- CMakeLists.txt | 1 - package/freebsd/pkg-plist | 1 - scripts/incfsck.py | 1 - scripts/namefsck.py | 1 - src/gui/styles/qstyleoption.cpp | 7 ------- src/gui/styles/qstyleoption.h | 3 +-- src/gui/styles/qstylesheetstyle.cpp | 2 +- src/gui/widgets/qtabwidget.cpp | 10 +++++----- 8 files changed, 7 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5048e2a30..7e9577d06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -651,7 +651,6 @@ katie_generate_obsolete(QStyleOptionTab QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionTabV2 QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionTabV3 QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionTabWidgetFrame QtGui qstyleoption.h) -katie_generate_obsolete(QStyleOptionTabWidgetFrameV2 QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionTitleBar QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionToolBar QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionToolBox QtGui qstyleoption.h) diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index 9164198cd..f61fd9422 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -542,7 +542,6 @@ include/katie/QtGui/QStyleOptionTabBarBase include/katie/QtGui/QStyleOptionTabV2 include/katie/QtGui/QStyleOptionTabV3 include/katie/QtGui/QStyleOptionTabWidgetFrame -include/katie/QtGui/QStyleOptionTabWidgetFrameV2 include/katie/QtGui/QStyleOptionTitleBar include/katie/QtGui/QStyleOptionToolBar include/katie/QtGui/QStyleOptionToolBox diff --git a/scripts/incfsck.py b/scripts/incfsck.py index a3f224965..66d1a904f 100755 --- a/scripts/incfsck.py +++ b/scripts/incfsck.py @@ -204,7 +204,6 @@ incmap = { 'QStyleOptionTabV2': 'qstyleoption.h', 'QStyleOptionTabV3': 'qstyleoption.h', 'QStyleOptionTabWidgetFrame': 'qstyleoption.h', - 'QStyleOptionTabWidgetFrameV2': 'qstyleoption.h', 'QStyleOptionTitleBar': 'qstyleoption.h', 'QStyleOptionToolBar': 'qstyleoption.h', 'QStyleOptionToolBox': 'qstyleoption.h', diff --git a/scripts/namefsck.py b/scripts/namefsck.py index aa0c9ad99..0bbf8a809 100755 --- a/scripts/namefsck.py +++ b/scripts/namefsck.py @@ -428,7 +428,6 @@ classlist = [ "QStyleOptionTabV2", "QStyleOptionTabV3", "QStyleOptionTabWidgetFrame", - "QStyleOptionTabWidgetFrameV2", "QStyleOptionTitleBar", "QStyleOptionToolBar", "QStyleOptionToolBox", diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index 83ce6e45d..9a83e3734 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -3171,13 +3171,6 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version) \sa QStyleOption, QTabWidget */ -/*! - \typedef QStyleOptionTabWidgetFrameV2 - \relates QStyleOptionTabWidgetFrame - - Synonym for QStyleOptionTabWidgetFrame. -*/ - /*! Constructs a QStyleOptionTabWidgetFrame, initializing the members variables to their default values. diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h index 7cca74da1..045df59d4 100644 --- a/src/gui/styles/qstyleoption.h +++ b/src/gui/styles/qstyleoption.h @@ -144,7 +144,6 @@ public: protected: QStyleOptionTabWidgetFrame(int version); }; -typedef QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2; #endif // QT_NO_TABWIDGET @@ -166,7 +165,7 @@ public: protected: QStyleOptionTabBarBase(int version); }; -#endif// QT_NO_TABBAR +#endif // QT_NO_TABBAR class Q_GUI_EXPORT QStyleOptionHeader : public QStyleOption { diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index befdfd878..8f42a543d 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4294,7 +4294,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op QRenderRule subRule = renderRule(w, opt, PseudoElement_TabWidgetPane); if (subRule.hasNativeBorder()) { subRule.drawBackground(p, opt->rect); - QStyleOptionTabWidgetFrameV2 frmCopy(*frm); + QStyleOptionTabWidgetFrame frmCopy(*frm); subRule.configurePalette(&frmCopy.palette, QPalette::WindowText, QPalette::Window); baseStyle()->drawPrimitive(pe, &frmCopy, p, w); } else { diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp index 2bd494009..c2df13d82 100644 --- a/src/gui/widgets/qtabwidget.cpp +++ b/src/gui/widgets/qtabwidget.cpp @@ -731,7 +731,7 @@ void QTabWidget::setUpLayout(bool onlyCheck) if (onlyCheck && !d->dirty) return; // nothing to do - QStyleOptionTabWidgetFrameV2 option; + QStyleOptionTabWidgetFrame option; initStyleOption(&option); // this must be done immediately, because QWidgetItem relies on it (even if !isVisible()) @@ -780,7 +780,7 @@ QSize QTabWidget::sizeHint() const { Q_D(const QTabWidget); QSize lc(0, 0), rc(0, 0); - QStyleOptionTabWidgetFrameV2 opt; + QStyleOptionTabWidgetFrame opt; initStyleOption(&opt); opt.state = QStyle::State_None; @@ -829,7 +829,7 @@ QSize QTabWidget::minimumSizeHint() const QSize sz = basicSize(d->pos == North || d->pos == South, lc, rc, s, t); - QStyleOptionTabWidgetFrameV2 opt; + QStyleOptionTabWidgetFrame opt; initStyleOption(&opt); opt.palette = palette(); opt.state = QStyle::State_None; @@ -844,7 +844,7 @@ QSize QTabWidget::minimumSizeHint() const int QTabWidget::heightForWidth(int width) const { Q_D(const QTabWidget); - QStyleOptionTabWidgetFrameV2 opt; + QStyleOptionTabWidgetFrame opt; initStyleOption(&opt); opt.state = QStyle::State_None; @@ -1187,7 +1187,7 @@ void QTabWidget::paintEvent(QPaintEvent *) } QStylePainter p(this); - QStyleOptionTabWidgetFrameV2 opt; + QStyleOptionTabWidgetFrame opt; initStyleOption(&opt); opt.rect = d->panelRect; p.drawPrimitive(QStyle::PE_FrameTabWidget, opt);