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

drop QStyleOptionDockWidgetV2 typedef

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-15 06:43:20 +02:00
parent 8a4d7aa3c4
commit adbf98fb08
10 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -633,7 +633,6 @@ katie_generate_obsolete(QStyleOptionButton QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionComboBox QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionComboBox QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionComplex QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionComplex QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionDockWidget QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionDockWidget QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionDockWidgetV2 QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionFocusRect QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionFocusRect QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionFrame QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionFrame QtGui qstyleoption.h)
katie_generate_obsolete(QStyleOptionFrameV2 QtGui qstyleoption.h) katie_generate_obsolete(QStyleOptionFrameV2 QtGui qstyleoption.h)

1
package/freebsd/pkg-plist
View file

@ -524,7 +524,6 @@ include/katie/QtGui/QStyleOptionButton
include/katie/QtGui/QStyleOptionComboBox include/katie/QtGui/QStyleOptionComboBox
include/katie/QtGui/QStyleOptionComplex include/katie/QtGui/QStyleOptionComplex
include/katie/QtGui/QStyleOptionDockWidget include/katie/QtGui/QStyleOptionDockWidget
include/katie/QtGui/QStyleOptionDockWidgetV2
include/katie/QtGui/QStyleOptionFocusRect include/katie/QtGui/QStyleOptionFocusRect
include/katie/QtGui/QStyleOptionFrame include/katie/QtGui/QStyleOptionFrame
include/katie/QtGui/QStyleOptionFrameV2 include/katie/QtGui/QStyleOptionFrameV2

1
scripts/incfsck.py
View file

