From 8a8a5813a9fcbaef4dd96e8c33f605043d51b590 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 23 Oct 2015 15:12:33 +0300 Subject: QMenu: Fix a typo EventShouldBePropogated -> EventShouldBePropagated Change-Id: Id9439bd749576d1f7dfcb1653905f5de47b825b4 Reviewed-by: Friedemann Kleint --- src/widgets/widgets/qmenu.cpp | 2 +- src/widgets/widgets/qmenu_p.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 5453d9d64f..b29d7de5f5 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -3143,7 +3143,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) d->activeMenu->d_func()->setCurrentAction(0); QMenuSloppyState::MouseEventResult sloppyEventResult = d->sloppyState.processMouseEvent(e->localPos(), action, d->currentAction); - if (sloppyEventResult == QMenuSloppyState::EventShouldBePropogated) { + if (sloppyEventResult == QMenuSloppyState::EventShouldBePropagated) { d->setCurrentAction(action, d->mousePopupDelay); } else if (sloppyEventResult == QMenuSloppyState::EventDiscardsSloppyState) { d->sloppyState.reset(); diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 3acf73af90..e717d923ae 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -126,7 +126,7 @@ public: enum MouseEventResult { EventIsProcessed, - EventShouldBePropogated, + EventShouldBePropagated, EventDiscardsSloppyState }; @@ -187,14 +187,14 @@ public: m_parent->stopTimer(); if (!m_enabled) - return EventShouldBePropogated; + return EventShouldBePropagated; if (!m_time.isActive()) startTimer(); if (!m_sub_menu) { reset(); - return EventShouldBePropogated; + return EventShouldBePropagated; } QSetValueOnDestroy setFirstMouse(m_first_mouse, false); @@ -208,7 +208,7 @@ public: if (m_action_rect.contains(mousePos)) { startTimer(); - return currentAction == m_menu->menuAction() ? EventIsProcessed : EventShouldBePropogated; + return currentAction == m_menu->menuAction() ? EventIsProcessed : EventShouldBePropagated; } if (m_uni_directional && !m_first_mouse && resetAction != m_origin_action) { @@ -247,7 +247,7 @@ public: } - return m_select_other_actions ? EventShouldBePropogated : EventIsProcessed; + return m_select_other_actions ? EventShouldBePropagated : EventIsProcessed; } void setSubMenuPopup(const QRect &actionRect, QAction *resetAction, QMenu *subMenu); -- cgit v1.2.3