diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-16 11:08:13 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-16 15:00:37 +0200 |
commit | ea2ae140e99bbd21515a99c5480e53129ef843c3 (patch) | |
tree | 13e6fa8c6c5d012312e901d70c380439a3584fd8 /src/widgets/kernel/qapplication.cpp | |
parent | 044cb3ce20c3b29c0bd441a0575fa05a8d48ebae (diff) |
QtGui: Rename all QEvent members according to the m_ convention
As they are protected, they need to be excluded from the Python
bindings, which is best done by a pattern.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I667aa3b8e229e11b3b46635adfddbd62ce4747c1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 951fc9cd67..71e5ade234 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -835,9 +835,11 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis || cur.event->type() == QEvent::UpdateRequest) { ; } else if (cur.event->type() == QEvent::Resize) { - ((QResizeEvent *)(cur.event))->s = ((QResizeEvent *)event)->s; + static_cast<QResizeEvent *>(cur.event)->m_size = + static_cast<const QResizeEvent *>(event)->size(); } else if (cur.event->type() == QEvent::Move) { - ((QMoveEvent *)(cur.event))->p = ((QMoveEvent *)event)->p; + static_cast<QMoveEvent *>(cur.event)->m_pos = + static_cast<const QMoveEvent *>(event)->pos(); } else if (cur.event->type() == QEvent::LanguageChange) { ; } else { @@ -3207,7 +3209,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } if (w->isWindow()) break; - dragEvent->p = w->mapToParent(dragEvent->p); + dragEvent->m_pos = w->mapToParent(dragEvent->m_pos); w = w->parentWidget(); } } @@ -3232,7 +3234,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) QDropEvent *dragEvent = static_cast<QDropEvent *>(e); QWidget *origReciver = static_cast<QWidget *>(receiver); while (origReciver && w != origReciver) { - dragEvent->p = origReciver->mapToParent(dragEvent->p); + dragEvent->m_pos = origReciver->mapToParent(dragEvent->m_pos); origReciver = origReciver->parentWidget(); } } |