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

Add static_cast for QKeyEvent

Browse Source 
Use static_cast to convert a QEvent to a QKeyEvent,
replacing (QKeyEvent*)e

Change-Id: I52ac3f46aec42600251cf737db2e71c04f2b45c7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 223cf01cc6700c08c1a0e44a1aaa82f04b1f615b)
This commit is contained in:
Lu YaNing 2022-12-12 14:45:09 +08:00 committed by Volker Hilsheimer
parent 04695824f0
commit c0f756da3f
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qfontdialog.cpp
View File

@ -390,7 +390,7 @@ bool QFontDialog::eventFilter(QObject *o , QEvent *e)
{
Q_D(QFontDialog);
if (e->type() == QEvent::KeyPress) {
QKeyEvent *k = (QKeyEvent *)e;
QKeyEvent *k = static_cast<QKeyEvent *>(e);
if (o == d->sizeEdit &&
(k->key() == Qt::Key_Up ||
k->key() == Qt::Key_Down ||

2
src/widgets/dialogs/qsidebar.cpp
View File

@ -470,7 +470,7 @@ void QSidebar::focusInEvent(QFocusEvent *event)
bool QSidebar::event(QEvent * event)
{
if (event->type() == QEvent::KeyRelease) {
QKeyEvent* ke = (QKeyEvent*) event;
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
if (ke->key() == Qt::Key_Delete) {
removeEntry();
return true;

2
src/widgets/kernel/qwhatsthis.cpp
View File

@ -428,7 +428,7 @@ bool QWhatsThisPrivate::eventFilter(QObject *o, QEvent *e)
break;
case QEvent::KeyPress:
{
QKeyEvent* kev = (QKeyEvent*)e;
QKeyEvent *kev = static_cast<QKeyEvent *>(e);
#if QT_CONFIG(shortcut)
if (kev->matches(QKeySequence::Cancel)) {
QWhatsThis::leaveWhatsThisMode();

2
src/widgets/kernel/qwidget.cpp
View File

@ -8867,7 +8867,7 @@ bool QWidget::event(QEvent *event)
break;
#endif
case QEvent::KeyPress: {
QKeyEvent *k = (QKeyEvent *)event;
QKeyEvent *k = static_cast<QKeyEvent *>(event);
bool res = false;
if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { //### Add MetaModifier?
if (k->key() == Qt::Key_Backtab

2
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -727,7 +727,7 @@ bool QCalendarTextNavigator::eventFilter(QObject *o, QEvent *e)
{
if (m_widget) {
if (e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease) {
QKeyEvent* ke = (QKeyEvent*)e;
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
if ((ke->text().size() > 0 && ke->text().at(0).isPrint()) || m_dateFrame) {
if (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Select) {
applyDate();

2
src/widgets/widgets/qeffects.cpp
View File

@ -171,7 +171,7 @@ bool QAlphaWidget::eventFilter(QObject *o, QEvent *e)
break;
case QEvent::KeyPress: {
#ifndef QT_NO_SHORTCUT
QKeyEvent *ke = (QKeyEvent*)e;
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
if (ke->matches(QKeySequence::Cancel)) {
showWidget = false;
} else

4
src/widgets/widgets/qmenu.cpp
View File

@ -2939,7 +2939,7 @@ bool QMenu::event(QEvent *e)
d->updateLayoutDirection();
break;
case QEvent::ShortcutOverride: {
QKeyEvent *kev = static_cast<QKeyEvent*>(e);
QKeyEvent *kev = static_cast<QKeyEvent *>(e);
if (kev->key() == Qt::Key_Up || kev->key() == Qt::Key_Down
|| kev->key() == Qt::Key_Left || kev->key() == Qt::Key_Right
|| kev->key() == Qt::Key_Enter || kev->key() == Qt::Key_Return
@ -2953,7 +2953,7 @@ bool QMenu::event(QEvent *e)
}
break;
case QEvent::KeyPress: {
QKeyEvent *ke = (QKeyEvent*)e;
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) {
keyPressEvent(ke);
return true;

4
src/widgets/widgets/qmenubar.cpp
View File

@ -1356,7 +1356,7 @@ bool QMenuBar::event(QEvent *e)
Q_D(QMenuBar);
switch (e->type()) {
case QEvent::KeyPress: {
QKeyEvent *ke = (QKeyEvent*)e;
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
#if 0
if (!d->keyboardState) { //all keypresses..
d->setCurrentAction(0);
@ -1384,7 +1384,7 @@ bool QMenuBar::event(QEvent *e)
break;
#ifndef QT_NO_SHORTCUT
case QEvent::ShortcutOverride: {
QKeyEvent *kev = static_cast<QKeyEvent*>(e);
QKeyEvent *kev = static_cast<QKeyEvent *>(e);
//we only filter out escape if there is a current action
if (kev->matches(QKeySequence::Cancel) && d->currentAction) {
e->accept();