diff options
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp index 6f496571fa..b4650de315 100644 --- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp +++ b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp @@ -1,41 +1,5 @@ -/*************************************************************************** -** -** Copyright (C) 2011 - 2012 Research In Motion -** 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) 2011 - 2012 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqnxvirtualkeyboardpps.h" #include "qqnxscreen.h" @@ -134,7 +98,7 @@ bool QQnxVirtualKeyboardPps::connect() m_buffer = new char[ms_bufferSize]; if (Q_UNLIKELY(!m_buffer)) { - qCritical("QQnxVirtualKeyboard: Unable to allocate buffer of %d bytes. " + qCritical("QQnxVirtualKeyboard: Unable to allocate buffer of %zu bytes. " "Size is unavailable.", ms_bufferSize); return false; } @@ -162,9 +126,9 @@ bool QQnxVirtualKeyboardPps::queryPPSInfo() void QQnxVirtualKeyboardPps::ppsDataReady() { - ssize_t nread = qt_safe_read(m_fd, m_buffer, ms_bufferSize - 1); + qint64 nread = qt_safe_read(m_fd, m_buffer, ms_bufferSize - 1); - qVirtualKeyboardDebug("keyboardMessage size: %zd", nread); + qVirtualKeyboardDebug("keyboardMessage size: %lld", nread); if (nread < 0){ connect(); // reconnect return; @@ -177,7 +141,7 @@ void QQnxVirtualKeyboardPps::ppsDataReady() // nread is the real space necessary, not the amount read. if (Q_UNLIKELY(static_cast<size_t>(nread) > ms_bufferSize - 1)) { - qCritical("QQnxVirtualKeyboard: Keyboard buffer size too short; need %u.", nread + 1); + qCritical("QQnxVirtualKeyboard: Keyboard buffer size too short; need %lld.", nread + 1); connect(); // reconnect return; } @@ -240,7 +204,7 @@ bool QQnxVirtualKeyboardPps::showKeyboard() if (!prepareToSend()) return false; - // NOTE: This must be done everytime the keyboard is shown even if there is no change because + // NOTE: This must be done every time the keyboard is shown even if there is no change because // hiding the keyboard wipes the setting. applyKeyboardOptions(); |