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>

1 files changed, 68 insertions, 0 deletions

diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp
new file mode 100644
index 000000000..64cc41689
--- /dev/null
+++ b/src/core/type_conversion.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "type_conversion.h"
+
+#include <ui/events/event_constants.h>
+#include <QtCore/qcoreapplication.h>
+
+namespace QtWebEngineCore {
+
+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;
+}
+
+} // namespace QtWebEngineCore