1 files changed, 10 insertions, 46 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index 255cf8bca9..370032a1f8 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/src/plugins/platforms/ios/qiosinputcontext.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QIOSINPUTCONTEXT_H
 #define QIOSINPUTCONTEXT_H
@@ -54,7 +18,7 @@ const char kImePlatformDataReturnKeyType[] = "returnKeyType";
 
 @class QIOSLocaleListener;
 @class QIOSKeyboardListener;
-@class QIOSTextInputResponder;
+@class QIOSTextResponder;
 @protocol KeyboardState;
 
 QT_BEGIN_NAMESPACE
@@ -76,10 +40,10 @@ struct KeyboardState
 
 struct ImeState
 {
-    ImeState() : currentState(0), focusObject(0) {}
+    ImeState() = default;
     Qt::InputMethodQueries update(Qt::InputMethodQueries properties);
-    QInputMethodQueryEvent currentState;
-    QObject *focusObject;
+    QInputMethodQueryEvent currentState = QInputMethodQueryEvent({});
+    QObject *focusObject = nullptr;
 };
 
 class QIOSInputContext : public QPlatformInputContext
@@ -111,10 +75,10 @@ public:
     void scrollToCursor();
     void scroll(int y);
 
-    void updateKeyboardState(NSNotification *notification = 0);
+    void updateKeyboardState(NSNotification *notification = nullptr);
 
-    const ImeState &imeState() { return m_imeState; };
-    const KeyboardState &keyboardState() { return m_keyboardState; };
+    const ImeState &imeState() { return m_imeState; }
+    const KeyboardState &keyboardState() { return m_keyboardState; }
 
     bool inputMethodAccepted() const;
 
@@ -125,7 +89,7 @@ private:
 
     QIOSLocaleListener *m_localeListener;
     QIOSKeyboardListener *m_keyboardHideGesture;
-    QIOSTextInputResponder *m_textResponder;
+    QIOSTextResponder *m_textResponder;
     KeyboardState m_keyboardState;
     ImeState m_imeState;
 };