From 257d5888e8086e6fcea87f68bb06feb56cd830d6 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 12:35:35 +0200 Subject: QFlags: remove deprecated constructor Fix remaining places that still exercised it. Task-number: QTBUG-85700 Change-Id: I84562f53439197141343831c0b9f88983689e6bf Reviewed-by: Allan Sandfeld Jensen --- src/plugins/platforms/ios/qiosinputcontext.h | 8 ++++---- src/plugins/platforms/ios/qiosinputcontext.mm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h index debdf7a638..c59c5328af 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.h +++ b/src/plugins/platforms/ios/qiosinputcontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -76,10 +76,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 diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm index d2229df133..0eb12498b4 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.mm +++ b/src/plugins/platforms/ios/qiosinputcontext.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -297,7 +297,7 @@ QT_BEGIN_NAMESPACE Qt::InputMethodQueries ImeState::update(Qt::InputMethodQueries properties) { if (!properties) - return 0; + return {}; QInputMethodQueryEvent newState(properties); -- cgit v1.2.3