@ -186,7 +186,6 @@ incmap = {
'QStyleOptionComboBox': 'qstyleoption.h', 'QStyleOptionComboBox': 'qstyleoption.h',
'QStyleOptionComplex': 'qstyleoption.h', 'QStyleOptionComplex': 'qstyleoption.h',
'QStyleOptionDockWidget': 'qstyleoption.h', 'QStyleOptionDockWidget': 'qstyleoption.h',
'QStyleOptionDockWidgetV2': 'qstyleoption.h',
'QStyleOptionFocusRect': 'qstyleoption.h', 'QStyleOptionFocusRect': 'qstyleoption.h',
'QStyleOptionFrame': 'qstyleoption.h', 'QStyleOptionFrame': 'qstyleoption.h',
'QStyleOptionFrameV2': 'qstyleoption.h', 'QStyleOptionFrameV2': 'qstyleoption.h',

1
scripts/namefsck.py
View file

@ -410,7 +410,6 @@ classlist = [
"QStyleOptionComboBox", "QStyleOptionComboBox",
"QStyleOptionComplex", "QStyleOptionComplex",
"QStyleOptionDockWidget", "QStyleOptionDockWidget",
"QStyleOptionDockWidgetV2",
"QStyleOptionFocusRect", "QStyleOptionFocusRect",
"QStyleOptionFrame", "QStyleOptionFrame",
"QStyleOptionFrameV2", "QStyleOptionFrameV2",

5
src/gui/styles/qcleanlooksstyle.cpp
View file

@ -3956,9 +3956,8 @@ QRect QCleanlooksStyle::subElementRect(SubElement sr, const QStyleOption *opt, c
r.adjust(0, 1, 0, -1); r.adjust(0, 1, 0, -1);
break; break;
case SE_DockWidgetTitleBarText: { case SE_DockWidgetTitleBarText: {
const QStyleOptionDockWidgetV2 *v2 const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt); bool verticalTitleBar = dwOpt == 0 ? false : dwOpt->verticalTitleBar;
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
if (verticalTitleBar) { if (verticalTitleBar) {
r.adjust(0, 0, 0, -4); r.adjust(0, 0, 0, -4);
} else { } else {

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

@ -2178,13 +2178,6 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
\sa QStyleOption \sa QStyleOption
*/ */
/*!
\typedef QStyleOptionDockWidgetV2
\relates QStyleOptionDockWidget
Synonym for QStyleOptionDockWidget.
*/
/*! /*!
Constructs a QStyleOptionDockWidget, initializing the member Constructs a QStyleOptionDockWidget, initializing the member
variables to their default values. variables to their default values.

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

@ -356,7 +356,6 @@ public:
protected: protected:
QStyleOptionDockWidget(int version); QStyleOptionDockWidget(int version);
}; };
typedef QStyleOptionDockWidget QStyleOptionDockWidgetV2;
#ifndef QT_NO_ITEMVIEWS #ifndef QT_NO_ITEMVIEWS
class Q_GUI_EXPORT QStyleOptionViewItem : public QStyleOption class Q_GUI_EXPORT QStyleOptionViewItem : public QStyleOption

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

@ -1925,7 +1925,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QWidget *w, const QStyleOption *o
} }
#endif // QT_NO_TOOLBOX #endif // QT_NO_TOOLBOX
#ifndef QT_NO_DOCKWIDGET #ifndef QT_NO_DOCKWIDGET
else if (const QStyleOptionDockWidgetV2 *dw = qstyleoption_cast<const QStyleOptionDockWidgetV2 *>(opt)) { else if (const QStyleOptionDockWidget *dw = qstyleoption_cast<const QStyleOptionDockWidget *>(opt)) {
if (dw->verticalTitleBar) if (dw->verticalTitleBar)
extraClass |= PseudoClass_Vertical; extraClass |= PseudoClass_Vertical;
else else
@ -3931,14 +3931,14 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
break; break;
case CE_DockWidgetTitle: case CE_DockWidgetTitle:
if (const QStyleOptionDockWidgetV2 *dwOpt = qstyleoption_cast<const QStyleOptionDockWidgetV2 *>(opt)) { if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(opt)) {
QRenderRule subRule = renderRule(w, opt, PseudoElement_DockWidgetTitle); QRenderRule subRule = renderRule(w, opt, PseudoElement_DockWidgetTitle);
if (!subRule.hasDrawable() && !subRule.hasPosition()) if (!subRule.hasDrawable() && !subRule.hasPosition())
break; break;
if (subRule.hasDrawable()) { if (subRule.hasDrawable()) {
subRule.drawRule(p, opt->rect); subRule.drawRule(p, opt->rect);
} else { } else {
QStyleOptionDockWidgetV2 dwCopy(*dwOpt); QStyleOptionDockWidget dwCopy(*dwOpt);
dwCopy.title = QString(); dwCopy.title = QString();
baseStyle()->drawControl(ce, &dwCopy, p, w); baseStyle()->drawControl(ce, &dwCopy, p, w);
} }

5
src/gui/styles/qwindowsstyle.cpp
View file

@ -1893,9 +1893,8 @@ QRect QWindowsStyle::subElementRect(SubElement sr, const QStyleOption *opt, cons
break; break;
case SE_DockWidgetTitleBarText: { case SE_DockWidgetTitleBarText: {
r = QCommonStyle::subElementRect(sr, opt, w); r = QCommonStyle::subElementRect(sr, opt, w);
const QStyleOptionDockWidgetV2 *v2 const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt); bool verticalTitleBar = dwOpt == 0 ? false : dwOpt->verticalTitleBar;
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
int m = proxy()->pixelMetric(PM_DockWidgetTitleMargin, opt, w); int m = proxy()->pixelMetric(PM_DockWidgetTitleMargin, opt, w);
if (verticalTitleBar) { if (verticalTitleBar) {
r.adjust(0, 0, 0, -m); r.adjust(0, 0, 0, -m);

4
src/gui/widgets/qdockwidget.cpp
View file

@ -454,7 +454,7 @@ void QDockWidgetLayout::setGeometry(const QRect &geometry)
if (QLayoutItem *item = item_list[TitleBar]) { if (QLayoutItem *item = item_list[TitleBar]) {
item->setGeometry(_titleArea); item->setGeometry(_titleArea);
} else { } else {
QStyleOptionDockWidgetV2 opt; QStyleOptionDockWidget opt;
q->initStyleOption(&opt); q->initStyleOption(&opt);
if (QLayoutItem *item = item_list[CloseButton]) { if (QLayoutItem *item = item_list[CloseButton]) {
@ -1261,7 +1261,7 @@ void QDockWidget::paintEvent(QPaintEvent *event)
// Title must be painted after the frame, since the areas overlap, and // Title must be painted after the frame, since the areas overlap, and
// the title may wish to extend out to all sides (eg. XP style) // the title may wish to extend out to all sides (eg. XP style)
QStyleOptionDockWidgetV2 titleOpt; QStyleOptionDockWidget titleOpt;
initStyleOption(&titleOpt); initStyleOption(&titleOpt);
p.drawControl(QStyle::CE_DockWidgetTitle, titleOpt); p.drawControl(QStyle::CE_DockWidgetTitle, titleOpt);
} }