diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-17 12:50:23 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-12-17 13:51:19 +0000 |
| commit | c58ebfda3cead93b716eaf185e4a11130cb34dea (patch) | |
| tree | ac87802291b4378d18499cc1b9752d3694560b39 /src/core/render_widget_host_view_qt.cpp | |
| parent | 26aa7e314e58ea7be375fc767f6806127e50338d (diff) | |
Move conversion function for keyboard modifiers
Move flagsFromModifiers from render_widget_host_view_qt.cpp to a new
file type_conversion.cpp. We will use it in a subsequent commit.
Added a separate source file to not include qcoreapplication.h in
type_conversion.h.
Change-Id: I6dfd54dd99d640ff48cb1a710271c7f8115891e5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index f8edcdfc9..5d4ac72cd 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -160,30 +160,6 @@ static inline bool compareTouchPoints(const QTouchEvent::TouchPoint &lhs, const return lhs.state() < rhs.state(); } -static inline int flagsFromModifiers(Qt::KeyboardModifiers modifiers) -{ - int modifierFlags = ui::EF_NONE; -#if defined(Q_OS_OSX) - if (!qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { - if ((modifiers & Qt::ControlModifier) != 0) - modifierFlags |= ui::EF_COMMAND_DOWN; - if ((modifiers & Qt::MetaModifier) != 0) - modifierFlags |= ui::EF_CONTROL_DOWN; - } else -#endif - { - if ((modifiers & Qt::ControlModifier) != 0) - modifierFlags |= ui::EF_CONTROL_DOWN; - if ((modifiers & Qt::MetaModifier) != 0) - modifierFlags |= ui::EF_COMMAND_DOWN; - } - if ((modifiers & Qt::ShiftModifier) != 0) - modifierFlags |= ui::EF_SHIFT_DOWN; - if ((modifiers & Qt::AltModifier) != 0) - modifierFlags |= ui::EF_ALT_DOWN; - return modifierFlags; -} - static uint32 s_eventId = 0; class MotionEventQt : public ui::MotionEvent { public: |