Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drop QStyleOptionTabWidgetFrameV2 typedef

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-15 07:15:31 +02:00
parent ada1c257f8
commit 01e0f63c6a
8 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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)

1
package/freebsd/pkg-plist
View file

@ -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

1
scripts/incfsck.py
View file

@ -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',

1
scripts/namefsck.py
View file

@ -428,7 +428,6 @@ classlist = [
"QStyleOptionTabV2",
"QStyleOptionTabV3",
"QStyleOptionTabWidgetFrame",
"QStyleOptionTabWidgetFrameV2",
"QStyleOptionTitleBar",
"QStyleOptionToolBar",
"QStyleOptionToolBox",

7
src/gui/styles/qstyleoption.cpp
View file

@ -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.

3
src/gui/styles/qstyleoption.h
View file

@ -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
{

2
src/gui/styles/qstylesheetstyle.cpp
View file

@ -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 {

10
src/gui/widgets/qtabwidget.cpp
View file

@ -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);