AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Beautify QApplication::compressEvent

Browse Source 
Replace if-statement to check compressable event types with a switch.
Replace if / else if sequence dispatching to type specific compression
code paths with a switch.
Replace iterated for loop with a ranged one.

Task-number: QTBUG-107808
Change-Id: I9054b625f1898fa793f78de1b477a2113a4e33f0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Axel Spoerl 2022-12-07 14:22:04 +01:00
parent 9e75a4cca3
commit b4653636a7
1 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/widgets/kernel/qapplication.cpp
View File

@ -776,35 +776,49 @@ QWidget *QApplication::widgetAt(const QPoint &p)
*/
bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents)
{
if ((event->type() == QEvent::UpdateRequest
|| event->type() == QEvent::LayoutRequest
|| event->type() == QEvent::Resize
|| event->type() == QEvent::Move
|| event->type() == QEvent::LanguageChange)) {
for (QPostEventList::const_iterator it = postedEvents->constBegin(); it != postedEvents->constEnd(); ++it) {
const QPostEvent &cur = *it;
if (cur.receiver != receiver || cur.event == nullptr || cur.event->type() != event->type())
continue;
if (cur.event->type() == QEvent::LayoutRequest
|| cur.event->type() == QEvent::UpdateRequest) {
;
} else if (cur.event->type() == QEvent::Resize) {
static_cast<QResizeEvent *>(cur.event)->m_size =
static_cast<const QResizeEvent *>(event)->size();
} else if (cur.event->type() == QEvent::Move) {
static_cast<QMoveEvent *>(cur.event)->m_pos =
static_cast<const QMoveEvent *>(event)->pos();
} else if (cur.event->type() == QEvent::LanguageChange) {
;
} else {
continue;
}
delete event;
return true;
}
return false;
// Only compress the following events:
const QEvent::Type type = event->type();
switch (type) {
case QEvent::UpdateRequest:
case QEvent::LayoutRequest:
case QEvent::Resize:
case QEvent::Move:
case QEvent::LanguageChange:
break;
default:
return QGuiApplication::compressEvent(event, receiver, postedEvents);
}
return QGuiApplication::compressEvent(event, receiver, postedEvents);
for (const auto &postedEvent : std::as_const(*postedEvents)) {
// Continue, unless a valid event of the same type exists for the same receiver
if (postedEvent.receiver != receiver
|| !postedEvent.event
|| postedEvent.event->type() != type) {
continue;
}
// Handle type specific compression
switch (type) {
case QEvent::Resize:
static_cast<QResizeEvent *>(postedEvent.event)->m_size =
static_cast<const QResizeEvent *>(event)->size();
break;
case QEvent::Move:
static_cast<QMoveEvent *>(postedEvent.event)->m_pos =
static_cast<const QMoveEvent *>(event)->pos();
break;
case QEvent::UpdateRequest:
case QEvent::LanguageChange:
case QEvent::LayoutRequest:
break;
default:
continue;
}
delete event;
return true;
}
return false;
}
/*!