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

remove QMenuItem, QDockSeparator and QDockWidgetSeparator leftovers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-12 21:33:53 +00:00
parent 36a1648ade
commit dc70cebb6e
6 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/kernel/qwidget.cpp
View file

@ -5582,7 +5582,7 @@ void QWidget::setFocus(Qt::FocusReason reason)
QApplicationPrivate::setFocusWidget(f, reason); QApplicationPrivate::setFocusWidget(f, reason);
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
// menus update the focus manually and this would create bogus events // menus update the focus manually and this would create bogus events
if (!(f->inherits("QMenuBar") || f->inherits("QMenu") || f->inherits("QMenuItem"))) if (!(f->inherits("QMenuBar") || f->inherits("QMenu")))
QAccessible::updateAccessibility(f, 0, QAccessible::Focus); QAccessible::updateAccessibility(f, 0, QAccessible::Focus);
#endif #endif
#ifndef QT_NO_GRAPHICSVIEW #ifndef QT_NO_GRAPHICSVIEW

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

@ -3858,10 +3858,7 @@ void QCleanlooksStyle::polish(QWidget *widget)
#ifndef QT_NO_SPINBOX #ifndef QT_NO_SPINBOX
|| qobject_cast<QAbstractSpinBox *>(widget) || qobject_cast<QAbstractSpinBox *>(widget)
#endif #endif
|| (widget->inherits("QWorkspaceChild")) || (widget->inherits("QWorkspaceChild"))) {
|| (widget->inherits("QDockSeparator"))
|| (widget->inherits("QDockWidgetSeparator"))
) {
widget->setAttribute(Qt::WA_Hover, true); widget->setAttribute(Qt::WA_Hover, true);
} }
} }
@ -3905,10 +3902,7 @@ void QCleanlooksStyle::unpolish(QWidget *widget)
#ifndef QT_NO_SPINBOX #ifndef QT_NO_SPINBOX
|| qobject_cast<QAbstractSpinBox *>(widget) || qobject_cast<QAbstractSpinBox *>(widget)
#endif #endif
|| (widget->inherits("QWorkspaceChild")) || widget->inherits("QWorkspaceChild")) {
|| (widget->inherits("QDockSeparator"))
|| (widget->inherits("QDockWidgetSeparator"))
) {
widget->setAttribute(Qt::WA_Hover, false); widget->setAttribute(Qt::WA_Hover, false);
} }
} }

8
src/gui/styles/qplastiquestyle.cpp
View file

@ -5600,9 +5600,7 @@ void QPlastiqueStyle::polish(QWidget *widget)
widget->setAttribute(Qt::WA_Hover); widget->setAttribute(Qt::WA_Hover);
} }
if (widget->inherits("QWorkspaceTitleBar") if (widget->inherits("QWorkspaceTitleBar")) {
|| widget->inherits("QDockSeparator")
|| widget->inherits("QDockWidgetSeparator")) {
widget->setAttribute(Qt::WA_Hover); widget->setAttribute(Qt::WA_Hover);
} }
@ -5655,9 +5653,7 @@ void QPlastiqueStyle::unpolish(QWidget *widget)
widget->setAttribute(Qt::WA_Hover, false); widget->setAttribute(Qt::WA_Hover, false);
} }
if (widget->inherits("QWorkspaceTitleBar") if (widget->inherits("QWorkspaceTitleBar")) {
|| widget->inherits("QDockSeparator")
|| widget->inherits("QDockWidgetSeparator")) {
widget->setAttribute(Qt::WA_Hover, false); widget->setAttribute(Qt::WA_Hover, false);
} }

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

@ -1466,7 +1466,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value CT_Menu A menu, like QMenu. \value CT_Menu A menu, like QMenu.
\value CT_MenuBar A menu bar, like QMenuBar. \value CT_MenuBar A menu bar, like QMenuBar.
\value CT_MenuBarItem A menu bar item, like the buttons in a QMenuBar. \value CT_MenuBarItem A menu bar item, like the buttons in a QMenuBar.
\value CT_MenuItem A menu item, like QMenuItem. \value CT_MenuItem A menu item, like QAction.
\value CT_ProgressBar A progress bar, like QProgressBar. \value CT_ProgressBar A progress bar, like QProgressBar.
\value CT_PushButton A push button, like QPushButton. \value CT_PushButton A push button, like QPushButton.
\value CT_RadioButton A radio button, like QRadioButton. \value CT_RadioButton A radio button, like QRadioButton.

12
src/gui/widgets/qmenu.cpp
View file

@ -3146,12 +3146,6 @@ void QMenu::setSeparatorsCollapsible(bool collapse)
*/ */
/*!
\fn QMenuItem *QMenu::findItem(int id) const
Use actions instead.
*/
/*! /*!
\fn void QMenu::popup(const QPoint & pos, int indexAtPoint) \fn void QMenu::popup(const QPoint & pos, int indexAtPoint)
@ -3182,12 +3176,6 @@ void QMenu::setSeparatorsCollapsible(bool collapse)
Use actionGeometry(actions().value(index)).height() instead. Use actionGeometry(actions().value(index)).height() instead.
*/ */
/*!
\fn int QMenu::itemHeight(QMenuItem *mi)
Use actionGeometry() instead.
*/
/*! /*!
\fn void QMenu::activated(int itemId); \fn void QMenu::activated(int itemId);

6
src/gui/widgets/qmenubar.cpp
View file

@ -1961,12 +1961,6 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
Use disconnect() on the relevant QAction instead. Use disconnect() on the relevant QAction instead.
*/ */
/*!
\fn QMenuItem *QMenuBar::findItem(int id) const
Use actions instead.
*/
/*! /*!
\fn Separator QMenuBar::separator() const \fn Separator QMenuBar::separator() const